From: Pavel Roskin <proski@gnu.org>
Date: Sat, 2 Dec 2000 01:40:17 +0000 (+0000)
Subject: * acgeneral.m4 (_AC_OUTPUT_CONFIG_STATUS): Don't escape
X-Git-Tag: autoconf-2.50~356
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=dd6c961a3ec3f28389e4064d62b1b7c69a92d298;p=thirdparty%2Fautoconf.git

* acgeneral.m4 (_AC_OUTPUT_CONFIG_STATUS): Don't escape
backquotes in AC_MSG_ERROR. Fix error message.
---

diff --git a/ChangeLog b/ChangeLog
index 894f61d87..3fadbe9dc 100644
--- 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 cd8c11d30..51f0b65c0 100644
--- 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 e847d29c3..f0923f310 100755
--- 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 cd8c11d30..51f0b65c0 100644
--- 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