Merge branch 'systime'

[strongswan.git] / m4 / macros / enable-disable.m4

diff --git a/m4/macros/enable-disable.m4 b/m4/macros/enable-disable.m4
index 6d7959e..2e45520 100644 (file)
--- a/m4/macros/enable-disable.m4
+++ b/m4/macros/enable-disable.m4
@@ -6,27 +6,33 @@ AC_DEFUN([ARG_ENABL_SET],
        [AC_ARG_ENABLE(
                [$1],
                AS_HELP_STRING([--enable-$1], [$2]),
-               [if test x$enableval = xyes; then
+               [patsubst([$1], [-], [_])_given=true
+               if test x$enableval = xyes; then
                        patsubst([$1], [-], [_])=true
                 else
                        patsubst([$1], [-], [_])=false
                fi],
-               patsubst([$1], [-], [_])=false
+               [patsubst([$1], [-], [_])=false
+               patsubst([$1], [-], [_])_given=false]
        )]
 )
 
 # ARG_DISBL_SET(option, help)
 # ---------------------------
 # Create a --disable-$1 option with helptext, set a variable $1 to true/false
+# All $1 are collected in the variable $enabled_by_default
 AC_DEFUN([ARG_DISBL_SET],
        [AC_ARG_ENABLE(
                [$1],
                AS_HELP_STRING([--disable-$1], [$2]),
-               [if test x$enableval = xyes; then
+               [patsubst([$1], [-], [_])_given=true
+               if test x$enableval = xyes; then
                        patsubst([$1], [-], [_])=true
                 else
                        patsubst([$1], [-], [_])=false
                fi],
-               patsubst([$1], [-], [_])=true
-       )]
+               [patsubst([$1], [-], [_])=true
+               patsubst([$1], [-], [_])_given=false]
+       )
+       enabled_by_default=${enabled_by_default}" patsubst([$1], [-], [_])"]
 )