From: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
Date: Fri, 7 Oct 2005 08:52:10 +0000 (+0000)
Subject: * configure.ac (abs_top_builddir, abs_top_srcdir): always
X-Git-Tag: release-2-1b~470
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=cefa1b074c58d56d4a8ef684f8adaa53c947cc5b;p=thirdparty%2Flibtool.git

* configure.ac (abs_top_builddir, abs_top_srcdir): always
substitute.
* Makefile.am (BUILDCHECK_ENVIRONMENT)
(INSTALLCHECK_ENVIRONMENT): New macros.  Set _lt_pkgdatadir,
LIBTOOL, LIBTOOLIZE accordingly, by using above, and
program_transform_name.
* tests/testsuite.at (TESTS_PREPARE): Do not set them anymore.
Set $unset.
(LT_AT_MAKE): Use to unset LIBTOOL and LIBTOOLIZE.
---

diff --git a/ChangeLog b/ChangeLog
index 48091f53f..9b3594c41 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2005-10-07  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
+
+	* configure.ac (abs_top_builddir, abs_top_srcdir): always
+	substitute.
+	* Makefile.am (BUILDCHECK_ENVIRONMENT)
+	(INSTALLCHECK_ENVIRONMENT): New macros.  Set _lt_pkgdatadir,
+	LIBTOOL, LIBTOOLIZE accordingly, by using above, and
+	program_transform_name.
+	* tests/testsuite.at (TESTS_PREPARE): Do not set them anymore.
+	Set $unset.
+	(LT_AT_MAKE): Use to unset LIBTOOL and LIBTOOLIZE.
+
 2005-10-05  Gary V. Vaughan  <gary@gnu.org>
 
 	* tests/subproject.at: Commit the right file this time.
diff --git a/Makefile.am b/Makefile.am
index 1c4dc11d6..41a0796e6 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -493,6 +493,14 @@ TESTS_ENVIRONMENT = MAKE="$(MAKE)" CC="$(CC)" CFLAGS="$(CFLAGS)" \
 	FC="$(FC)" FCFLAGS="$(FCFLAGS)" \
 	GCJ="$(GCJ)" GCJFLAGS="$(GCJFLAGS)"
 
+BUILDCHECK_ENVIRONMENT = _lt_pkgdatadir="$(abs_top_srcdir)" \
+	LIBTOOLIZE="$(abs_top_builddir)/libtoolize" \
+	LIBTOOL="$(abs_top_builddir)/libtool"
+
+INSTALLCHECK_ENVIRONMENT = \
+	LIBTOOLIZE="$(bindir)/`echo libtoolize | sed '$(program_transform_name)'`" \
+	LIBTOOL="$(bindir)/`echo libtool | sed '$(program_transform_name)'`"
+
 check-recursive: $(srcdir)/$(TESTSUITE)
 
 # Use `$(srcdir)' for the benefit of non-GNU makes: this is
@@ -521,12 +529,12 @@ CD_TESTDIR	= abs_srcdir=`$(lt__cd) $(srcdir) && pwd`; cd tests
 # Hook the test suite into the check rule
 check-local: tests/atconfig $(srcdir)/$(TESTSUITE)
 	$(CD_TESTDIR); \
-	$(TESTS_ENVIRONMENT) _lt_pkgdatadir="$$abs_srcdir" $(SHELL) $$abs_srcdir/$(TESTSUITE) $(TESTSUITE_FLAGS)
+	$(TESTS_ENVIRONMENT) $(BUILDCHECK_ENVIRONMENT) $(SHELL) $$abs_srcdir/$(TESTSUITE) $(TESTSUITE_FLAGS)
 
 # Run the test suite on the *installed* tree.
 installcheck-local:
 	$(CD_TESTDIR); \
-	$(TESTS_ENVIRONMENT) $(SHELL) $$abs_srcdir/$(TESTSUITE) $(TESTSUITE_FLAGS) AUTOTEST_PATH=$(exec_prefix)/bin
+	$(TESTS_ENVIRONMENT) $(INSTALLCHECK_ENVIRONMENT) $(SHELL) $$abs_srcdir/$(TESTSUITE) $(TESTSUITE_FLAGS) AUTOTEST_PATH=$(exec_prefix)/bin
 
 # We need to remove any file droppings left behind by testsuite
 clean-local: clean-local-legacy
diff --git a/configure.ac b/configure.ac
index 395d0a58a..45bca19ed 100644
--- a/configure.ac
+++ b/configure.ac
@@ -134,6 +134,9 @@ AC_MSG_RESULT([${sublibobjs_supported-no}])
 ## Libtool specific configuration. ##
 ## ------------------------------- ##
 
+dnl automake-1.9 does not substitute these two by default
+AC_SUBST([abs_top_srcdir])
+AC_SUBST([abs_top_builddir])
 AC_SUBST([aclocaldir], ["\${datadir}/aclocal"])
 AC_SUBST([pkgdatadir], ["\${datadir}/$PACKAGE"])
 
diff --git a/tests/testsuite.at b/tests/testsuite.at
index a11176657..cf1a9d428 100644
--- a/tests/testsuite.at
+++ b/tests/testsuite.at
@@ -19,14 +19,12 @@
 # 02110-1301, USA.
 
 m4_divert_push([PREPARE_TESTS])dnl
-: ${LIBTOOLIZE="${abs_top_builddir}/libtoolize"}
-: ${LIBTOOL="${abs_top_builddir}/libtool"}
 : ${ACLOCAL=aclocal}
 : ${AUTOHEADER=autoheader}
 : ${AUTOCONF=autoconf}
 : ${AUTOMAKE=automake}
 : ${AUTORECONF=autoreconf}
-export LIBTOOLIZE LIBTOOL ACLOCAL AUTOHEADER AUTOCONF AUTOMAKE AUTORECONF
+export ACLOCAL AUTOHEADER AUTOCONF AUTOMAKE AUTORECONF
 macrodir="$abs_top_srcdir/libltdl/m4"
 eval `$LIBTOOL --config | grep ^EGREP=`
 eval `$LIBTOOL --config | $EGREP '^(host|host_os|host_alias|build|ECHO)='`
@@ -34,6 +32,11 @@ configure_options=
 if test -n "$host_alias"; then
   configure_options="--host $host_alias"
 fi
+if (unset FOO) >/dev/null 2>&1; then
+  unset=unset
+else
+  unset=false
+fi
 m4_divert_pop([PREPARE_TESTS])dnl
 
 
@@ -83,7 +86,8 @@ m4_define([LT_AT_CONFIGURE],
 # LT_AT_MAKE([TGTS], [VARS])
 # --------------------------
 m4_define([LT_AT_MAKE],
-[AT_CHECK([$2 $MAKE -e $1], [0], [ignore], [ignore])
+[( $unset LIBTOOL LIBTOOLIZE
+   AT_CHECK([$2 $MAKE -e $1], [0], [ignore], [ignore]) )
 ])