*** empty log message ***

diff --git a/ChangeLog b/ChangeLog
index 57599157d49732b12c75b8848102bf5cbffa1a07..688d6be40562e4bcd33c5896fb580abba65bd1a1 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+1999-01-10  Thomas Tanner  <tanner@gmx.de>
+
+       * ltmain.in: define dld_preloaded_symbols if at least one of
+         -export-dynamic, -dlopen or -dlpreopen was specified,
+         do not include program objects in the symbol list
+         if -export-dynamic was not enabled
+       * libltdl/ltdl.c: limit symbols to max. 256 bytes
+       * mdemo/Makefile.am: build libltdl in a subdirectory,
+         do not use -export-dynamic for mdemo and mdemo.debug
+       * tests/mdemo-conf.test,tests/mdemo-make.test,tests/mdemo-inst.test:
+         do not check for libltdl
+       
 1999-01-09  Alexandre Oliva  <oliva@dcc.unicamp.br>
 
        * libltdl/ltdl.c (lt_dlopen): missing strlen in bound test

diff --git a/libltdl/ltdl.c b/libltdl/ltdl.c
index 0855f03fbfadf23a58bb808e6a2663dcc00f48df..1d4b10f3128b9fa39230edecfaa773a938d584ba 100644 (file)
--- a/libltdl/ltdl.c
+++ b/libltdl/ltdl.c
@@ -961,7 +961,7 @@ lt_dlclose (handle)
        return 0;
 }
 
-#define MAX_SYMBOL_LENGTH      128
+#define MAX_SYMBOL_LENGTH      256
 
 lt_ptr_t
 lt_dlsym (handle, symbol)

diff --git a/ltmain.in b/ltmain.in
index 978afd779ceab59b31a8fc87a8a248af338e1aa0..00ed8baa0018d7d25a6ad3f8137de653a86ed7b6 100644 (file)
--- a/ltmain.in
+++ b/ltmain.in
@@ -1833,7 +1833,7 @@ EOF
        finalize_command=`$echo "X$finalize_command" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP`
       fi
 
-      if test "$export_dynamic" = yes && test -n "$NM" && test -n "$global_symbol_pipe"; then
+      if test "$export_dynamic" = yes || test -n "$dlfiles$dlprefiles" && test -n "$NM" && test -n "$global_symbol_pipe"; then
        dlsyms="${outputname}S.c"
       else
        dlsyms=
@@ -1843,7 +1843,7 @@ EOF
        case "$dlsyms" in
        "") ;;
        *.c)
-         if test -z "$export_symbols"; then
+         if test "$export_dynamic" = yes && test -z "$export_symbols"; then
            # Add our own program objects to the preloaded list.
            dlprefiles=`$echo "X$objs $dlprefiles" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP`
          fi
@@ -1880,7 +1880,7 @@ extern \"C\" {
 /* External symbol declarations for the compiler. */\
 "
 
-         if test -n "$export_symbols"; then
+         if test "$export_dynamic" = yes && test -n "$export_symbols"; then
            sed -e 's/^\(.*\)/\1 \1/' < "$export_symbols" > "$nlist"
          fi
 
@@ -1890,7 +1890,7 @@ extern \"C\" {
          done
 
          if test -z "$run"; then
-           # Make sure we at least have an empty file.
+           # Make sure we have at least an empty file.
            test -f "$nlist" || : > "$nlist"
 
            # Try sorting and uniquifying the output.
