FYI: Re: aclocal in tests/defs.in

[Alexandre Duret-Lutz]

>>> "imacat" == imacat  <address@hidden> writes:

Sorry for the delay.

[...]
 imacat> I was building automake 1.7.2 on a minimal-installed
 imacat> Debian Linux 3.0r0, which had no automake yet.  When I
 imacat> did a "make check", I noticed that a part of tests were
 imacat> skipped.  But most of them would be performed after I
 imacat> did a "make install".
[...]
 imacat> After tracing into the test process, I found that some
 imacat> tests were depending on an aclocal that has no path
 imacat> specified, in tests/defs (tests/defs.in).  This will
 imacat> run the aclocal in $PATH, usually the
 imacat> currently-installed aclocal, but not the newly-built
 imacat> one.
[...]

Thanks for the report and the patch.  I've installed the
following on HEAD and branch-1-7.  This gets rid of
the aclocal call entirely.

Index: ChangeLog
===================================================================
RCS file: /cvs/automake/automake/ChangeLog,v
retrieving revision 1.2024.2.69
diff -u -r1.2024.2.69 ChangeLog
--- ChangeLog   31 Dec 2002 21:25:34 -0000      1.2024.2.69
+++ ChangeLog   5 Jan 2003 21:51:02 -0000
@@ -1,3 +1,12 @@
+2003-01-05  Alexandre Duret-Lutz  <address@hidden>
+
+       * 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  <address@hidden>
 
        * automake.in (err): Rename as ...
@@ -2929,7 +2938,7 @@
 
 -----
 
-Copyright (C) 2002 Free Software Foundation, Inc.
+Copyright (C) 2002, 2003  Free Software Foundation, Inc.
 
 This file is part of GNU Automake.
 
Index: ChangeLog.2001
===================================================================
RCS file: /cvs/automake/automake/ChangeLog.2001,v
retrieving revision 1.1
diff -u -r1.1 ChangeLog.2001
--- ChangeLog.2001      10 Apr 2002 07:54:30 -0000      1.1
+++ ChangeLog.2001      5 Jan 2003 21:51:15 -0000
@@ -832,12 +832,12 @@
 
 2001-10-21  Akim Demaille  <address@hidden>
 
-       * 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.
 
Index: THANKS
===================================================================
RCS file: /cvs/automake/automake/THANKS,v
retrieving revision 1.186.2.12
diff -u -r1.186.2.12 THANKS
--- THANKS      31 Dec 2002 21:25:35 -0000      1.186.2.12
+++ THANKS      5 Jan 2003 21:51:16 -0000
@@ -75,6 +75,7 @@
 Harlan Stenn           address@hidden
 Henrik Frystyk Nielsen address@hidden
 Ian Lance Taylor       address@hidden
+Imacat                 address@hidden
 Inoue                  address@hidden
 James Henstridge       address@hidden
 James Youngman         address@hidden
Index: tests/defs.in
===================================================================
RCS file: /cvs/automake/automake/tests/defs.in,v
retrieving revision 1.4.2.3
diff -u -r1.4.2.3 defs.in
--- tests/defs.in       21 Nov 2002 13:27:43 -0000      1.4.2.3
+++ tests/defs.in       5 Jan 2003 21:51:42 -0000
@@ -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 @@
 
 # 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=""
Index: tests/listval.test
===================================================================
RCS file: /cvs/automake/automake/tests/listval.test,v
retrieving revision 1.4
diff -u -r1.4 listval.test
--- tests/listval.test  8 Sep 2002 13:07:55 -0000       1.4
+++ tests/listval.test  5 Jan 2003 21:51:43 -0000
@@ -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 @@
 : > config.guess
 : > config.sub
 
-$ACLOCAL -I $aclocaldir || exit 1
+$ACLOCAL || exit 1
 $AUTOMAKE
Index: tests/suffix2.test
===================================================================
RCS file: /cvs/automake/automake/tests/suffix2.test,v
retrieving revision 1.7
diff -u -r1.7 suffix2.test
--- tests/suffix2.test  8 Sep 2002 13:07:56 -0000       1.7
+++ tests/suffix2.test  5 Jan 2003 21:51:43 -0000
@@ -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 @@
 
 set -e
 
-$ACLOCAL -I $aclocaldir || exit 1
+$ACLOCAL || exit 1
 $AUTOMAKE -a
 
 grep -c '^\.c\.o:' Makefile.in   | grep '^1$'


-- 
Alexandre Duret-Lutz