[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[SCM] GNU Libtool branch, master, updated. v2.4.2-277-gb505244
From: |
Gary V. Vaughan |
Subject: |
[SCM] GNU Libtool branch, master, updated. v2.4.2-277-gb505244 |
Date: |
Sat, 06 Oct 2012 05:57:48 +0000 |
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU Libtool".
The branch, master has been updated
via b505244be8b5160a5564fd3fd1daf16a0038415b (commit)
from 991b5e52a77c4705614387b370219b3a24e9dc1c (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit b505244be8b5160a5564fd3fd1daf16a0038415b
Author: Gary V. Vaughan <address@hidden>
Date: Sat Oct 6 12:53:33 2012 +0700
tests: ensure mdemo.at doesn't rely on installed libltdl.
* tests/mdemo.at (configuer.ac): Build an included convenience
libltdl.
(Makefile.am): Add subdir-objects.
Remove override rules from legacy mdemo tests to reuse parent
libltdlc.la.
(LT_AT_CHECK_CONFIG): Add --with-included-ltdl to configure
arguments so that test cases always use the subproject libltdl
in preference to any installed libltdl.
Reported by Peter Rosin.
Signed-off-by: Gary V. Vaughan <address@hidden>
-----------------------------------------------------------------------
Summary of changes:
tests/mdemo.at | 21 +++++++--------------
1 files changed, 7 insertions(+), 14 deletions(-)
diff --git a/tests/mdemo.at b/tests/mdemo.at
index 5fa77f6..70c5532 100644
--- a/tests/mdemo.at
+++ b/tests/mdemo.at
@@ -44,7 +44,7 @@ LT_CONFIG_LTDL_DIR([libltdl])
AM_INIT_AUTOMAKE
AC_PROG_CC
LT_INIT([dlopen win32-dll])
-LTDL_INIT([nonrecursive])
+LTDL_INIT([nonrecursive convenience])
AC_SUBST([LIBTOOL_DEPS])
AC_SUBST([INCLTDL])
AC_SUBST([LIBLTDL])
@@ -59,7 +59,7 @@ _EOT_]
[cat >Makefile.am <<_EOT_
-AUTOMAKE_OPTIONS = no-dependencies foreign
+AUTOMAKE_OPTIONS = no-dependencies subdir-objects foreign
ACLOCAL_AMFLAGS = -I m4
AM_CPPFLAGS = \$(INCLTDL)
AM_LDFLAGS =
@@ -98,13 +98,6 @@ libmlib_la_DEPENDENCIES = \$(LIBLTDL) libsub.la foo1.la
libfoo2.la
noinst_HEADERS = foo.h
-\$(LIBLTDL): ${top_build_prefix}libtool \
- ${top_build_prefix}config.h $top_srcdir/libltdl/ltdl.c \
- $top_srcdir/libltdl/ltdl.h
- cd $top_build_prefix; \$(MAKE) \`echo \$(LIBLTDL) | sed
's|.*\.\./\.\./libltdl/|libltdl/|g'\`
-# Do not error out if toplevel config.h does not exist:
-${top_build_prefix}config.h:
-
bin_PROGRAMS = mdemo mdemo_static
# Create a version of mdemo that does dlopen.
@@ -641,7 +634,7 @@ AT_SETUP([dynamically ltdl preload static modules])
_LT_SETUP
-LT_AT_CHECK_CONFIG([--disable-shared],
+LT_AT_CHECK_CONFIG([--with-included-ltdl --disable-shared],
[^build_old_libs=yes], [^build_libtool_libs=no])
_LT_CHECK_EXECUTE
_LT_CHECK_INSTALL
@@ -658,7 +651,7 @@ AT_SETUP([dynamically ltdl load a shared module])
_LT_SETUP
-LT_AT_CHECK_CONFIG([--disable-static],
+LT_AT_CHECK_CONFIG([--with-included-ltdl --disable-static],
[^build_old_libs=no], [^build_libtool_libs=yes])
_LT_CHECK_EXECUTE
_LT_CHECK_INSTALL
@@ -675,7 +668,7 @@ AT_SETUP([ltdl load shared and static modules])
_LT_SETUP
-LT_AT_CHECK_CONFIG([],
+LT_AT_CHECK_CONFIG([--with-included-ltdl],
[^build_old_libs=yes], [^build_libtool_libs=yes])
_LT_CHECK_EXECUTE
_LT_CHECK_INSTALL
@@ -692,7 +685,7 @@ AT_SETUP([ltdl dryrun])
_LT_SETUP
-LT_AT_CHECK_CONFIG
+LT_AT_CHECK_CONFIG([--with-included-ltdl])
LT_AT_MAKE([all-local libltdl/libltdlc.la])
# create `before' and `after' in a directory deep within objdir,
@@ -851,7 +844,7 @@ sub() called
foo2 is ok!
]])
-LT_AT_CHECK_CONFIG
+LT_AT_CHECK_CONFIG([--with-included-ltdl])
LT_AT_MAKE
hooks/post-receive
--
GNU Libtool
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [SCM] GNU Libtool branch, master, updated. v2.4.2-277-gb505244,
Gary V. Vaughan <=