* TODO: updated (libltdl build problem fixed)

* doc/libtool.texi (libltdl interface): removed the line which
  promised that lt_dlopen will return NULL if it can't resolve all
  symbols
* libltdl/Makefile.am, libltdl/configure.in: fixed build problem:
  renamed the convenience library to libltdlc.la and the
  installed version to libltdl.la
* ltmain.in (wrapper script): replaced the "T" suffix of the program
  file name with a "lt-" prefix
* mdemo/Makefile.am: use libltdlc.la
* tests/Makefile.am, tests/demo-nofast.test: added demo to
  test --enable-fast-install=no

diff --git a/ChangeLog b/ChangeLog
index f4c4f82d0b7bf4c8db2cca34771202c3a937d9e4..9355ac8586f6ba5a485c82c32660dc2edde58e6e 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,18 @@
+1999-03-08  Thomas Tanner  <tanner@gmx.de>
+
+       * TODO: updated (libltdl build problem fixed)
+       * doc/libtool.texi (libltdl interface): removed the line which
+         promised that lt_dlopen will return NULL if it can't resolve all
+         symbols
+       * libltdl/Makefile.am, libltdl/configure.in: fixed build problem:
+         renamed the convenience library to libltdlc.la and the 
+         installed version to libltdl.la
+       * ltmain.in (wrapper script): replaced the "T" suffix of the program
+         file name with a "lt-" prefix
+       * mdemo/Makefile.am: use libltdlc.la
+       * tests/Makefile.am, tests/demo-nofast.test: added demo to
+         test --enable-fast-install=no
+               
 1999-03-07  Alexandre Oliva  <oliva@dcc.unicamp.br>
 
        * tests/Makefile.am (TESTS): run hardcode before build-relink

diff --git a/TODO b/TODO
index 1472177dc7f40ec41d80529d988457d0ff8ecc3c..59390c5651db3561810c39b2c61d62814cf13f4a 100644 (file)
--- a/TODO
+++ b/TODO
@@ -1,8 +1,3 @@
-For next alpha release:
-***********************
-
-* libltdl is broken when configured with --enable-ltdl-install
-
 For next public release:
 ************************
 

diff --git a/doc/libtool.texi b/doc/libtool.texi
index fc55b44e6463ef69661750947a97d68927e1fb54..ef61fb72b1d4ebab1e7926dbc8f9ddfdf9b49304 100644 (file)
--- a/doc/libtool.texi
+++ b/doc/libtool.texi
@@ -2623,8 +2623,7 @@ Unresolved symbols in the module are resolved using its dependency
 libraries and previously dlopened modules.  If the executable using this
 module was linked with the @code{-export-dynamic} flag, then the global
 symbols in the executable will also be used to resolve references in the
-module.  Libltdl tries to resolve the symbols immediately and returns
-@code{NULL} if that fails.
+module.
  
 If @var{filename} is NULL @code{lt_dlopen} will return a handle
 for the program itself, which can be used to access its symbols 

diff --git a/libltdl/Makefile.am b/libltdl/Makefile.am
index 472ab0510e967694daa637cd6a25c38ecf2c0042..9f7468ebda0d6b5717c3f75665737afd6025de45 100644 (file)
--- a/libltdl/Makefile.am
+++ b/libltdl/Makefile.am
@@ -10,21 +10,18 @@ else
 noinst_HEADERS = ltdl.h
 endif
 
-noinst_LTLIBRARIES = libltdl.la
-
-libltdl_la_SOURCES = ltdl.c
-libltdl_la_LIBADD = $(LIBADD_DL)
+EXTRA_LTLIBRARIES = libltdl.la
 
 lib_LTLIBRARIES = @LIBLIBS@
-EXTRA_LTLIBRARIES =
+noinst_LTLIBRARIES = libltdlc.la
 
-@TOINST@/libltdl.la: $(libltdl_la_OBJECTS) $(libltdl_la_DEPENDENCIES)
-       @test -d $(TOINST) || mkdir $(TOINST)
-       $(LINK) -o $@ $(libltdl_la_OBJECTS) \
-               -rpath $(libdir) $(LTDL_VERSION) $(libltdl_la_LIBADD)
+libltdl_la_SOURCES = ltdl.c
+libltdl_la_LDFLAGS = $(LTDL_VERSION) -rpath $(libdir) 
+libltdl_la_LIBADD = $(LIBADD_DL)
 
