From dfcfa44cb7b1f85674efeed7125d56e5be930d7b Mon Sep 17 00:00:00 2001
From: Akim Demaille <akim@epita.fr>
Date: Sun, 21 Oct 2001 18:05:21 +0000
Subject: [PATCH] * 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.

---
 ChangeLog             | 13 +++++++++++++
 tests/Makefile.am     |  2 --
 tests/Makefile.in     |  1 -
 tests/defs            |  2 +-
 tests/install.test    |  2 +-
 tests/obsolete.test   |  8 ++++++--
 tests/obsolete2.test  | 14 --------------
 tests/subdircond.test |  3 ++-
 8 files changed, 23 insertions(+), 22 deletions(-)
 delete mode 100755 tests/obsolete2.test

diff --git a/ChangeLog b/ChangeLog
index 9d8770aa..413c2841 100644
--- 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 6c6cabef..3ab0c6a7 100644
--- 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 54ccb6af..8fe7ff54 100644
--- 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 de940809..0fa37c58 100644
--- 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 7bc77c56..59168631 100755
--- 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 d139124e..f8a05051 100755
--- 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
index 4a65e846..00000000
--- 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 b7306c88..332667d7 100755
--- 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
-- 
2.43.5