* acgeneral.m4 (_AC_CANONICAL_TARGET, _AC_CANONICAL_BUILD): Rename

as (AC_CANONICAL_TARGET, AC_CANONICAL_BUILD), although internal,
too much foreign code depends upon them.

diff --git a/ChangeLog b/ChangeLog
index e962ffe2f72f4f90b50e1f24530c35b82d04a016..71077fb4478fa6fc1b2b0a77d187db896a458e23 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2000-03-25  Akim Demaille  <akim@epita.fr>
+
+       * acgeneral.m4 (_AC_CANONICAL_TARGET, _AC_CANONICAL_BUILD): Rename
+       as (AC_CANONICAL_TARGET, AC_CANONICAL_BUILD), although internal,
+       too much foreign code depends upon them.
+
 2000-03-25  Akim Demaille  <akim@epita.fr>
 
        * autoconf.sh (translate_awk): `> "/dev/stderr"' is not portable

diff --git a/acgeneral.m4 b/acgeneral.m4
index b7c88b2803df147368c1948213e3d12f56905e67..5b61120aeefb0855a043fc759478e6a2daa61c5a 100644 (file)
--- a/acgeneral.m4
+++ b/acgeneral.m4
@@ -1681,8 +1681,8 @@ AC_PROVIDE([AC_CONFIG_AUX_DIR_DEFAULT])dnl
 AC_DEFUN(AC_CANONICAL_SYSTEM,
 [AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT])dnl
 AC_REQUIRE([AC_CANONICAL_HOST])dnl
-AC_REQUIRE([_AC_CANONICAL_TARGET])dnl
-AC_REQUIRE([_AC_CANONICAL_BUILD])dnl
+AC_REQUIRE([AC_CANONICAL_TARGET])dnl
+AC_REQUIRE([AC_CANONICAL_BUILD])dnl
 AC_BEFORE([$0], [AC_ARG_PROGRAM])
 # Do some error checking and defaulting for the host and target type.
 # The inputs are:
@@ -1768,11 +1768,9 @@ AC_SUBST($1_vendor)dnl
 AC_SUBST($1_os)dnl
 ])# _AC_CANONICAL_THING
 
-AC_DEFUN(AC_CANONICAL_HOST, [_AC_CANONICAL_THING([host])])
-
-# Internal use only.
-AC_DEFUN(_AC_CANONICAL_TARGET, [_AC_CANONICAL_THING([target])])
-AC_DEFUN(_AC_CANONICAL_BUILD, [_AC_CANONICAL_THING([build])])
+AC_DEFUN(AC_CANONICAL_HOST,   [_AC_CANONICAL_THING([host])])
+AC_DEFUN(AC_CANONICAL_TARGET, [_AC_CANONICAL_THING([target])])
+AC_DEFUN(AC_CANONICAL_BUILD,  [_AC_CANONICAL_THING([build])])
 
 
 # AC_VALIDATE_CACHED_SYSTEM_TUPLE([CMD])
@@ -2650,7 +2648,7 @@ ifval([$3], [test -n "[$]$1" || $1="$3"
 # ---------------------
 AC_DEFUN(_AC_CHECK_TOOL_PREFIX,
 [AC_REQUIRE([AC_CANONICAL_HOST])dnl
-AC_REQUIRE([_AC_CANONICAL_BUILD])dnl
+AC_REQUIRE([AC_CANONICAL_BUILD])dnl
 if test $host != $build; then
   ac_tool_prefix=${host_alias}-
 else

diff --git a/lib/autoconf/general.m4 b/lib/autoconf/general.m4
index b7c88b2803df147368c1948213e3d12f56905e67..5b61120aeefb0855a043fc759478e6a2daa61c5a 100644 (file)
--- a/lib/autoconf/general.m4
+++ b/lib/autoconf/general.m4
@@ -1681,8 +1681,8 @@ AC_PROVIDE([AC_CONFIG_AUX_DIR_DEFAULT])dnl
 AC_DEFUN(AC_CANONICAL_SYSTEM,
 [AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT])dnl
 AC_REQUIRE([AC_CANONICAL_HOST])dnl
-AC_REQUIRE([_AC_CANONICAL_TARGET])dnl
-AC_REQUIRE([_AC_CANONICAL_BUILD])dnl
+AC_REQUIRE([AC_CANONICAL_TARGET])dnl
+AC_REQUIRE([AC_CANONICAL_BUILD])dnl
 AC_BEFORE([$0], [AC_ARG_PROGRAM])
 # Do some error checking and defaulting for the host and target type.
 # The inputs are:
@@ -1768,11 +1768,9 @@ AC_SUBST($1_vendor)dnl
 AC_SUBST($1_os)dnl
 ])# _AC_CANONICAL_THING
 
-AC_DEFUN(AC_CANONICAL_HOST, [_AC_CANONICAL_THING([host])])
-
-# Internal use only.
-AC_DEFUN(_AC_CANONICAL_TARGET, [_AC_CANONICAL_THING([target])])
-AC_DEFUN(_AC_CANONICAL_BUILD, [_AC_CANONICAL_THING([build])])
+AC_DEFUN(AC_CANONICAL_HOST,   [_AC_CANONICAL_THING([host])])
+AC_DEFUN(AC_CANONICAL_TARGET, [_AC_CANONICAL_THING([target])])
+AC_DEFUN(AC_CANONICAL_BUILD,  [_AC_CANONICAL_THING([build])])
 
 
 # AC_VALIDATE_CACHED_SYSTEM_TUPLE([CMD])
@@ -2650,7 +2648,7 @@ ifval([$3], [test -n "[$]$1" || $1="$3"
 # ---------------------
 AC_DEFUN(_AC_CHECK_TOOL_PREFIX,
 [AC_REQUIRE([AC_CANONICAL_HOST])dnl
-AC_REQUIRE([_AC_CANONICAL_BUILD])dnl
+AC_REQUIRE([AC_CANONICAL_BUILD])dnl
 if test $host != $build; then
   ac_tool_prefix=${host_alias}-
 else