From 715ffed4b12344ceaa483aea2f408022ce25dc3b Mon Sep 17 00:00:00 2001 From: Alexandre Duret-Lutz Date: Sun, 5 Jan 2003 22:41:33 +0000 Subject: [PATCH] * tests/defs.in: Substitute aclocaldir instead of running the installed aclocal. Otherwise Libtool and Gettext tests get skipped when aclocal doesn't preexist. Reported by Imacat. * tests/listval.test, tests/suffix2.test: Remove pointless -I argument to aclocal. --- ChangeLog | 11 ++++++++++- ChangeLog.2001 | 6 +++--- THANKS | 1 + tests/defs.in | 6 +++--- tests/listval.test | 4 ++-- tests/suffix2.test | 4 ++-- 6 files changed, 21 insertions(+), 11 deletions(-) diff --git a/ChangeLog b/ChangeLog index 50b0e2606..3e8b6caa1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +2003-01-05 Alexandre Duret-Lutz + + * tests/defs.in: Substitute aclocaldir instead of running + the installed aclocal. Otherwise Libtool and Gettext + tests get skipped when aclocal doesn't preexist. + Reported by Imacat. + * tests/listval.test, tests/suffix2.test: Remove pointless -I + argument to aclocal. + 2002-12-31 Alexandre Duret-Lutz * lib/Automake/ChannelDefs.pm: New file. @@ -3219,7 +3228,7 @@ ----- -Copyright (C) 2002 Free Software Foundation, Inc. +Copyright (C) 2002, 2003 Free Software Foundation, Inc. This file is part of GNU Automake. diff --git a/ChangeLog.2001 b/ChangeLog.2001 index 16d326550..e0dc01e3c 100644 --- a/ChangeLog.2001 +++ b/ChangeLog.2001 @@ -832,12 +832,12 @@ 2001-10-21 Akim Demaille - * tests/defs (ACLOCAL): Point to the installed aclocaldir is + * tests/defs (ACLOCAL): Point to the installed aclocaldir if libtool is required. * tests/lex.test: Run AC_INIT once. * tests/ldflags.test, tests/listval.test, tests/suffix2.test: Libtool is required. - * tests/header.test: Built a correct configure.in. + * tests/header.test: Build a correct configure.in. * tests/defun2.test (configure.in): Be a bit respectful with Autoconf, close the macro invocations. * tests/confdeps.test: Even when not using aclocal, aclocal.m4 @@ -4931,7 +4931,7 @@ ----- -Copyright 2001 Free Software Foundation, Inc. +Copyright (C) 2001, 2003 Free Software Foundation, Inc. This file is part of GNU Automake. diff --git a/THANKS b/THANKS index d4dc904b3..78754ee52 100644 --- a/THANKS +++ b/THANKS @@ -75,6 +75,7 @@ H.Merijn Brand h.m.brand@hccnet.nl Harlan Stenn Harlan.Stenn@pfcs.com Henrik Frystyk Nielsen frystyk@w3.org Ian Lance Taylor ian@cygnus.com +Imacat imacat@mail.imacat.idv.tw Inoue inoue@ainet.or.jp James Henstridge james@daa.com.au James Youngman jay@gnu.org diff --git a/tests/defs.in b/tests/defs.in index cc694d50f..35d42d2bb 100644 --- a/tests/defs.in +++ b/tests/defs.in @@ -1,5 +1,5 @@ # -*- shell-script -*- -# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002 +# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 # Free Software Foundation, Inc. # # This file is part of GNU Automake. @@ -200,10 +200,10 @@ fi # We might need extra macros, e.g., from Libtool or Gettext. # Find them on the system. -# Use `-I $srcdir/../m4' in addition to `--acdir', because the +# Use `-I $srcdir/../m4' in addition to `--acdir=$srcdir/../m4', because the # other `-I' directories added for libtool and gettext might contain # files from an old version of Automake that we don't want to use. -aclocaldir=`(aclocal --print-ac-dir) 2>/dev/null` +aclocaldir='@prefix@/share/aclocal' extra_includes="" if [ -f $aclocaldir/dirlist ] ; then extra_includes=`(tmp_inc="" diff --git a/tests/listval.test b/tests/listval.test index ef402f56b..0def90225 100755 --- a/tests/listval.test +++ b/tests/listval.test @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2001, 2002 Free Software Foundation, Inc. +# Copyright (C) 2001, 2002, 2003 Free Software Foundation, Inc. # # This file is part of GNU Automake. # @@ -41,5 +41,5 @@ END : > config.guess : > config.sub -$ACLOCAL -I $aclocaldir || exit 1 +$ACLOCAL || exit 1 $AUTOMAKE diff --git a/tests/suffix2.test b/tests/suffix2.test index 043d8e021..5d1b7f47b 100755 --- a/tests/suffix2.test +++ b/tests/suffix2.test @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 1999, 2001, 2002 Free Software Foundation, Inc. +# Copyright (C) 1999, 2001, 2002, 2003 Free Software Foundation, Inc. # # This file is part of GNU Automake. # @@ -46,7 +46,7 @@ END set -e -$ACLOCAL -I $aclocaldir || exit 1 +$ACLOCAL || exit 1 $AUTOMAKE -a grep -c '^\.c\.o:' Makefile.in | grep '^1$' -- 2.47.2