* lib/autoconf/general.m4 (_AC_INIT_PARSE_ENABLE): Fix some typos

in previous change, which caused test failures.

diff --git a/ChangeLog b/ChangeLog
index e2815f59b4031b6f45537aa5e455d5bd20dc9cb4..2e0855ef702806506236a2ef6cc6dde88247b6b6 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-11-16  Paul Eggert  <eggert@cs.ucla.edu>
+
+       * lib/autoconf/general.m4 (_AC_INIT_PARSE_ENABLE): Fix some typos
+       in previous change, which caused test failures.
+
 2006-11-16  Stepan Kasal  <kasal@ucw.cz>
 
        * lib/autoconf/general.m4 (_AC_INIT_PARSE_ARGS): Factor out

diff --git a/lib/autoconf/general.m4 b/lib/autoconf/general.m4
index cf7cd2cb87ec4ccf2bfcc2a3a04e10189ee356e0..3ec20bb89f258f7a5af0dc245d64245b255e11f9 100644 (file)
--- a/lib/autoconf/general.m4
+++ b/lib/autoconf/general.m4
@@ -925,12 +925,12 @@ m4_divert_pop([PARSE_ARGS])dnl
 #
 m4_define([_AC_INIT_PARSE_ENABLE],
 [-$1-* | --$1-*)
-    ac_$2=`expr "x$ac_option" : 'x-*$1-\(.*\)'`
+    ac_$2=`expr "x$ac_option" : 'x-*$1-\(m4_bmatch([$1], [^\(enable\|with\)$], [[[^=]]], [.])*\)'`
     # Reject names that are not valid shell variable names.
     expr "x$ac_$2" : "[.*[^-._$as_cr_alnum]]" >/dev/null &&
       AC_MSG_ERROR([invalid $2 name: $ac_$2])
     [ac_$2=`echo $ac_$2 | sed 's/[-.]/_/g'`]
-    eval with_$ac_$2=$3 ;;dnl
+    eval m4_bmatch([$1], [^\(enable\|disable\)$], [enable], [with])_$ac_$2=$3 ;;dnl
 ])