From a7454f4e4e2fd23906e17155795bdb790354b82c Mon Sep 17 00:00:00 2001 From: Ralf Wildenhues Date: Wed, 10 Jan 2007 17:59:57 +0000 Subject: [PATCH] * 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. --- ChangeLog | 6 ++++++ lib/autoconf/general.m4 | 12 +++++++++--- 2 files changed, 15 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 68c7e70f..f586c872 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2007-01-10 Ralf Wildenhues + + * 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 * doc/autoconf.texi: Fix some typos. diff --git a/lib/autoconf/general.m4 b/lib/autoconf/general.m4 index 0e2c8eb4..3ff81e38 100644 --- 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 ]) -- 2.11.4.GIT