From: Thomas Tanner Date: Tue, 29 Jun 1999 17:38:10 +0000 (+0000) Subject: * NEWS: rename dummy to force X-Git-Tag: release-1-3-3~5 X-Git-Url: http://git.ipfire.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=47c212041e833041bb63ace693fd7d43e05d4c21;p=thirdparty%2Flibtool.git * NEWS: rename dummy to force * doc/libtool.texi: better documentation of uninstall mode, rename dummy to force, AC_LIBLTDL_* must be called before AC_PROG_LIBTOOL * ltmain.in: dlname is always soname or in library_names so we don't need to handle different file names --- diff --git a/ChangeLog b/ChangeLog index 87b8b7d65..4addec4f8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +1999-06-29 Thomas Tanner + + * NEWS: rename dummy to force + * doc/libtool.texi: better documentation of uninstall mode, + rename dummy to force, AC_LIBLTDL_* must be called before + AC_PROG_LIBTOOL + * ltmain.in: dlname is always soname or in library_names so + we don't need to handle different file names + 1999-06-29 Alexandre Oliva * ltconfig.in (freebsd*, shlibpath_overrides_runpath): Set to yes diff --git a/NEWS b/NEWS index 7e20fc03b..30183957b 100644 --- a/NEWS +++ b/NEWS @@ -1,7 +1,7 @@ NEWS - list of user-visible changes between releases of GNU Libtool New in 1.3.3: 1999-06-2?, CVS version 1.3.2a, Libtool team: -* New `-dlpreopen dummy' flag to ensure that +* New `-dlpreopen force' flag to ensure that lt_preloaded_symbols is always defined. * Work around self-dlclose bug in FreeBSD 3.1. * Expand convenience libraries when creating reloadable objects. diff --git a/doc/libtool.texi b/doc/libtool.texi index dc0901142..ae78686b5 100644 --- a/doc/libtool.texi +++ b/doc/libtool.texi @@ -1204,7 +1204,7 @@ Link @var{file} into the output program, and add its symbols to @var{lt_preloaded_symbols} (@pxref{Dlpreopening}). If @var{file} is @code{self}, the symbols of the program itself will be added to @var{lt_preloaded_symbols}. -If @var{file} is @code{dummy} libtool will make sure that +If @var{file} is @code{force} libtool will make sure that @var{lt_preloaded_symbols} is always @emph{defined}, regardless of whether it's empty or not. @@ -1351,7 +1351,7 @@ Running this command may require superuser privileges, so the @cindex uninstall mode @cindex mode, uninstall -@dfn{Uninstall} mode deletes installed libraries (and other files). +@dfn{Uninstall} mode deletes installed libraries, executables and objects. The first @var{mode-arg} is the name of the program to use to delete files (typically @file{/bin/rm}). @@ -3028,11 +3028,11 @@ symbols. In general you can safely use the convenience library in programs which don't depend on other libraries that might use libltdl too. In order to enable this flavor of libltdl, you should add the line @samp{AC_LIBLTDL_CONVENIENCE} to your @file{configure.in}, -@emph{after} @samp{AM_PROG_LIBTOOL}. +@emph{before} @samp{AM_PROG_LIBTOOL}. In order to select the installable version of libltdl, you should add a call of the macro @samp{AC_LIBLTDL_INSTALLABLE} to your -@file{configure.in} @emph{after} @samp{AM_PROG_LIBTOOL}. This macro +@file{configure.in} @emph{before} @samp{AM_PROG_LIBTOOL}. This macro will check whether libltdl is already installed and, if not, request the libltdl embedded in your package to be built and installed. Note, however, that no version checking is performed. The user may override @@ -3060,7 +3060,7 @@ with programs that include @file{ltdl.h}. It is up to you to use default, such as @var{LIBS} and @var{CPPFLAGS}. If you're using the convenience libltdl, @var{LIBLTDL} will be the -pathname for the convenience version of libltdland @var{INCLTDL} will be +pathname for the convenience version of libltdl and @var{INCLTDL} will be @samp{-I} followed by the directory that contains libltdl, both starting with @samp{$@{top_builddir@}/}. @@ -3097,17 +3097,16 @@ assume that libltdl was embedded using @samp{libtoolize --ltdl}. configure.in: @example ... -dnl Check for dlopen support -AC_LIBTOOL_DLOPEN -dnl Configure libtool -AM_PROG_LIBTOOL dnl Enable building of the convenience library dnl and set LIBLTDL accordingly AC_LIBLTDL_CONVENIENCE -dnl Substitute LIBLTDL in the Makefiles +dnl Substitute INCLTDL and LIBLTDL in the Makefiles +AC_SUBST(INCLTDL) AC_SUBST(LIBLTDL) -dnl Add INCLTDL to the include path -CPPFLAGS="$CPPFLAGS $INCLTDL" +dnl Check for dlopen support +AC_LIBTOOL_DLOPEN +dnl Configure libtool +AM_PROG_LIBTOOL dnl Configure libltdl AC_CONFIG_SUBDIRS(libltdl) ... @@ -3118,6 +3117,8 @@ Makefile.am: ... SUBDIRS = libltdl +INCLUDES = $(INCLTDL) + myprog_LDFLAGS = -export-dynamic # The quotes around -dlopen below fool automake into accepting it myprog_LDADD = $(LIBLTDL) "-dlopen" self "-dlopen" libfoo.la diff --git a/ltmain.in b/ltmain.in index e855847f5..b0a499180 100644 --- a/ltmain.in +++ b/ltmain.in @@ -901,7 +901,7 @@ compiler." fi case "$arg" in *.la | *.lo) ;; # We handle these cases below. - dummy) + force) if test "$dlself" = no; then dlself=needless export_dynamic=yes @@ -3290,13 +3290,11 @@ libdir='$install_libdir'\ # Install the shared library and build the symlinks. $show "$install_prog $dir/$realname $destdir/$realname" $run eval "$install_prog $dir/$realname $destdir/$realname" || exit $? - test "X$dlname" = "X$realname" && dlname= if test $# -gt 0; then # Delete the old symlinks, and create new ones. for linkname do - test "X$dlname" = "X$linkname" && dlname= if test "$linkname" != "$realname"; then $show "(cd $destdir && $rm $linkname && $LN_S $realname $linkname)" $run eval "(cd $destdir && $rm $linkname && $LN_S $realname $linkname)" @@ -3304,12 +3302,6 @@ libdir='$install_libdir'\ done fi - if test -n "$dlname"; then - # Install the dynamically-loadable library. - $show "$install_prog $dir/$dlname $destdir/$dlname" - $run eval "$install_prog $dir/$dlname $destdir/$dlname" || exit $? - fi - # Do each command in the postinstall commands. lib="$destdir/$realname" eval cmds=\"$postinstall_cmds\" @@ -3741,9 +3733,7 @@ libdir='$install_libdir'\ # Delete the libtool libraries and symlinks. for n in $library_names; do rmfiles="$rmfiles $dir/$n" - test "X$n" = "X$dlname" && dlname= done - test -n "$dlname" && rmfiles="$rmfiles $dir/$dlname" test -n "$old_library" && rmfiles="$rmfiles $dir/$old_library" $show "$rm $rmfiles"