* 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.

diff --git a/ChangeLog b/ChangeLog
index d14d1cc0a82e6f496706ab4f4893ba0d6d59df81..51081b2dd0690b7785bf7269a1b0d2f19f480f5c 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -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

diff --git a/bootstrap b/bootstrap
index c9d9a80dc271a4dc30f75f28ec9f47ba9b2dcc52..304284fc022035c9769cc72e7d7f25d00e10cf5f 100755 (executable)
--- a/bootstrap
+++ b/bootstrap
@@ -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=.

diff --git a/configure.ac b/configure.ac
index 602fd4f737bc9a2468a855941b08ce373d775cf8..5708fb9cd162a8221a34399537f2227b709a98ab 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -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"

diff --git a/ltmain.in b/ltmain.in
index 7ff31df19ad2d1fa67ad9fc4f3223e3541231b26..5065415c3325430bb61083a81d09597182d97841 100644 (file)
--- a/ltmain.in
+++ b/ltmain.in
@@ -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

diff --git a/mdemo/Makefile.am b/mdemo/Makefile.am
index 2141e0d2f2bd677fbc1eafecb3f70a96d656e5cd..8136c4351ea30edf2829c32632e1e5f20329fa00 100644 (file)
--- a/mdemo/Makefile.am
+++ b/mdemo/Makefile.am
@@ -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

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 51a3a8c772a3979a79d1d01fbe5a3fbf5378499a..ab3c34bfdc272f6755f24c77c9ec2fc4594b6273 100644 (file)
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -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