@@ -1925,7 +1925,7 @@ dld_preloaded_symbols[] =
 {\
 "
 
-           if test -n "$export_symbols"; then
+           if test "$export_dynamic" = yes && test -n "$export_symbols"; then
              echo >> "$output_objdir/$dlsyms" "\
   {\"${output}\", (lt_ptr_t) 0},"
              sed 's/^\(.*\)/  {"\1", (lt_ptr_t) \&\1},/' < "$export_symbols" >> "$output_objdir/$dlsyms"
@@ -1967,8 +1967,6 @@ dld_preloaded_symbols[] =
          exit 1
          ;;
        esac
-      elif test "$export_dynamic" != yes; then
-       test -n "$dlfiles$dlprefiles" && $echo "$modename: warning: \`-dlopen' and \`-dlpreopen' are ignored without \`-export-dynamic'" 1>&2
       else
        # We keep going just in case the user didn't refer to
        # dld_preloaded_symbols.  The linker will fail if global_symbol_pipe

diff --git a/mdemo/Makefile.am b/mdemo/Makefile.am
index 5c8a63317b0131839c8107b1fa081645e8939ce4..98635f7529bcdfa85b6d1d8015d0bac8d82d680c 100644 (file)
--- a/mdemo/Makefile.am
+++ b/mdemo/Makefile.am
@@ -6,6 +6,16 @@ INCLUDES = -I$(srcdir)/../libltdl
 
 EXTRA_DIST = acinclude.m4
 
+# A little hack to build libltdl in a subdirectory
+libltdl/libltdl.la:
+       -mkdir $(top_builddir)/libltdl
+       (here=`pwd` && cd $(top_builddir)/libltdl && \
+       $$here/../libltdl/configure --srcdir=$$here/../libltdl && \
+       $(MAKE) all)
+       
+distclean-local:
+       -rm -rf $(top_builddir)/libltdl
+
 lib_LTLIBRARIES = libfoo1.la libfoo2.la
 
 libfoo1_la_SOURCES = foo1.c
@@ -20,14 +30,13 @@ bin_PROGRAMS = mdemo mdemo.debug
 
 # Create a version of mdemo that does dlopen.
 mdemo_SOURCES = main.c
-mdemo_LDADD = ../libltdl/libltdl.la \
+mdemo_LDADD = libltdl/libltdl.la \
        $(LIBADD_M) # We won't need this when libltdl takes care of dependencies
-mdemo_LDFLAGS = -export-dynamic -dlopen libfoo1.la -dlopen libfoo2.la
-mdemo_DEPENDENCIES = ../libltdl/libltdl.la libfoo1.la libfoo2.la
+mdemo_LDFLAGS = -dlopen libfoo1.la -dlopen libfoo2.la
+mdemo_DEPENDENCIES = libltdl/libltdl.la libfoo1.la libfoo2.la
 
 # Create an easier-to-debug version of mdemo.
 mdemo_debug_SOURCES = main.c
-mdemo_debug_LDADD = ../libltdl/libltdl.la
-mdemo_debug_LDFLAGS = -static -export-dynamic \
-       -dlopen libfoo1.la -dlopen libfoo2.la
-mdemo_debug_DEPENDENCIES = ../libltdl/libltdl.la libfoo1.la libfoo2.la
+mdemo_debug_LDADD = libltdl/libltdl.la
+mdemo_debug_LDFLAGS = -static -dlopen libfoo1.la -dlopen libfoo2.la
+mdemo_debug_DEPENDENCIES = libltdl/libltdl.la libfoo1.la libfoo2.la

diff --git a/tests/mdemo-conf.test b/tests/mdemo-conf.test
index edef225df1521975d8c51c620f4bd20f4bccd95b..28c39ff5815ab46f404966898b70d1a9b5a76c90 100755 (executable)
--- a/tests/mdemo-conf.test
+++ b/tests/mdemo-conf.test
@@ -10,23 +10,6 @@ if test -z "$srcdir"; then
 fi
 . $srcdir/defs || exit 1
 
-# Maybe we have a VPATH build, in which case, create a new subdir.
-test -d ../libltdl || mkdir ../libltdl
-
-# Change to our build directory.
-cd ../libltdl || exit 1
-
-# Possibly clean up the distribution.
-if test -f Makefile; then
-  echo "= Running $make distclean in ../libltdl"
-  $make distclean
-fi
-rm -f config.cache
-
-# Configure libltdl.
-echo "= Configuring in ../libltdl (prefix=$prefix)"
-CONFIG_SITE=/dev/null ${CONFIG_SHELL-/bin/sh} $srcdir/../libltdl/configure --srcdir=$srcdir/../libltdl --prefix=$prefix || exit 1
-
 # Maybe we have a VPATH build, in which case, create a new subdir.
 test -d ../mdemo || mkdir ../mdemo
 

diff --git a/tests/mdemo-inst.test b/tests/mdemo-inst.test
index 4b12990e2ac8dbdc672f8f396ef1b00a968e7da3..60628acc7a89ebf752398d39a6910f677cd21d12 100755 (executable)
--- a/tests/mdemo-inst.test
+++ b/tests/mdemo-inst.test
@@ -17,13 +17,6 @@ else
   exit 1
 fi
 
-# Check that things are built.
-if test -f ../libltdl/libltdl.la; then :
-else
-  echo "You must build libltdl before $0" 1>&2
-  exit 1
-fi
-
 # Change to our build directory.
 cd ../mdemo || exit 1
 

diff --git a/tests/mdemo-make.test b/tests/mdemo-make.test
index 17c12e2bbca064f69e7866095018af92ae39c73a..d530d0af265bf13a0e6fc24b7342239ee1290625 100755 (executable)
--- a/tests/mdemo-make.test
+++ b/tests/mdemo-make.test
@@ -10,19 +10,12 @@ if test -z "$srcdir"; then
 fi
 . $srcdir/defs || exit 1
 
-if test -f ../libltdl/Makefile && test -f ../mdemo/Makefile; then :
+if test -f ../mdemo/Makefile; then :
 else
   echo "You must run mdemo-conf.test before running $0" 1>&2
   exit 1
 fi
 
-# Change to our build directory.
-cd ../libltdl || exit 1
-
-# Do the actual build.
-echo "Making in ../libltdl"
-$make || exit 1
-
 # Change to our build directory.
 cd ../mdemo || exit 1