* acgeneral.m4 (_AC_INIT_PARSE_ARGS): TRIPLET can include `_' and

`-'.
Reported by Andreas Jaeger.

diff --git a/ChangeLog b/ChangeLog
index 30049ad03cef3aedf3795b600cc4c1c5ffa7c4e1..7116fdd05fec6f75be0cd00e1fc2aedd99805f1c 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2000-11-03  Akim Demaille  <akim@epita.fr>
+
+       * acgeneral.m4 (_AC_INIT_PARSE_ARGS): TRIPLET can include `_' and
+       `-'.
+       Reported by Andreas Jaeger.
+
 2000-11-03  Akim Demaille  <akim@epita.fr>
 
        * m4sh.m4 (_AS_UNSET_PREPARE): New macro, eved from

diff --git a/THANKS b/THANKS
index 60f3b42898ab3028abda5a21dc4c10fab1566756..4cac3c1368bf7fbd6070519c19bb74739cb2588c 100644 (file)
--- a/THANKS
+++ b/THANKS
@@ -8,6 +8,7 @@ Akim Demaille           akim@epita.fr
 Alain Knaff            Alain.Knaff@imag.fr
 Alec Wolman            wolman@cs.washington.edu
 Alexandre Oliva                oliva@lsd.ic.unicamp.br
+Andreas Jaeger         aj@suse.de
 Andreas Schott         schott@rzg.mpg.de
 Andreas Schwab         schwab@issan.informatik.uni-dortmund.de
 Andrej Borsenkow       borsenkow.msk@sni.de

diff --git a/acgeneral.m4 b/acgeneral.m4
index aa0600ea28e99e7c608becfbe1d219bf58c624bf..6139087348ba20e87cea2244446a7a63289ad32f 100644 (file)
--- a/acgeneral.m4
+++ b/acgeneral.m4
@@ -1160,7 +1160,7 @@ Try `configure --help' for more information.])
   *)
     # FIXME: should be removed in autoconf 3.0.
     AC_MSG_WARN([you should use --build, --host, --target])
-    expr "x$ac_option" : "[.*[^.$ac_cr_alnum]]" >/dev/null &&
+    expr "x$ac_option" : "[.*[^-._$ac_cr_alnum]]" >/dev/null &&
       AC_MSG_WARN([invalid host type: $ac_option])
     : ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}
     ;;

diff --git a/lib/autoconf/general.m4 b/lib/autoconf/general.m4
index aa0600ea28e99e7c608becfbe1d219bf58c624bf..6139087348ba20e87cea2244446a7a63289ad32f 100644 (file)
--- a/lib/autoconf/general.m4
+++ b/lib/autoconf/general.m4
@@ -1160,7 +1160,7 @@ Try `configure --help' for more information.])
   *)
     # FIXME: should be removed in autoconf 3.0.
     AC_MSG_WARN([you should use --build, --host, --target])
-    expr "x$ac_option" : "[.*[^.$ac_cr_alnum]]" >/dev/null &&
+    expr "x$ac_option" : "[.*[^-._$ac_cr_alnum]]" >/dev/null &&
       AC_MSG_WARN([invalid host type: $ac_option])
     : ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}
     ;;