From 0984f95203b6652cfe757db8b5937c7228493bc4 Mon Sep 17 00:00:00 2001 From: Thomas Tanner Date: Mon, 8 Mar 1999 15:56:45 +0000 Subject: [PATCH] * 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 --- ChangeLog | 15 +++++++++++++++ TODO | 5 ----- doc/libtool.texi | 3 +-- libltdl/Makefile.am | 19 ++++++++----------- libltdl/configure.in | 5 +---- ltmain.in | 2 +- mdemo/Makefile.am | 8 ++++---- tests/Makefile.am | 2 ++ 8 files changed, 32 insertions(+), 27 deletions(-) diff --git a/ChangeLog b/ChangeLog index f4c4f82d0..9355ac858 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,18 @@ +1999-03-08 Thomas Tanner + + * 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 * tests/Makefile.am (TESTS): run hardcode before build-relink diff --git a/TODO b/TODO index 1472177dc..59390c565 100644 --- 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 fc55b44e6..ef61fb72b 100644 --- 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 472ab0510..9f7468ebd 100644 --- 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 3785958af..d367f63a1 100644 --- 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 ac34cf8d7..4c9231d47 100644 --- 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 e2b62f446..53aa49554 100644 --- 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 a9ce0f78e..548a7b01e 100644 --- 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 -- 2.47.3