* tests/install.test: This test is an empty shell, do not run

automake.
* tests/Makefile.am (TESTS): Don't run it.
* tests/defs (ACLOCAL): When using gettext, pass in the installed
aclocaldir.
* tests/subdircond.test (SUBDIRS): AM_GNU_GETTEXT needs automake
--add--missing.
* tests/obsolete2.test: Remove, merged into...
* tests/obsolete.test: here.
Both aclocal and automake should complain.

diff --git a/ChangeLog b/ChangeLog
index 9d8770aaab1c59d5ce8e188dc5a1f12fb39c91b0..413c284154a69b577fd7a206bdd6e696e418d167 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+2001-10-21  Akim Demaille  <akim@epita.fr>
+
+       * tests/install.test: This test is an empty shell, do not run
+       automake.
+       * tests/Makefile.am (TESTS): Don't run it.
+       * tests/defs (ACLOCAL): When using gettext, pass in the installed
+       aclocaldir.
+       * tests/subdircond.test (SUBDIRS): AM_GNU_GETTEXT needs automake
+       --add--missing.
+       * tests/obsolete2.test: Remove, merged into...
+       * tests/obsolete.test: here.
+       Both aclocal and automake should complain.
+
 2001-10-21  Akim Demaille  <akim@epita.fr>
 
        * automake.in (scan_autoconf_traces): Don't recognize AC_SUBSTs

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 6c6cabef6f11f64bef0fe4d5d0a3be611a9ddaaa..3ab0c6a7a7cae020c9c72b03d182e35d56f5c227 100644 (file)
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -156,7 +156,6 @@ include.test \
 info.test \
 insh.test \
 insh2.test \
-install.test \
 install2.test \
 installsh.test \
 instdata.test \
@@ -219,7 +218,6 @@ nolink.test \
 nostdinc.test \
 number.test \
 obsolete.test \
-obsolete2.test \
 order.test \
 outdir.test \
 output.test \

diff --git a/tests/Makefile.in b/tests/Makefile.in
index 54ccb6af3075171dc424615ee5e49c0b8f115c24..8fe7ff543824323ea2f277c5a85d0c5aef258311 100644 (file)
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -291,7 +291,6 @@ nolink.test \
 nostdinc.test \
 number.test \
 obsolete.test \
-obsolete2.test \
 order.test \
 outdir.test \
 output.test \

diff --git a/tests/defs b/tests/defs
index de940809c9f27d279d3e13bd61763fce09cf8f6d..0fa37c58e6961033c1eae7e008f036051921ae42 100644 (file)
--- a/tests/defs
+++ b/tests/defs
@@ -113,7 +113,7 @@ fi
 # Find them on the system.
 aclocaldir=`(aclocal --print-ac-dir) 2>/dev/null`
 case $required in
-  *libtool*)
+  *libtool* | *gettext* )
     ACLOCAL="$ACLOCAL -I $aclocaldir"
     ;;
 esac

diff --git a/tests/install.test b/tests/install.test
index 7bc77c5669c155ae4399b843ca04b654f70004cc..591686317910e6fdfd722c384ce981faddda08a1 100755 (executable)
--- a/tests/install.test
+++ b/tests/install.test
@@ -14,7 +14,7 @@
 # might be required are actually included in the automake
 # distribution.
 # $ACLOCAL || exit 1
-$AUTOMAKE --gnu --add-missing > output 2>&1 && exit 1
+# $AUTOMAKE --gnu --add-missing > output 2>&1 && exit 1
 # grep installing output
 
 exit 0

diff --git a/tests/obsolete.test b/tests/obsolete.test
index d139124e3630b754706a6b1ca17b8c4655507cc0..f8a050515828cf1fd2a9e4776e98202a6b13e410 100755 (executable)
--- a/tests/obsolete.test
+++ b/tests/obsolete.test
@@ -10,6 +10,10 @@ END
 
 : > Makefile.am
 
-$ACLOCAL || exit 1
-$AUTOMAKE && exit 1
+$ACLOCAL  2>stderr          && exit 1
+grep AC_PROG_INSTALL stderr || exit 1
+
+$AUTOMAKE 2>stderr          && exit 1
+grep AC_PROG_INSTALL stderr || exit 1
+
 exit 0

diff --git a/tests/obsolete2.test b/tests/obsolete2.test
deleted file mode 100755 (executable)
index 4a65e84..0000000
--- a/tests/obsolete2.test
+++ /dev/null
@@ -1,14 +0,0 @@
-#! /bin/sh
-
-# Test to make sure obsolete macros really are.
-
-. $srcdir/defs || exit 1
-
-echo AM_FUNC_FNMATCH >> configure.in
-
-: > Makefile.am
-
-$ACLOCAL || exit 1
-$AUTOMAKE 2> output && exit 1
-
-grep AC_FUNC_FNMATCH output

diff --git a/tests/subdircond.test b/tests/subdircond.test
index b7306c88d74ae00e4f6c104ffe509cfb42eb0516..332667d7cb9ce350e04740df099bd6012913f076 100755 (executable)
--- a/tests/subdircond.test
+++ b/tests/subdircond.test
@@ -22,4 +22,5 @@ endif
 END
 
 $ACLOCAL || exit 1
-$AUTOMAKE
+# Gettext wants config.guess etc.
+$AUTOMAKE --add-missing