+2004-08-02 Alexandre Duret-Lutz <adl@gnu.org>
+
+ * automake.in (AC_CANONICAL_HOST, AC_CANONICAL_SYSTEM): Replace by ...
+ (AC_CANONICAL_BUILD, AC_CANONICAL_HOST, AC_CANONICAL_SYSTEM): ... these.
+ (scan_autoconf_traces): Scan for the latter three macros instead of
+ the former two.
+ (make_paragraphs): Adjust definitions of %BUILD%, %HOST%, and %TARGET%.
+ * tests/hosts.test: New file.
+ * tests/Makefile.am (TESTS): Add hosts.test.
+ Report and test case from Norman Gray.
+
2004-08-01 Alexandre Duret-Lutz <adl@gnu.org>
* aclocal.in (scan_file): Update "#Extending%20aclocal" URL, makeinfo
'^(?:bin|sbin|libexec|sysconf|localstate|lib|pkglib|.*exec.*)' . "\$";
# Values for AC_CANONICAL_*
-use constant AC_CANONICAL_HOST => 1;
-use constant AC_CANONICAL_SYSTEM => 2;
+use constant AC_CANONICAL_BUILD => 1;
+use constant AC_CANONICAL_HOST => 2;
+use constant AC_CANONICAL_TARGET => 3;
# Values indicating when something should be cleaned.
use constant MOSTLY_CLEAN => 0;
# Lists of tags supported by Libtool.
my %libtool_tags = ();
-# TRUE if we've seen AC_CANONICAL_(HOST|SYSTEM).
+# Most important AC_CANONICAL_* macro seen so far.
my $seen_canonical = 0;
+# Location of that macro.
my $canonical_location;
# Where AM_MAINTAINER_MODE appears.
# IMPORTANT: If you add a macro here, you should also add this macro
# ========= to Automake-preselection in autoconf/lib/autom4te.in.
my %traced = (
+ AC_CANONICAL_BUILD => 0,
AC_CANONICAL_HOST => 0,
- AC_CANONICAL_SYSTEM => 0,
+ AC_CANONICAL_TARGET => 0,
AC_CONFIG_AUX_DIR => 1,
AC_CONFIG_FILES => 1,
AC_CONFIG_HEADERS => 1,
}
# Alphabetical ordering please.
- if ($macro eq 'AC_CANONICAL_HOST')
+ if ($macro eq 'AC_CANONICAL_BUILD')
{
- if (! $seen_canonical)
+ if ($seen_canonical <= AC_CANONICAL_BUILD)
+ {
+ $seen_canonical = AC_CANONICAL_BUILD;
+ $canonical_location = $where;
+ }
+ }
+ elsif ($macro eq 'AC_CANONICAL_HOST')
+ {
+ if ($seen_canonical <= AC_CANONICAL_HOST)
{
$seen_canonical = AC_CANONICAL_HOST;
$canonical_location = $where;
}
}
- elsif ($macro eq 'AC_CANONICAL_SYSTEM')
+ elsif ($macro eq 'AC_CANONICAL_TARGET')
{
- $seen_canonical = AC_CANONICAL_SYSTEM;
+ $seen_canonical = AC_CANONICAL_TARGET;
$canonical_location = $where;
}
elsif ($macro eq 'AC_CONFIG_AUX_DIR')
'TOPDIR' => backname ($relative_dir),
'TOPDIR_P' => $relative_dir eq '.',
- 'BUILD' => $seen_canonical == AC_CANONICAL_SYSTEM,
- 'HOST' => $seen_canonical,
- 'TARGET' => $seen_canonical == AC_CANONICAL_SYSTEM,
+ 'BUILD' => ($seen_canonical >= AC_CANONICAL_BUILD),
+ 'HOST' => ($seen_canonical >= AC_CANONICAL_HOST),
+ 'TARGET' => ($seen_canonical >= AC_CANONICAL_TARGET),
'LIBTOOL' => !! var ('LIBTOOL'),
'NONLIBTOOL' => 1,
# handle_libtool.)
if ($relative_dir eq '.')
{
- # AC_CANONICAL_HOST and AC_CANONICAL_SYSTEM need config.guess and
- # config.sub.
+ # AC_CANONICAL_HOST, AC_CANONICAL_SYSTEM, and AC_CANONICAL_TARGET
+ # need config.guess and config.sub.
require_conf_file ($canonical_location, FOREIGN,
'config.guess', 'config.sub')
if $seen_canonical;
--- /dev/null
+#! /bin/sh
+# Copyright (C) 2004 Free Software Foundation, Inc.
+#
+# This file is part of GNU Automake.
+#
+# GNU Automake is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# GNU Automake is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with Automake; see the file COPYING. If not, write to
+# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+# Boston, MA 02111-1307, USA.
+
+# Test to make sure automake correctly recognizes presence of
+# AC_CANONICAL_(BUILD|HOST|SYSTEM|TARGET), and creates config.* in all
+# those cases.
+# From Norman Gray.
+
+. ./defs || exit 1
+
+set -e
+
+: >Makefile.am
+
+$ACLOCAL
+$AUTOMAKE --add-missing
+test ! -f config.guess
+test ! -f config.sub
+
+# Test all four of the AC_CANONICAL_* targets, including _SYSTEM, which is
+# supported but deprecated by autoconf.
+for macro in AC_CANONICAL_BUILD AC_CANONICAL_HOST \
+ AC_CANONICAL_SYSTEM AC_CANONICAL_TARGET
+do
+ rm -rf autom4te.cache config.sub config.guess
+
+ cat >configure.in<<EOF
+AC_INIT([hosts], [1.0])
+$macro
+AM_INIT_AUTOMAKE
+AC_CONFIG_FILES([Makefile])
+EOF
+
+ $ACLOCAL
+ $AUTOMAKE --add-missing
+
+ # Show the files which were installed
+ ls
+
+ test -f config.guess
+ test -f config.sub
+done
projects / thirdparty / automake.git / commitdiff
