From: Akim Demaille <akim@epita.fr>
Date: Fri, 15 Jun 2001 17:40:57 +0000 (+0000)
Subject: `build_alias' and so on are not AC_SUBST'd.
X-Git-Tag: AUTOCONF-2.50a~34
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ede1b31c811da5fb87ed6db4fb3c2ac8b32554f8;p=thirdparty%2Fautoconf.git

`build_alias' and so on are not AC_SUBST'd.
Reported by Bruno Haible.
* acgeneral.m4 (AC_ARG_VAR): Move the AC_SUBST, from here...
 (_AC_ARG_VAR_PRECIOUS): to here.
---

diff --git a/ChangeLog b/ChangeLog
index 0a6a9428e..2cd1541d4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2001-06-15  Akim Demaille  <akim@epita.fr>
+
+	`build_alias' and so on are not AC_SUBST'd.
+	Reported by Bruno Haible.
+
+	* acgeneral.m4 (AC_ARG_VAR): Move the AC_SUBST, from here...
+	 (_AC_ARG_VAR_PRECIOUS): to here.
+
 2001-06-15  Pavel Roskin  <proski@gnu.org>
 
 	* acheaders.m4 (_AC_CHECK_HEADER_DIRENT): Instead of defining
diff --git a/NEWS b/NEWS
index d0487a17b..7eebad225 100644
--- a/NEWS
+++ b/NEWS
@@ -11,6 +11,7 @@
   literal.
 - HAVE_INTTYPES_H is defined only if not conflicting with previous
   headers.
+- build_, host_, and target_alias are AC_SUBST as in 2.13.
 
 ** Generic macros
 - AC_CHECK_HEADER and AC_CHECK_HEADERS support a fourth argument to
diff --git a/acgeneral.m4 b/acgeneral.m4
index 47c6befc4..6e880e843 100644
--- a/acgeneral.m4
+++ b/acgeneral.m4
@@ -1502,7 +1502,8 @@ AU_DEFUN([AC_WITH],
 # In subsequent runs, after having loaded the cache, compare
 # ac_cv_env_foo against ac_env_foo.  See _AC_ARG_VAR_VALIDATE.
 m4_define([_AC_ARG_VAR_PRECIOUS],
-[m4_divert_once([PARSE_ARGS],
+[AC_SUBST([$1])dnl
+m4_divert_once([PARSE_ARGS],
 [ac_env_$1_set=${$1+set}
 ac_env_$1_value=$$1
 ac_cv_env_$1_set=${$1+set}
@@ -1560,7 +1561,6 @@ m4_expand_once([m4_divert_once([HELP_VAR],
                                [AC_HELP_STRING([$1], [$2], [              ])])],
                [$0($1)])dnl
 _AC_ARG_VAR_PRECIOUS([$1])dnl
-AC_SUBST([$1])dnl
 ])# AC_ARG_VAR
 
 
diff --git a/configure b/configure
index 9336980eb..5a83817c6 100755
--- a/configure
+++ b/configure
@@ -1787,6 +1787,9 @@ s,@PACKAGE_TARNAME@,$PACKAGE_TARNAME,;t t
 s,@PACKAGE_VERSION@,$PACKAGE_VERSION,;t t
 s,@PACKAGE_STRING@,$PACKAGE_STRING,;t t
 s,@PACKAGE_BUGREPORT@,$PACKAGE_BUGREPORT,;t t
+s,@build_alias@,$build_alias,;t t
+s,@host_alias@,$host_alias,;t t
+s,@target_alias@,$target_alias,;t t
 s,@ECHO_C@,$ECHO_C,;t t
 s,@ECHO_N@,$ECHO_N,;t t
 s,@ECHO_T@,$ECHO_T,;t t
@@ -1925,7 +1928,7 @@ done; }
   esac
 
   if test x"$ac_file" != x-; then
-    { echo "$as_me:1928: creating $ac_file" >&5
+    { echo "$as_me:1931: creating $ac_file" >&5
 echo "$as_me: creating $ac_file" >&6;}
     rm -f "$ac_file"
   fi
@@ -1943,7 +1946,7 @@ echo "$as_me: creating $ac_file" >&6;}
       -) echo $tmp/stdin ;;
       [\\/$]*)
          # Absolute (can't be DOS-style, as IFS=:)
-         test -f "$f" || { { echo "$as_me:1946: error: cannot find input file: $f" >&5
+         test -f "$f" || { { echo "$as_me:1949: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          echo $f;;
@@ -1956,7 +1959,7 @@ echo "$as_me: error: cannot find input file: $f" >&2;}
            echo $srcdir/$f
          else
            # /dev/null tree
-           { { echo "$as_me:1959: error: cannot find input file: $f" >&5
+           { { echo "$as_me:1962: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          fi;;
diff --git a/lib/autoconf/general.m4 b/lib/autoconf/general.m4
index 47c6befc4..6e880e843 100644
--- a/lib/autoconf/general.m4
+++ b/lib/autoconf/general.m4
@@ -1502,7 +1502,8 @@ AU_DEFUN([AC_WITH],
 # In subsequent runs, after having loaded the cache, compare
 # ac_cv_env_foo against ac_env_foo.  See _AC_ARG_VAR_VALIDATE.
 m4_define([_AC_ARG_VAR_PRECIOUS],
-[m4_divert_once([PARSE_ARGS],
+[AC_SUBST([$1])dnl
+m4_divert_once([PARSE_ARGS],
 [ac_env_$1_set=${$1+set}
 ac_env_$1_value=$$1
 ac_cv_env_$1_set=${$1+set}
@@ -1560,7 +1561,6 @@ m4_expand_once([m4_divert_once([HELP_VAR],
                                [AC_HELP_STRING([$1], [$2], [              ])])],
                [$0($1)])dnl
 _AC_ARG_VAR_PRECIOUS([$1])dnl
-AC_SUBST([$1])dnl
 ])# AC_ARG_VAR