* acgeneral.m4 (_AC_OUTPUT_CONFIG_STATUS): Don't escape

backquotes in AC_MSG_ERROR. Fix error message.

diff --git a/ChangeLog b/ChangeLog
index 894f61d8787ad49a2088db033f629d4330b02fee..3fadbe9dc6c1a6847cc91e6472b1f8f993ff17cd 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2000-12-01  Pavel Roskin  <proski@gnu.org>
+
+       * acgeneral.m4 (_AC_OUTPUT_CONFIG_STATUS): Don't escape
+       backquotes in AC_MSG_ERROR. Fix error message.
+
 2000-12-01  Pavel Roskin  <proski@gnu.org>
 
        * tests/atgeneral.m4 (AT_INIT): Use ${CONFIG_SHELL-/bin/sh}

diff --git a/acgeneral.m4 b/acgeneral.m4
index cd8c11d303a634b9ef352b1a3f8f332acdf65a43..51f0b65c0fab3ed36ca6756baad8b1ddb3ad7c7f 100644 (file)
--- a/acgeneral.m4
+++ b/acgeneral.m4
@@ -3919,8 +3919,8 @@ cat >>$CONFIG_STATUS <<\EOF
     echo "$ac_cs_version"; exit 0 ;;
   --he | --h)
     # Conflict between --help and --header
-    AC_MSG_ERROR([ambiguous option: $ac_option
-Try \`$[0] --help' for more information.]);;
+    AC_MSG_ERROR([ambiguous option: $[1]
+Try `$[0] --help' for more information.]);;
   --help | --hel | -h )
     echo "$ac_cs_usage"; exit 0 ;;
   --debug | --d* | -d )
@@ -3954,7 +3954,7 @@ AC_FOREACH([AC_File], AC_LIST_HEADERS,
 
   # This is an error.
   -*) AC_MSG_ERROR([unrecognized option: $[1]
-Try \`$[0] --help' for more information.]) ;;
+Try `$[0] --help' for more information.]) ;;
   *) AC_MSG_ERROR([invalid argument: $[1]]);;
   esac
   shift

diff --git a/configure b/configure
index e847d29c3e4c90bd4c2f30f9950579b0364a942a..f0923f310b34a94d6f1faef79c06e2379399f0be 100755 (executable)
--- a/configure
+++ b/configure
@@ -1635,7 +1635,7 @@ cat >>$CONFIG_STATUS <<\EOF
     echo "$ac_cs_version"; exit 0 ;;
   --he | --h)
     # Conflict between --help and --header
-    {  echo "$as_me: error: ambiguous option: $ac_option
+    {  echo "$as_me: error: ambiguous option: $1
 Try \`$0 --help' for more information." >&2
   { (exit 1); exit; }; };;
   --help | --hel | -h )

diff --git a/lib/autoconf/general.m4 b/lib/autoconf/general.m4
index cd8c11d303a634b9ef352b1a3f8f332acdf65a43..51f0b65c0fab3ed36ca6756baad8b1ddb3ad7c7f 100644 (file)
--- a/lib/autoconf/general.m4
+++ b/lib/autoconf/general.m4
@@ -3919,8 +3919,8 @@ cat >>$CONFIG_STATUS <<\EOF
     echo "$ac_cs_version"; exit 0 ;;
   --he | --h)
     # Conflict between --help and --header
-    AC_MSG_ERROR([ambiguous option: $ac_option
-Try \`$[0] --help' for more information.]);;
+    AC_MSG_ERROR([ambiguous option: $[1]
+Try `$[0] --help' for more information.]);;
   --help | --hel | -h )
     echo "$ac_cs_usage"; exit 0 ;;
   --debug | --d* | -d )
@@ -3954,7 +3954,7 @@ AC_FOREACH([AC_File], AC_LIST_HEADERS,
 
   # This is an error.
   -*) AC_MSG_ERROR([unrecognized option: $[1]
-Try \`$[0] --help' for more information.]) ;;
+Try `$[0] --help' for more information.]) ;;
   *) AC_MSG_ERROR([invalid argument: $[1]]);;
   esac
   shift