* lib/autoconf/general.m4 (_AC_INIT_DEFAULTS): Use newlines to

separate items of `ac_user_opts', to avoid long lines.
(_AC_INIT_PARSE_ENABLE2, _AC_ENABLE_IF_ACTION): Adjust.

diff --git a/ChangeLog b/ChangeLog
index 68c7e70f4665db86bb67ab5eb80526ea830b0044..f586c872062445c08e015ac571adfb1874f6d85d 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2007-01-10  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
+
+       * lib/autoconf/general.m4 (_AC_INIT_DEFAULTS): Use newlines to
+       separate items of `ac_user_opts', to avoid long lines.
+       (_AC_INIT_PARSE_ENABLE2, _AC_ENABLE_IF_ACTION): Adjust.
+
 2007-01-08  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
 
        * doc/autoconf.texi: Fix some typos.

diff --git a/lib/autoconf/general.m4 b/lib/autoconf/general.m4
index 0e2c8eb496388a79f4c487ae6c4024ffd78dd9e9..3ff81e386a39517d00296713c6e9714ba6078522 100644 (file)
--- a/lib/autoconf/general.m4
+++ b/lib/autoconf/general.m4
@@ -409,7 +409,10 @@ m4_divert_pop([DEFAULTS])dnl
 m4_wrap([m4_divert_text([DEFAULTS],
 [ac_subst_vars='m4_ifdef([_AC_SUBST_VARS],  [m4_defn([_AC_SUBST_VARS])])'
 ac_subst_files='m4_ifdef([_AC_SUBST_FILES], [m4_defn([_AC_SUBST_FILES])])'
-ac_user_opts=':enable_option_checking:m4_ifdef([_AC_USER_OPTS], [m4_defn([_AC_USER_OPTS]):])'
+ac_user_opts='
+enable_option_checking
+m4_ifdef([_AC_USER_OPTS], [m4_defn([_AC_USER_OPTS])
+])'
 m4_ifdef([_AC_PRECIOUS_VARS],
   [_AC_ARG_VAR_STORE[]dnl
    _AC_ARG_VAR_VALIDATE[]dnl
@@ -960,7 +963,9 @@ m4_define([_AC_INIT_PARSE_ENABLE2],
     ac_useropt_orig=$ac_useropt
     ac_useropt=`AS_ECHO(["$ac_useropt"]) | sed 's/[[-.]]/_/g'`
     case $ac_user_opts in
-      *:$2_$ac_useropt:*) ;;
+      *"
+"$2_$ac_useropt"
+"*) ;;
       *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--$1-$ac_useropt_orig"
          ac_unrecognized_sep=', ';;
     esac
@@ -1391,7 +1396,8 @@ _AC_ENABLE_IF_ACTION([$1], m4_translit([$2], [-.], [__]), [$3], [$4])[]dnl
 ])
 
 m4_define([_AC_ENABLE_IF_ACTION],
-[m4_append_uniq([_AC_USER_OPTS], [$1_$2], [:])dnl
+[m4_append_uniq([_AC_USER_OPTS], [$1_$2], [
+])dnl
 AS_IF([test "${$1_$2+set}" = set], [$1val=$$1_$2; $3], [$4])dnl
 ])