Rename ac_configure_args back to configure_args, since some people

have been using it.

diff --git a/acgeneral.m4 b/acgeneral.m4
index 9952594ded2fc389a00117df0effc1901319664e..53607500a8fdfd043ac462555878cee35cdc33e1 100644 (file)
--- a/acgeneral.m4
+++ b/acgeneral.m4
@@ -83,7 +83,7 @@ dnl [#] by AC_USER@AC_HOST on AC_DATE
 dnl
 define(AC_PARSEARGS,
 [# Save the original args to write them into config.status later.
-ac_configure_args="[$]*"
+configure_args="[$]*"
 
 # Only options that might do something get documented.
 changequote(,)dnl
@@ -350,16 +350,16 @@ define(AC_PREPARE,
 trap 'rm -fr confdefs* $ac_clean_files' 0
 
 # Save the original args if we used an alternate arg parser.
-ac_configure_temp="${ac_configure_args-[$]*}"
+ac_configure_temp="${configure_args-[$]*}"
 # Strip out --no-create and --norecursion so they don't pile up.
-ac_configure_args=
+configure_args=
 for ac_arg in $ac_configure_temp; do
   case "$ac_arg" in
   -no-create | --no-create | --no-creat | --no-crea | --no-cre \
   | --no-cr | --no-c) ;;
   -norecursion | --norecursion | --norecursio | --norecursi \
   | --norecurs | --norecur | --norecu | --norec | --nore | --nor) ;;
-  *) ac_configure_args="$ac_configure_args $ac_arg" ;;
+  *) configure_args="$configure_args $ac_arg" ;;
   esac
 done
 
@@ -972,7 +972,7 @@ dnl hostname on some systems (SVR3.2, Linux) returns a bogus exit status,
 dnl so uname gets run too.
 # on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
 #
-[#] [$]0 [$]ac_configure_args
+[#] [$]0 [$]configure_args
 
 changequote(,)dnl
 ac_cs_usage="Usage: config.status [--recheck] [--version] [--help]"
@@ -981,8 +981,8 @@ for ac_option
 do
   case "[\$]ac_option" in
   -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
-    echo running [\$]{CONFIG_SHELL-/bin/sh} [$]0 [$]ac_configure_args --no-create
-    exec [\$]{CONFIG_SHELL-/bin/sh} [$]0 [$]ac_configure_args --no-create ;;
+    echo running [\$]{CONFIG_SHELL-/bin/sh} [$]0 [$]configure_args --no-create
+    exec [\$]{CONFIG_SHELL-/bin/sh} [$]0 [$]configure_args --no-create ;;
   -version | --version | --versio | --versi | --vers | --ver | --ve | --v)
     echo "config.status generated by autoconf version AC_ACVERSION"
     exit 0 ;;

diff --git a/lib/autoconf/general.m4 b/lib/autoconf/general.m4
index 9952594ded2fc389a00117df0effc1901319664e..53607500a8fdfd043ac462555878cee35cdc33e1 100644 (file)
--- a/lib/autoconf/general.m4
+++ b/lib/autoconf/general.m4
@@ -83,7 +83,7 @@ dnl [#] by AC_USER@AC_HOST on AC_DATE
 dnl
 define(AC_PARSEARGS,
 [# Save the original args to write them into config.status later.
-ac_configure_args="[$]*"
+configure_args="[$]*"
 
 # Only options that might do something get documented.
 changequote(,)dnl
@@ -350,16 +350,16 @@ define(AC_PREPARE,
 trap 'rm -fr confdefs* $ac_clean_files' 0
 
 # Save the original args if we used an alternate arg parser.
-ac_configure_temp="${ac_configure_args-[$]*}"
+ac_configure_temp="${configure_args-[$]*}"
 # Strip out --no-create and --norecursion so they don't pile up.
-ac_configure_args=
+configure_args=
 for ac_arg in $ac_configure_temp; do
   case "$ac_arg" in
   -no-create | --no-create | --no-creat | --no-crea | --no-cre \
   | --no-cr | --no-c) ;;
   -norecursion | --norecursion | --norecursio | --norecursi \
   | --norecurs | --norecur | --norecu | --norec | --nore | --nor) ;;
-  *) ac_configure_args="$ac_configure_args $ac_arg" ;;
+  *) configure_args="$configure_args $ac_arg" ;;
   esac
 done
 
@@ -972,7 +972,7 @@ dnl hostname on some systems (SVR3.2, Linux) returns a bogus exit status,
 dnl so uname gets run too.
 # on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
 #
-[#] [$]0 [$]ac_configure_args
+[#] [$]0 [$]configure_args
 
 changequote(,)dnl
 ac_cs_usage="Usage: config.status [--recheck] [--version] [--help]"
@@ -981,8 +981,8 @@ for ac_option
 do
   case "[\$]ac_option" in
   -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
-    echo running [\$]{CONFIG_SHELL-/bin/sh} [$]0 [$]ac_configure_args --no-create
-    exec [\$]{CONFIG_SHELL-/bin/sh} [$]0 [$]ac_configure_args --no-create ;;
+    echo running [\$]{CONFIG_SHELL-/bin/sh} [$]0 [$]configure_args --no-create
+    exec [\$]{CONFIG_SHELL-/bin/sh} [$]0 [$]configure_args --no-create ;;
   -version | --version | --versio | --versi | --vers | --ver | --ve | --v)
     echo "config.status generated by autoconf version AC_ACVERSION"
     exit 0 ;;