From: Gary V. Vaughan <gary@gnu.org>
Date: Sat, 1 Mar 2008 22:43:04 +0000 (+0000)
Subject: * tests/lt_dladvise.at, tests/lt_dlexit.at,
X-Git-Tag: release-2-2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ec47998b3cafc466ba87c3fae878696671cada7c;p=thirdparty%2Flibtool.git

* tests/lt_dladvise.at, tests/lt_dlexit.at,
tests/need_lib_prefix.at: Skip these tests when called from
`make distcheck DISTCHECK_CONFIGURE_FLAGS=--disable-ltdl-install'.
The tests try to link against the dummy installed libltdl.la
from .../_inst/lib/libltdl.la, which does not exist when
configured with --disable-ltdl-install.
---

diff --git a/ChangeLog b/ChangeLog
index d2c70afeb..187aaa6f7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2008-03-01  Gary V. Vaughan <gary@gnu.org>
+
+	* tests/lt_dladvise.at, tests/lt_dlexit.at,
+	tests/need_lib_prefix.at: Skip these tests when called from
+	`make distcheck DISTCHECK_CONFIGURE_FLAGS=--disable-ltdl-install'.
+	The tests try to link against the dummy installed libltdl.la
+	from .../_inst/lib/libltdl.la, which does not exist when
+	configured with --disable-ltdl-install.
+
 2008-02-29  Gary V. Vaughan  <gary@gnu.org>
 
 	* libltdl/m4/argz.m4 (AC_CHECK_FUNCS): Also use our replacement
diff --git a/tests/lt_dladvise.at b/tests/lt_dladvise.at
index 5c50d0674..6c41a2976 100644
--- a/tests/lt_dladvise.at
+++ b/tests/lt_dladvise.at
@@ -267,6 +267,12 @@ depend: 5
 : ${LTDLINCL="-I$abs_top_srcdir/libltdl"}
 : ${LIBLTDL="$abs_builddir/../libltdl/libltdlc.la"}
 
+# Skip this test when called from:
+#    make distcheck DISTCHECK_CONFIGURE_FLAGS=--disable-ltdl-install
+AT_CHECK([case $LIBLTDL in #(
+ */_inst/lib/*) test -f $LIBLTDL || (exit 77) ;;
+esac], [], [ignore])
+
 CPPFLAGS="$LTDLINCL $CPPFLAGS"
 
 dlopenable='resident local global'
diff --git a/tests/lt_dlexit.at b/tests/lt_dlexit.at
index fe0f5c841..667ca7962 100644
--- a/tests/lt_dlexit.at
+++ b/tests/lt_dlexit.at
@@ -116,9 +116,16 @@ int vb1 = 3;
 #endif
 ]])
 
+
 : ${LTDLINCL="-I$abs_top_srcdir/libltdl"}
 : ${LIBLTDL="$abs_builddir/../libltdl/libltdlc.la"}
 
+# Skip this test when called from:
+#    make distcheck DISTCHECK_CONFIGURE_FLAGS=--disable-ltdl-install
+AT_CHECK([case $LIBLTDL in #(
+ */_inst/lib/*) test -f $LIBLTDL || (exit 77) ;;
+esac], [], [ignore])
+
 CPPFLAGS="$LTDLINCL $CPPFLAGS"
 LDFLAGS="$LDFLAGS -no-undefined"
 
diff --git a/tests/need_lib_prefix.at b/tests/need_lib_prefix.at
index a712813a8..d1f5dc686 100644
--- a/tests/need_lib_prefix.at
+++ b/tests/need_lib_prefix.at
@@ -139,6 +139,12 @@ libfoo2: 3
 : ${LTDLINCL="-I$abs_top_srcdir/libltdl"}
 : ${LIBLTDL="$abs_builddir/../libltdl/libltdlc.la"}
 
+# Skip this test when called from:
+#    make distcheck DISTCHECK_CONFIGURE_FLAGS=--disable-ltdl-install
+AT_CHECK([case $LIBLTDL in #(
+ */_inst/lib/*) test -f $LIBLTDL || (exit 77) ;;
+esac], [], [ignore])
+
 CPPFLAGS="$LTDLINCL $CPPFLAGS"
 LDFLAGS="$LDFLAGS"