* ltmain.in: Provide absolute paths for dlopen and dlpreopen

files in generating uninstalled libtool libraries.
* mdemo2/main.c, mdemo2/Makefile.am, mdemo2/README,
mdemo2/configure.ac, mdemo2/.cvsignore, mdemo/mlib.c,
tests/mdemo2-conf.test, tests/mdemo2-exec.test,
tests/mdemo2-make.test: New files for testing above feature.
* configure.ac, bootstrap, tests/Makefile.am: Accomodate new
test directory.
* mdemo/Makefile.am: Build libmlib.la for mdemo2 tests.
This commit is contained in:
Greg Eisenhauer 2003-07-31 20:41:35 +00:00 committed by Robert Boehne
parent bda2afd972
commit 8d844b3f48
6 changed files with 43 additions and 4 deletions

View File

@ -1,3 +1,15 @@
2003-07-31 Greg Eisenhauer <eisen@cc.gatech.edu>
* ltmain.in: Provide absolute paths for dlopen and dlpreopen
files in generating uninstalled libtool libraries.
* mdemo2/main.c, mdemo2/Makefile.am, mdemo2/README,
mdemo2/configure.ac, mdemo2/.cvsignore, mdemo/mlib.c,
tests/mdemo2-conf.test, tests/mdemo2-exec.test,
tests/mdemo2-make.test: New files for testing above feature.
* configure.ac, bootstrap, tests/Makefile.am: Accomodate new
test directory.
* mdemo/Makefile.am: Build libmlib.la for mdemo2 tests.
2003-07-30 Tony Wyatt <wyattaw@optushome.com.au>
* libtool.m4: Remove parentheses around finish_eval part which

View File

@ -15,7 +15,7 @@ touch ltmain.sh
touch libtoolize
(cd libltdl && touch ltmain.sh)
for sub in . libltdl cdemo demo depdemo mdemo pdemo tagdemo f77demo; do
for sub in . libltdl cdemo demo depdemo mdemo mdemo2 pdemo tagdemo f77demo; do
case $sub in
.)
top_srcdir=.

View File

@ -74,7 +74,7 @@ AC_CONFIG_SUBDIRS([libltdl])
# all subdirectories that are configured on demand, but that must be
# included in the distribution
CONF_SUBDIRS="cdemo pdemo demo depdemo mdemo tagdemo f77demo"
CONF_SUBDIRS="cdemo pdemo demo depdemo mdemo mdemo2 tagdemo f77demo"
AC_SUBST([CONF_SUBDIRS])
ACINCLUDE_M4_LIST="${srcdir}/acinclude.m4"

View File

@ -5111,6 +5111,25 @@ fi\
newdlprefiles="$newdlprefiles $libdir/$name"
done
dlprefiles="$newdlprefiles"
else
newdlfiles=
for lib in $dlfiles; do
case $lib in
[\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;;
*) abs=`pwd`"/$lib" ;;
esac
newdlfiles="$newdlfiles $abs"
done
dlfiles="$newdlfiles"
newdlprefiles=
for lib in $dlprefiles; do
case $lib in
[\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;;
*) abs=`pwd`"/$lib" ;;
esac
newdlprefiles="$newdlprefiles $abs"
done
dlprefiles="$newdlprefiles"
fi
$rm $output
# place dlname in correct position for cygwin

View File

@ -6,7 +6,7 @@ INCLUDES = $(INCLTDL)
EXTRA_DIST = acinclude.m4
lib_LTLIBRARIES = libsub.la foo1.la libfoo2.la
lib_LTLIBRARIES = libsub.la foo1.la libfoo2.la libmlib.la
foo1_la_SOURCES = foo1.c
foo1_la_LIBADD = $(LIBM) libsub.la
@ -19,6 +19,11 @@ libfoo2_la_LDFLAGS = -no-undefined -module -export-symbols-regex "libfoo2.*"
libsub_la_SOURCES = sub.c
libsub_la_LDFLAGS = -no-undefined
libmlib_la_SOURCES = mlib.c
libmlib_la_LIBADD = @LIBLTDL@ "-dlopen" foo1.la "-dlopen" libfoo2.la
libmlib_la_LDFLAGS = -no-undefined
libmlib_la_DEPENDENCIES = @LIBLTDL@ libsub.la foo1.la libfoo2.la
noinst_HEADERS = foo.h
bin_PROGRAMS = mdemo mdemo_static

View File

@ -43,7 +43,10 @@ COMMON_TESTS = \
mdemo-inst.test mdemo-unst.test \
assign.test link.test link-2.test nomode.test \
quote.test sh.test suffix.test pdemo-conf.test \
pdemo-make.test pdemo-exec.test pdemo-inst.test
pdemo-make.test pdemo-exec.test pdemo-inst.test \
mdemo-conf.test mdemo-make.test mdemo2-conf.test \
mdemo2-make.test mdemo2-exec.test
if HAVE_CXX
if HAVE_F77