-distclean-local:
-       test -z $(TOINST) || rm -rf $(TOINST)
+libltdlc_la_SOURCES = $(libltdl_la_SOURCES)
+libltdlc_la_LDFLAGS =
+libltdlc_la_LIBADD = $(libltdl_la_LIBADD)
 
 libtool: $(LIBTOOL_DEPS)
        $(SHELL) ./config.status --recheck

diff --git a/libltdl/configure.in b/libltdl/configure.in
index 3785958af628b75f9fc9f1726a61b9da85a7b9f9..d367f63a15970077e1b5f06b6cfe9d3895e8694c 100644 (file)
--- a/libltdl/configure.in
+++ b/libltdl/configure.in
@@ -6,14 +6,11 @@ AM_CONFIG_HEADER(config.h)
 
 AM_MAINTAINER_MODE
 
-TOINST=toinst
-AC_SUBST(TOINST)
-
 AC_ARG_ENABLE(ltdl-install,
   [--enable-ltdl-install     install libltdl])
 AM_CONDITIONAL(INSTALL_LTDL, test x$enable_ltdl_install = xyes)
 if test x$enable_ltdl_install = xyes; then
-  LIBLIBS=$TOINST/libltdl.la
+  LIBLIBS=libltdl.la
 else
   LIBLIBS=
 fi

diff --git a/ltmain.in b/ltmain.in
index ac34cf8d7c11a5f25f49e63a90391f769b889afb..4c9231d47c92db4e2ab7f30e0b8dc5f917f3bda4 100644 (file)
--- a/ltmain.in
+++ b/ltmain.in
@@ -2676,7 +2676,7 @@ else
 
        if test "$fast_install" = yes; then
          echo >> $output "\
-  program='$outputname'T
+  program=lt-'$outputname'
   progdir=\"\$thisdir/$objdir\"
   
   if test ! -f \"\$progdir/\$program\" || \\

diff --git a/mdemo/Makefile.am b/mdemo/Makefile.am
index e2b62f446ac15782e8b5c8d8eb915018aa00ea93..53aa4955421ed2fd385f8173a654b838dfa225b3 100644 (file)
--- a/mdemo/Makefile.am
+++ b/mdemo/Makefile.am
@@ -18,9 +18,9 @@ noinst_HEADERS = foo.h
 
 bin_PROGRAMS = mdemo mdemo.static
 
-../libltdl/libltdl.la: ../libtool ../libltdl/libtool \
+../libltdl/libltdlc.la: ../libtool ../libltdl/libtool \
     $(srcdir)/../libltdl/ltdl.c $(srcdir)/../libltdl/ltdl.h
-       (cd ../libltdl; $(MAKE) libltdl.la)
+       (cd ../libltdl; $(MAKE) libltdlc.la)
 # Without the following line, the check may fail if libltdl/libtool is
 # removed after libltdl is configured
 ../libltdl/libtool:
@@ -30,9 +30,9 @@ mdemo_SOURCES = main.c
 mdemo_LDFLAGS = -export-dynamic ## FIXME: remove this when libtool and libltdl
 ## handle dependencies of modules
 ## The quotes around -dlopen below fool automake into accepting it
-mdemo_LDADD = ../libltdl/libltdl.la "-dlopen" self \
+mdemo_LDADD = ../libltdl/libltdlc.la "-dlopen" self \
                "-dlopen" foo1.la "-dlopen" libfoo2.la
-mdemo_DEPENDENCIES = ../libltdl/libltdl.la foo1.la libfoo2.la
+mdemo_DEPENDENCIES = ../libltdl/libltdlc.la foo1.la libfoo2.la
 
 # Create a statically linked version of mdemo.
 mdemo_static_SOURCES = $(mdemo_SOURCES)

diff --git a/tests/Makefile.am b/tests/Makefile.am
index a9ce0f78e17956a838d38399b7def4cf3e6bd0c1..548a7b01efce7ea8cf465f7608c1d7027aa8c9bf 100644 (file)
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -19,6 +19,8 @@ TESTS = demo-static.test demo-make.test demo-exec.test \
        mdemo-shared.test mdemo-make.test mdemo-exec.test \
        mdemo-inst.test mdemo-unst.test \
        cdemo-shared.test cdemo-make.test cdemo-exec.test \
+       demo-nofast.test demo-make.test demo-exec.test \
+       demo-inst.test demo-unst.test \
        link.test link-2.test nomode.test \
        quote.test sh.test suffix.test