mirror/libtool
2
0
Fork 0
mirror of git://git.savannah.gnu.org/libtool.git synced 2025-04-06 16:20:23 +08:00
Code Issues Packages Projects Releases Wiki Activity

The Grand Renaming. In preparation for libtool-2.0, move all of

Browse Source 
the many and varied m4 symbols accumulated by libtool over the
years, considering also that modern autoconf can detect unexpanded
macros even without AC in the macro name:

* bootstrap: Remove libltdl/config.h from previous releases.
* m4/libtool.m4, m4/ltdl.m4, doc/libtool.texi: Basically, run a
giant sed transformation like this:
s,AC_LIB_LTDL,LTDL_INIT,g
s,AC_LIBLTDL_CONVENIENCE,LTDL_CONVENIENCE,g
s,AC_LIBLTDL_INSTALLABLE,LTDL_INSTALLABLE,g
s,AC_WITH_LTDL,LT_WITH_LTDL,g
s,AC_LTDL_ENABLE_INSTALL,_LT_ENABLE_INSTALL,g
s,AC_DEPLIBS_CHECK_METHOD,_LT_CHECK_MAGIC_METHOD,g
s,AC_LIBTOOL_OBJDIR,_LT_CHECK_OBJDIR,g
s,AC_LTDL_OBJDIR,_LT_CHECK_OBJDIR,g
s,AC_LTDL_DLPREOPEN,_LT_CHECK_DLPREOPEN,g
s,AC_LIBTOOL_SYS_MAX_CMD_LEN,LT_CMD_MAX_LEN,g
s,AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE,_LT_CMD_GLOBAL_SYMBOLS,g
s,AC_LIBTOOL_SYS_OLD_ARCHIVE,_LT_CMD_OLD_ARCHIVE,g
s,AC_PROG_LD_RELOAD_FLAG,_LT_CMD_RELOAD,g
s,AC_LIBTOOL_SYS_LIB_STRIP,_LT_CMD_STRIPLIB,g
s,AC_CHECK_LIBM,LT_LIB_M,g
s,AC_LTDL_DLLIB,LT_LIB_DLLOAD,g
s,AC_LIBTOOL_COMPILER_OPTION,_LT_COMPILER_OPTION,g
s,AC_LIBTOOL_PROG_CC_C_O,_LT_COMPILER_C_O,g
s,AC_LIBTOOL_PROG_COMPILER_NO_RTTI,_LT_COMPILER_NO_RTTI,g
s,AC_LIBTOOL_PROG_COMPILER_PIC,_LT_COMPILER_PIC,g
s,AC_LIBTOOL_SYS_HARD_LINK_LOCKS,_LT_COMPILER_FILE_LOCKS,g
s,AC_LTDL_DLSYM_USCORE,LT_FUNC_DLSYM_USCORE,g
s,AC_LIBTOOL_LINKER_OPTION,_LT_LINKER_OPTION,g
s,AC_LIBTOOL_PROG_LD_SHLIBS,_LT_LINKER_SHLIBS,g
s,AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH,_LT_LINKER_HARDCODE_LIBPATH,g
s,AC_PATH_MAGIC,_LT_PATH_MAGIC,g
s,AC_PATH_TOOL_PREFIX,_LT_PATH_TOOL_PREFIX,g
s,AC_PROG_LD,LT_PATH_LD,g
s,AC_PROG_LD_GNU,_LT_PATH_LD_GNU,g
s,AC_PROG_NM,LT_PATH_NM,g
s,AC_LTDL_SYS_DLOPEN_DEPLIBS,LT_SYS_DLOPEN_DEPLIBS,g
s,AC_LIBTOOL_DLOPEN_SELF,LT_SYS_DLOPEN_SELF,g
s,AC_LIBTOOL_POSTDEP_PREDEP,_LT_SYS_HIDDEN_LIBDEPS,g
s,AC_LTDL_SYSSEARCHPATH,LT_SYS_DLSEARCH_PATH,g
s,AC_LTDL_SHLIBEXT,LT_SYS_MODULE_EXT,g
s,AC_LTDL_SHLIBPATH,LT_SYS_MODULE_PATH,g
s,AC_LTDL_SYMBOL_USCORE,LT_SYS_SYMBOL_USCORE,g
s,AC_LIBTOOL_SYS_DYNAMIC_LINKER,_LT_SYS_DYNAMIC_LINKER,g
s,_LT_AC_TAGVAR,_LT_TAGVAR,g
s,_LT_AC_SYS_COMPILER,_LT_TAG_COMPILER,g
s,_LT_AC_PROG_ECHO_BACKSLASH,_LT_PROG_ECHO_BACKSLASH,g
s,_LT_AC_SYS_LIBPATH_AIX,_LT_SYS_MODULE_PATH_AIX,g
s,_LT_AC_SHELL_INIT,_LT_SHELL_INIT,g
s,_LT_AC_LOCK,_LT_ENABLE_LOCK,g
s,_LT_AC_CHECK_DLFCN,_LT_HEADER_DLFCN,g
s,_LT_AC_TRY_DLOPEN_SELF,_LT_TRY_DLOPEN_SELF,g
s,LT_AC_PROG_EGREP,_LT_DECL_EGREP,g
s,LT_AC_PROG_SED,_LT_DECL_SED,g
* doc/libtool.texi (Autoconf macros): Document exported macros.
* libtoolize.in: Compare ltdl.m4 serial numbers for LTDL_INIT
instead of newly obsoleted AC_LIB_LTDL.
(func_scan_files): Also set seen_ltdl for LTDL_INIT and
LT_WITH_LTDL.


* libltdl/ltdl.c (lt_dlforeachfile): LT_SYS_LIBSEARCH_PATH is not
an environment variable, it is an actual path.
Reported by Noah Mish <noah@cs.caltech.edu>
This commit is contained in:
Gary V. Vaughan 2004-08-22 22:02:07 +00:00
parent 4ac8f641f7
commit 388b7626dc
18 changed files with 1457 additions and 1225 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

70
ChangeLog
View File

@ -1,3 +1,67 @@
2004-08-22 Gary V. Vaughan <gary@gnu.org>
The Grand Renaming. In preparation for libtool-2.0, move all of
the many and varied m4 symbols accumulated by libtool over the
years, considering also that modern autoconf can detect unexpanded
macros even without AC in the macro name:
* bootstrap: Remove libltdl/config.h from previous releases.
* m4/libtool.m4, m4/ltdl.m4, doc/libtool.texi: Basically, run a
giant sed transformation like this:
s,AC_LIB_LTDL,LTDL_INIT,g
s,AC_LIBLTDL_CONVENIENCE,LTDL_CONVENIENCE,g
s,AC_LIBLTDL_INSTALLABLE,LTDL_INSTALLABLE,g
s,AC_WITH_LTDL,LT_WITH_LTDL,g
s,AC_LTDL_ENABLE_INSTALL,_LT_ENABLE_INSTALL,g
s,AC_DEPLIBS_CHECK_METHOD,_LT_CHECK_MAGIC_METHOD,g
s,AC_LIBTOOL_OBJDIR,_LT_CHECK_OBJDIR,g
s,AC_LTDL_OBJDIR,_LT_CHECK_OBJDIR,g
s,AC_LTDL_DLPREOPEN,_LT_CHECK_DLPREOPEN,g
s,AC_LIBTOOL_SYS_MAX_CMD_LEN,LT_CMD_MAX_LEN,g
s,AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE,_LT_CMD_GLOBAL_SYMBOLS,g
s,AC_LIBTOOL_SYS_OLD_ARCHIVE,_LT_CMD_OLD_ARCHIVE,g
s,AC_PROG_LD_RELOAD_FLAG,_LT_CMD_RELOAD,g
s,AC_LIBTOOL_SYS_LIB_STRIP,_LT_CMD_STRIPLIB,g
s,AC_CHECK_LIBM,LT_LIB_M,g
s,AC_LTDL_DLLIB,LT_LIB_DLLOAD,g
s,AC_LIBTOOL_COMPILER_OPTION,_LT_COMPILER_OPTION,g
s,AC_LIBTOOL_PROG_CC_C_O,_LT_COMPILER_C_O,g
s,AC_LIBTOOL_PROG_COMPILER_NO_RTTI,_LT_COMPILER_NO_RTTI,g
s,AC_LIBTOOL_PROG_COMPILER_PIC,_LT_COMPILER_PIC,g
s,AC_LIBTOOL_SYS_HARD_LINK_LOCKS,_LT_COMPILER_FILE_LOCKS,g
s,AC_LTDL_DLSYM_USCORE,LT_FUNC_DLSYM_USCORE,g
s,AC_LIBTOOL_LINKER_OPTION,_LT_LINKER_OPTION,g
s,AC_LIBTOOL_PROG_LD_SHLIBS,_LT_LINKER_SHLIBS,g
s,AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH,_LT_LINKER_HARDCODE_LIBPATH,g
s,AC_PATH_MAGIC,_LT_PATH_MAGIC,g
s,AC_PATH_TOOL_PREFIX,_LT_PATH_TOOL_PREFIX,g
s,AC_PROG_LD,LT_PATH_LD,g
s,AC_PROG_LD_GNU,_LT_PATH_LD_GNU,g
s,AC_PROG_NM,LT_PATH_NM,g
s,AC_LTDL_SYS_DLOPEN_DEPLIBS,LT_SYS_DLOPEN_DEPLIBS,g
s,AC_LIBTOOL_DLOPEN_SELF,LT_SYS_DLOPEN_SELF,g
s,AC_LIBTOOL_POSTDEP_PREDEP,_LT_SYS_HIDDEN_LIBDEPS,g
s,AC_LTDL_SYSSEARCHPATH,LT_SYS_DLSEARCH_PATH,g
s,AC_LTDL_SHLIBEXT,LT_SYS_MODULE_EXT,g
s,AC_LTDL_SHLIBPATH,LT_SYS_MODULE_PATH,g
s,AC_LTDL_SYMBOL_USCORE,LT_SYS_SYMBOL_USCORE,g
s,AC_LIBTOOL_SYS_DYNAMIC_LINKER,_LT_SYS_DYNAMIC_LINKER,g
s,_LT_AC_TAGVAR,_LT_TAGVAR,g
s,_LT_AC_SYS_COMPILER,_LT_TAG_COMPILER,g
s,_LT_AC_PROG_ECHO_BACKSLASH,_LT_PROG_ECHO_BACKSLASH,g
s,_LT_AC_SYS_LIBPATH_AIX,_LT_SYS_MODULE_PATH_AIX,g
s,_LT_AC_SHELL_INIT,_LT_SHELL_INIT,g
s,_LT_AC_LOCK,_LT_ENABLE_LOCK,g
s,_LT_AC_CHECK_DLFCN,_LT_HEADER_DLFCN,g
s,_LT_AC_TRY_DLOPEN_SELF,_LT_TRY_DLOPEN_SELF,g
s,LT_AC_PROG_EGREP,_LT_DECL_EGREP,g
s,LT_AC_PROG_SED,_LT_DECL_SED,g
* doc/libtool.texi (Autoconf macros): Document exported macros.
* libtoolize.in: Compare ltdl.m4 serial numbers for LTDL_INIT
instead of newly obsoleted AC_LIB_LTDL.
(func_scan_files): Also set seen_ltdl for LTDL_INIT and
LT_WITH_LTDL.
2004-08-12 Peter O'Gorman <peter@pogma.com>
* m4/libtool.m4 [GNU/linux] (AC_DEPLIBS_CHECK_METHOD): Cleanup,
@ -7,10 +71,14 @@
* tests/demo-nopic.test: Do not run on x86_64 or s390*
2004-08-05 Gary V. Vaughan <gary@gnu.org>
2004-08-06 Gary V. Vaughan <gary@gnu.org>
* libltdl/ltdl.c (lt_dlforeachfile): LT_SYS_LIBSEARCH_PATH is not
an environment variable, it is an actual path.
* bootstrap: Remove `-f Makefile.am' now that we have an actual
Makefile to build ltmain.sh.
Reported by Noah Mish <noah@cs.caltech.edu>
2004-08-05 Gary V. Vaughan <gary@gnu.org>

4
bootstrap
View File

@ -41,8 +41,8 @@ EOF
rm -rf `find . -path './{arch}' -prune -o \( -name autom4te.cache -o -name libtool \) -print`
# Delete stale acinclude.m4 from previous libtool versions.
rm -f acinclude.m4
# Delete stale files from previous libtool versions.
rm -f acinclude.m4 libltdl/config.h
if test -z "$reconfdirs"; then
reconfdirs=". `ls -1d tests/*demo tests/*demo[0-9]`"

17
configure.ac
View File

@ -150,13 +150,6 @@ AC_SUBST([DIST_MAKEFILE_LIST])
## compiler checks. ##
## ---------------- ##
# Use the specified CC and LD
AC_PROG_CC
AC_EXEEXT
AC_PROG_LD
AC_PROG_NM
AC_PROG_LN_S
# The Autoconf tests for C++ and Fortran 77 sometimes call AC_MSG_ERROR
# and we don't want that to be an error whilst creating the libtool script.
# As these are AC_REQUIREd inside libtool.m4 we can simply call them here
@ -175,7 +168,7 @@ popdef([AC_MSG_ERROR])
## Libtool initialisation. ##
## ----------------------- ##
LT_INIT([dlopen win32-dll])
AC_LIB_LTDL
LTDL_INIT
# Enable all the language support we can
LT_LANG(C++)
@ -189,12 +182,12 @@ LT_LANG(Windows Resource)
## --------------------------- ##
AM_CONDITIONAL(HAVE_CXX,
[test "X$caught_CXX_error" != "Xyes" &&
test -n "[$]_LT_AC_TAGVAR(compiler, CXX)"])
test -n "[$]_LT_TAGVAR(compiler, CXX)"])
AM_CONDITIONAL(HAVE_F77,
[test "X$caught_F77_error" != "Xyes" &&
test -n "[$]_LT_AC_TAGVAR(compiler, F77)"])
AM_CONDITIONAL(HAVE_GCJ, [test -n "[$]_LT_AC_TAGVAR(compiler, GCJ)"])
AM_CONDITIONAL(HAVE_RC, [test -n "[$]_LT_AC_TAGVAR(compiler, RC)"])
test -n "[$]_LT_TAGVAR(compiler, F77)"])
AM_CONDITIONAL(HAVE_GCJ, [test -n "[$]_LT_TAGVAR(compiler, GCJ)"])
AM_CONDITIONAL(HAVE_RC, [test -n "[$]_LT_TAGVAR(compiler, RC)"])
## -------- ##

154
doc/libtool.texi
View File

@ -130,6 +130,7 @@ Invoking @code{libtool}
Integrating libtool with your package
* Autoconf macros:: Autoconf macros exported by libtool.
* Makefile rules:: Writing @file{Makefile} rules for libtool.
* Using Automake:: Automatically supporting libtool.
* Configuring:: Configuring libtool for a host system.
@ -1578,6 +1579,7 @@ This chapter describes how to integrate libtool with your packages so
that your users can install hassle-free shared libraries.
@menu
* Autoconf macros:: Autoconf macros exported by libtool.
* Makefile rules:: Writing @file{Makefile} rules for libtool.
* Using Automake:: Automatically supporting libtool.
* Configuring:: Configuring libtool for a host system.
@ -1585,6 +1587,116 @@ that your users can install hassle-free shared libraries.
* Static-only libraries:: Sometimes shared libraries are just a pain.
@end menu
@node Autoconf macros
@section Autoconf macros exported by libtool
Libtool uses a number of macros to interrogate the host system when it
is being built, and you can use some of them yourself too. Although
there are a great many other macros in the libtool installed m4 files,
these do not form part of the published interface, and are subject to
change between releases.
@noindent
Macros in the @samp{LT_CMD_} namespace check for various shell
commands:
@defmac LT_CMD_MAX_LEN
Finds the longest command line that can be safely passed to
@samp{$SHELL} without being truncated, and store in the shell variable
@samp{$max_cmd_len}. It is only an approximate value, but command
lines of this length or shorter are guaranteed not to be truncated.
@end defmac
@noindent
Macros in the @samp{LT_FUNC_} namespace check characteristics of
library functions:
@defmac LT_FUNC_DLSYM_USCORE
@samp{AC_DEFINE} the preprocessor symbol @samp{DLSYM_USCORE} if we
have to add an underscore to symbol-names passed in to @samp{dlsym}.
@end defmac
@noindent
Macros in the @samp{LT_LIB_} namespace check characteristics of system
libraries:
@defmac LT_LIB_M
Set @samp{LIBM} to the math library or libraries required on this
machine, if any.
@end defmac
@defmac LT_LIB_DLLOAD
This is the macro used by @samp{libltdl} to determine which dlloaders
to use on this machine, if any. Several shell variables are set (and
@samp{AC_SUBST}ed) depending which dlload interfaces are available on
this machine. @samp{LT_DLLOADERS} contains a list of libtool
libraries that can be used, and if necessary also sets
@samp{LIBADD_DLOPEN} if additional system libraries are required by
the @samp{dlopen} loader, and @samp{LIBADD_SHL_LOAD} if additional
system libraries are required by the @samp{shl_load} loader,
respectively. Finally some symbols are set in @file{config.h}
depending on which loaders are found to work: @samp{HAVE_LIBDL},
@samp{HAVE_SHL_LOAD}, @samp{HAVE_DYLD}, @samp{HAVE_DLD}.
@end defmac
@noindent
Macros in the @samp{LT_PATH_} namespace search the system for the full
path to particular system commands:
@defmac LT_PATH_LD
Add a @samp{--with-gnu-ld} option to @file{configure}. Try to find
the path to the linker used by @samp{$CC}, and whether it is the
@sc{gnu} linker. The result is stored in the shell variable
@samp{$LD}, which is @code{AC_SUBST}ed.
@end defmac
@defmac LT_PATH_NM
Try to find a @sc{bsd} compatible @command{nm} command on this
machine. The result is stored in the shell variable @samp{$NM}, which
is @code{AC_SUBST}ed.
@end defmac
@noindent
Macros in the @samp{LT_SYS_} namespace probe for system
characteristics:
@defmac LT_SYS_DLOPEN_SELF
Tests whether a program can dlopen itself, and then also whether the
same program can still dlopen itself when statically linked. Results
are stored in the shell variables @samp{$enable_dlopen_self} and
@samp{enable_dlopen_self_static} respectively.
@end defmac
@defmac LT_SYS_DLOPEN_DEPLIBS
Define the preprocessor symbol @samp{LTDL_DLOPEN_DEPLIBS} if the
@sc{os} needs help to load dependent libraries for @samp{dlopen} (or
equivalent).
@end defmac
@defmac LT_SYS_DLSEARCH_PATH
Define the preprocessor symbol @samp{LT_DLSEARCH_PATH} to the system
default library search path.
@end defmac
@defmac LT_SYS_MODULE_EXT
Define the preprocessor symbol @samp{LT_MODULE_EXT} to the extension
used for runtime loadable modules. If you use libltdl to open
modules, then you can simply use the libtool library extension,
@samp{.la}.
@end defmac
@defmac LT_SYS_MODULE_PATH
Define the preprocessor symbol @samp{LT_MODULE_PATH_VAR} to the name
of the shell environment variable that determines the run-time module
search path.
@end defmac
@defmac LT_SYS_SYMBOL_USCORE
Set the shell variable @samp{sys_symbol_underscore} to @samp{no}
unless the compiler prefixes global symbols with an underscore.
@end defmac
@node Makefile rules
@section Writing @file{Makefile} rules for libtool
@cindex Makefile
@ -2067,8 +2179,8 @@ Display a help message and exit.
Install libltdl in a the @var{TARGET-DIRECTORY-NAME} subdirectory of
your package. If you specify a subdirectory name, then you will need
to be careful to pass the same directory name to the autoconf macros:
@code{AC_WITH_LTDL}; @code{AC_LIBLTDL_CONVENIENCE};
@code{AC_LIBLTDL_INSTALLABLE} (@pxref{Distributing libltdl}). Without
@code{LT_WITH_LTDL}; @code{LTDL_CONVENIENCE};
@code{LTDL_INSTALLABLE} (@pxref{Distributing libltdl}). Without
an argument, @samp{libltdl} is used as the default target directory
name.
@ -3847,13 +3959,13 @@ forget to upgrade @file{acinclude.m4} if you move to a different
release of libltdl.
@c
}. Having made the macros available, you must add a call to the
@samp{AC_WITH_LTDL} macro to your package's @file{configure.ac} to
@samp{LT_WITH_LTDL} macro to your package's @file{configure.ac} to
perform the configure time checks required to build the library
correctly. This method has problems if you then try to link the
package binaries with an installed libltdl, or a library which depends
on libltdl: you will have problems with duplicate symbol definitions.
@defmac AC_WITH_LTDL (@var{DIRECTORY})
@defmac LT_WITH_LTDL (@var{DIRECTORY})
Add the @code{--with-included-ltdl} option to the @file{configure}
script. By default, this macro will try to build @code{libltdl} in
a subdirectory named @file{libltdl}, which is where
@ -3863,7 +3975,7 @@ Otherwise, use @var{DIRECTORY} to pass the location of the
@code{libltdl} source files.
@end defmac
@defmac AC_LIBLTDL_INSTALLABLE (@var{DIRECTORY})
@defmac LTDL_INSTALLABLE (@var{DIRECTORY})
If there is an installed @code{libltdl}, then set @code{LIBLTDL} to the
link flags needed to use it, and @code{LTDLINCL} to the preprocessor
flags needed to find the installed headers. Otherwise, set them to
@ -3878,22 +3990,22 @@ you will need to define @code{top_builddir} and @code{top_srcdir} in
your makefile so that @code{LIBLTDL} and @code{LTDLINCL} are expanded
properly.
If used in conjunction with @code{AC_WITH_LTDL}, this macro must
appear @strong{before} the call to @code{AC_WITH_LTDL}. If you are
not using @code{AC_WITH_LTDL}, then you must add a call to
If used in conjunction with @code{LT_WITH_LTDL}, this macro must
appear @strong{before} the call to @code{LT_WITH_LTDL}. If you are
not using @code{LT_WITH_LTDL}, then you must add a call to
@code{AC_CONFIG_SUBDIRS(@var{DIRECTORY})} to your @file{configure.ac}.
@end defmac
@defmac AC_LIBLTDL_CONVENIENCE (@var{DIRECTORY})
Unless you call @code{AC_LIBLTDL_INSTALLABLE} before hand,
@code{AC_WITH_LTDL} calls this macro automatically, so you should only
ever need to use it yourself if @code{AC_WITH_LTDL} doesn't do what
@defmac LTDL_CONVENIENCE (@var{DIRECTORY})
Unless you call @code{LTDL_INSTALLABLE} before hand,
@code{LT_WITH_LTDL} calls this macro automatically, so you should only
ever need to use it yourself if @code{LT_WITH_LTDL} doesn't do what
you want.
By default, this macro will pass options to the @file{libltdl}
subdirectory @file{configure} to cause it to be built as a convenience
library. If you put the @code{libltdl} sources in a different
subdirectory, then you should tell @code{AC_LIBLTDL_CONVENIENCE} where
subdirectory, then you should tell @code{LTDL_CONVENIENCE} where
with the @var{DIRECTORY} parameter.
@end defmac
@ -3911,11 +4023,11 @@ single program with these libraries, because you may get duplicate
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, add a call to
@samp{AC_LIBLTDL_CONVENIENCE} to your @file{configure.ac},
@emph{before} @samp{LT_INIT}, or use @samp{AC_WITH_LTDL}.
@samp{LTDL_CONVENIENCE} to your @file{configure.ac},
@emph{before} @samp{LT_INIT}, or use @samp{LT_WITH_LTDL}.
In order to select the installable version of libltdl, you should add a
call of the macro @samp{AC_LIBLTDL_INSTALLABLE} to your
call of the macro @samp{LTDL_INSTALLABLE} to your
@file{configure.ac} @emph{before} @samp{LT_INIT}. 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,
@ -3926,7 +4038,7 @@ switch @samp{--enable-ltdl-install}.
Whatever macro you use, it is up to you to ensure that your
@file{configure.ac} will configure libltdl by using
@samp{AC_WITH_LTDL}. Both macros define the shell variables
@samp{LT_WITH_LTDL}. Both macros define the shell variables
@var{LIBLTDL}, to the link flag that you should use to link with
libltdl, and @var{LTDLINCL}, to the preprocessor flag that you should
use to compile with programs that include @file{ltdl.h}.
@ -3939,7 +4051,7 @@ with @samp{$@{top_builddir@}/} and @samp{$@{top_srcdir@}/} respectively.
If you request an installed version of libltdl and one is
found@footnote{@c
@c
Even if libltdl is installed, @samp{AC_LIBLTDL_INSTALLABLE} may fail
Even if libltdl is installed, @samp{LTDL_INSTALLABLE} may fail
to detect it, if libltdl depends on symbols provided by libraries
other than the C library. In this case, it will needlessly build and
install libltdl.
@ -3965,7 +4077,7 @@ for static linking.
The following example shows you how to embed an installable libltdl in
your package. In order to use the convenience variant just replace
@samp{AC_LIBLTDL_INSTALLABLE} with @samp{AC_LIBLTDL_CONVENIENCE}. We
@samp{LTDL_INSTALLABLE} with @samp{LTDL_CONVENIENCE}. We
assume that libltdl was embedded using @samp{libtoolize --ltdl}.
configure.ac:
@ -3974,11 +4086,11 @@ configure.ac:
## ------------------------------------------ ##
## Enable building of the installable library ##
## ------------------------------------------ ##
AC_LIBLTDL_INSTALLABLE
LTDL_INSTALLABLE
# Configure libtool with dlopen support if possible
LT_INIT([dlopen])
AC_WITH_LTDL
LT_WITH_LTDL
...
@end example

18
libltdl/configure.ac
View File

@ -18,7 +18,7 @@
# This configure.ac is not used at all by the libtool bootstrap, but
# is copied to the ltdl subdirectory if you libtoolize --ltdl your own
# project. Adding AC_WITH_LTDL to your project configure.ac will then
# project. Adding LT_WITH_LTDL to your project configure.ac will then
# configure this directory if your user doesn't want to use the installed
# libltdl.
@ -65,24 +65,12 @@ AM_INIT_AUTOMAKE([gnits])
pkgdatadir='${datadir}'"/${PACKAGE}"
## ---------------- ##
## compiler checks. ##
## ---------------- ##
# Use the specified CC and LD
AC_PROG_CC
AC_EXEEXT
AC_PROG_LD
AC_PROG_NM
AC_PROG_LN_S
## ----------------------- ##
## Libtool initialisation. ##
## ----------------------- ##
LT_INIT([dlopen win32-dll])
AC_LIBLTDL_CONVENIENCE
AC_LIB_LTDL
LTDL_CONVENIENCE
LTDL_INIT
## -------- ##

2
libltdl/loaders/dlopen.c
View File

@ -62,7 +62,7 @@ get_vtable (lt_user_data loader_data)
if (vtable && !vtable->name)
{
vtable->name = "lt_dlopen";
#if defined(NEED_USCORE)
#if defined(DLSYM_USCORE)
vtable->sym_prefix = "_";
#endif
vtable->module_open = vm_open;

56
libltdl/ltdl.c
View File

@ -40,8 +40,8 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
#define LTDL_SEARCHPATH_VAR "LTDL_LIBRARY_PATH"
/* Standard libtool archive file extension. */
#undef LTDL_ARCHIVE_EXT
#define LTDL_ARCHIVE_EXT ".la"
#undef LT_ARCHIVE_EXT
#define LT_ARCHIVE_EXT ".la"
/* max. filename length */
#if !defined(LT_FILENAME_MAX)
@ -68,13 +68,13 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
#define LT_DLIS_RESIDENT(handle) LT_DLGET_FLAG(handle, LT_DLRESIDENT_FLAG)
static const char objdir[] = LTDL_OBJDIR;
static const char archive_ext[] = LTDL_ARCHIVE_EXT;
#if defined(LTDL_SHLIB_EXT)
static const char shlib_ext[] = LTDL_SHLIB_EXT;
static const char objdir[] = LT_OBJDIR;
static const char archive_ext[] = LT_ARCHIVE_EXT;
#if defined(LT_MODULE_EXT)
static const char shlib_ext[] = LT_MODULE_EXT;
#endif
#if defined(LTDL_SYSSEARCHPATH)
static const char sys_search_path[] = LTDL_SYSSEARCHPATH;
#if defined(LT_DLSEARCH_PATH)
static const char sys_dlsearch_path[] = LT_DLSEARCH_PATH;
#endif
@ -1055,18 +1055,18 @@ try_dlopen (lt_dlhandle *phandle, const char *filename)
file = find_file (search_path, base_name, &dir);
}
#if defined(LTDL_SHLIBPATH_VAR)
#if defined(LT_MODULE_PATH_VAR)
if (!file)
{
search_path = getenv (LTDL_SHLIBPATH_VAR);
search_path = getenv (LT_MODULE_PATH_VAR);
if (search_path)
file = find_file (search_path, base_name, &dir);
}
#endif
#if defined(LTDL_SYSSEARCHPATH)
if (!file && sys_search_path)
#if defined(LT_SYS_DLSEARCH_PATH)
if (!file && sys_dlsearch_path)
{
file = find_file (sys_search_path, base_name, &dir);
file = find_file (sys_dlsearch_path, base_name, &dir);
}
#endif
}
@ -1256,12 +1256,12 @@ try_dlopen (lt_dlhandle *phandle, const char *filename)
if ((dir || (!find_handle (user_search_path, base_name, &newhandle)
&& !find_handle (getenv (LTDL_SEARCHPATH_VAR), base_name,
&newhandle)
#if defined(LTDL_SHLIBPATH_VAR)
&& !find_handle (getenv (LTDL_SHLIBPATH_VAR), base_name,
#if defined(LT_MODULE_PATH_VAR)
&& !find_handle (getenv (LT_MODULE_PATH_VAR), base_name,
&newhandle)
#endif
#if defined(LTDL_SYSSEARCHPATH)
&& !find_handle (sys_search_path, base_name, &newhandle)
#if defined(LT_SYS_DLSEARCH_PATH)
&& !find_handle (sys_dlsearch_path, base_name, &newhandle)
#endif
)))
{
@ -1328,9 +1328,9 @@ file_not_found (void)
return 0;
}
/* If FILENAME has an ARCHIVE_EXT or SHLIB_EXT extension, try to
/* If FILENAME has an ARCHIVE_EXT or MODULE_EXT extension, try to
open the FILENAME as passed. Otherwise try appending ARCHIVE_EXT,
and if a file is still not found try again with SHLIB_EXT appended
and if a file is still not found try again with MODULE_EXT appended
instead. */
lt_dlhandle
lt_dlopenext (const char *filename)
@ -1354,7 +1354,7 @@ lt_dlopenext (const char *filename)
/* If FILENAME already bears a suitable extension, there is no need
to try appending additional extensions. */
if (ext && ((streq (ext, archive_ext))
#if defined(LTDL_SHLIB_EXT)
#if defined(LT_MODULE_EXT)
|| (streq (ext, shlib_ext))
#endif
))
@ -1382,8 +1382,8 @@ lt_dlopenext (const char *filename)
return handle;
}
#if defined(LTDL_SHLIB_EXT)
/* Try appending SHLIB_EXT. */
#if defined(LT_MODULE_EXT)
/* Try appending MODULE_EXT. */
if (LT_STRLEN (shlib_ext) > LT_STRLEN (archive_ext))
{
FREE (tmp);
@ -1616,21 +1616,21 @@ lt_dlforeachfile (const char *search_path,
foreachfile_callback, func, data);
if (!is_done)
{
is_done = foreach_dirinpath (getenv("LTDL_LIBRARY_PATH"), 0,
is_done = foreach_dirinpath (getenv(LTDL_SEARCHPATH_VAR), 0,
foreachfile_callback, func, data);
}
#if defined(LTDL_SHLIBPATH_VAR)
#if defined(LT_MODULE_PATH_VAR)
if (!is_done)
{
is_done = foreach_dirinpath (getenv(LTDL_SHLIBPATH_VAR), 0,
is_done = foreach_dirinpath (getenv(LT_MODULE_PATH_VAR), 0,
foreachfile_callback, func, data);
}
#endif
#if defined(LTDL_SYSSEARCHPATH)
if (!is_done)
#if defined(LT_SYS_DLSEARCH_PATH)
if (!is_done && sys_dlsearch_path)
{
is_done = foreach_dirinpath (getenv(LTDL_SYSSEARCHPATH), 0,
is_done = foreach_dirinpath (sys_dlsearch_path, 0,
foreachfile_callback, func, data);
}
#endif

4
libtoolize.in
View File

@ -466,6 +466,8 @@ func_scan_files ()
};
/A[CM]_PROG_LIBTOOL/ { s,^.*$,seen_libtool=:,; p; };
/LT_INIT/ { s,^.*$,seen_libtool=:,; p; };
/LTDL_INIT/ { s,^.*$,seen_ltdl=:,; p; };
/LT_WITH_LTDL/ { s,^.*$,seen_ltdl=:,; p; };
/AC_LIB_LTDL/ { s,^.*$,seen_ltdl=:,; p; };
/AC_WITH_LTDL/ { s,^.*$,seen_ltdl=:,; p; };
d;'
@ -761,7 +763,7 @@ func_config_update ()
LT_INIT 'A[CM]_PROG_LIBTOOL'
if $seen_ltdl; then
func_serial_update "$ltdl_m4" "$m4dir/ltdl.m4" 'AC_LIB_LTDL'
func_serial_update "$ltdl_m4" "$m4dir/ltdl.m4" 'LTDL_INIT'
else
func_verbose "Not copying \`$ltdl_m4', libltdl not used."
fi

1968
m4/libtool.m4 vendored
View File

File diff suppressed because it is too large Load Diff

286
m4/ltdl.m4
View File

@ -20,14 +20,14 @@
## configuration script generated by Autoconf, you may include it under
## the same distribution terms that you use for the rest of that program.
# serial 6 AC_LIB_LTDL
# serial 6 LTDL_INIT
# AC_WITH_LTDL([DIRECTORY])
# LT_WITH_LTDL([DIRECTORY])
# -------------------------
# Clients of libltdl can use this macro to allow the installer to
# choose between a shipped copy of the ltdl sources or a preinstalled
# version of the library.
AC_DEFUN([AC_WITH_LTDL],
AC_DEFUN([LT_WITH_LTDL],
[AC_ARG_WITH([included_ltdl],
[AC_HELP_STRING([--with-included-ltdl],
[use the GNU ltdl sources included here])])
@ -48,7 +48,7 @@ fi
if test "x$enable_ltdl_install" != xyes; then
# If the user did not specify an installable libltdl, then default
# to a convenience lib.
AC_LIBLTDL_CONVENIENCE
LTDL_CONVENIENCE
fi
if test "x$with_included_ltdl" = xno; then
@ -63,12 +63,15 @@ fi
AC_MSG_CHECKING([whether to use included libltdl])
AC_MSG_RESULT([$with_included_ltdl])
AC_CONFIG_SUBDIRS(m4_if($#, 1, [$1], [libltdl]))
])# AC_WITH_LTDL
AC_CONFIG_SUBDIRS([m4_if($#, 1, [$1], [libltdl])])
])# LT_WITH_LTDL
# Old name:
AU_DEFUN([AC_WITH_LTDL], [LT_WITH_LTDL])
# AC_LIBLTDL_CONVENIENCE([DIRECTORY])
# -----------------------------------
# LTDL_CONVENIENCE([DIRECTORY])
# -----------------------------
# sets LIBLTDL to the link flags for the libltdl convenience library and
# LTDLINCL to the include flags for the libltdl header and adds
# --enable-ltdl-convenience to the configure arguments. Note that LIBLTDL
@ -78,7 +81,7 @@ AC_CONFIG_SUBDIRS(m4_if($#, 1, [$1], [libltdl]))
# '${top_srcdir}/' (note the single quotes!). If your package is not
# flat and you're not using automake, define top_builddir and
# top_srcdir appropriately in the Makefiles.
AC_DEFUN([AC_LIBLTDL_CONVENIENCE],
AC_DEFUN([LTDL_CONVENIENCE],
[case $enable_ltdl_convenience in
no) AC_MSG_ERROR([this package needs a convenience libltdl]) ;;
"") enable_ltdl_convenience=yes
@ -93,11 +96,14 @@ AC_SUBST([LTDLINCL])
# For backwards non-gettext consistent compatibility...
INCLTDL="$LTDLINCL"
AC_SUBST([INCLTDL])
])# AC_LIBLTDL_CONVENIENCE
])# LTDL_CONVENIENCE
# Old name:
AU_DEFUN([AC_LIBLTDL_CONVENIENCE], [LTDL_CONVENIENCE])
# AC_LIBLTDL_INSTALLABLE([DIRECTORY])
# -----------------------------------
# LTDL_INSTALLABLE([DIRECTORY])
# -----------------------------
# sets LIBLTDL to the link flags for the libltdl installable library and
# LTDLINCL to the include flags for the libltdl header and adds
# --enable-ltdl-install to the configure arguments. Note that LIBLTDL
@ -108,7 +114,7 @@ AC_SUBST([INCLTDL])
# quotes!). If your package is not flat and you're not using automake,
# define top_builddir and top_srcdir appropriately in the Makefiles.
# In the future, this macro may have to be called after LT_INIT.
AC_DEFUN([AC_LIBLTDL_INSTALLABLE],
AC_DEFUN([LTDL_INSTALLABLE],
[AC_CHECK_LIB(ltdl, lt_dlinit,
[test x"$enable_ltdl_install" != xyes && enable_ltdl_install=no],
[if test x"$enable_ltdl_install" = xno; then
@ -133,30 +139,34 @@ AC_SUBST([LTDLINCL])
# For backwards non-gettext consistent compatibility...
INCLTDL="$LTDLINCL"
AC_SUBST([INCLTDL])
])# AC_LIBLTDL_INSTALLABLE
])# LTDL_INSTALLABLE
# Old name:
AU_DEFUN([AC_LIBLTDL_INSTALLABLE], [LTDL_INSTALLABLE])
# AC_LIB_LTDL
# -----------
# LTDL_INIT
# ---------
# Perform all the checks necessary for compilation of the ltdl objects
# -- including compiler checks and header checks.
AC_DEFUN([AC_LIB_LTDL],
[AC_REQUIRE([AC_PROG_CC])
AC_REQUIRE([AC_C_CONST])
AC_REQUIRE([AC_HEADER_STDC])
AC_REQUIRE([AC_HEADER_DIRENT])
AC_REQUIRE([_LT_AC_CHECK_DLFCN])
AC_REQUIRE([AC_LTDL_ENABLE_INSTALL])
AC_REQUIRE([AC_LTDL_SHLIBEXT])
AC_REQUIRE([AC_LTDL_SHLIBPATH])
AC_REQUIRE([AC_LTDL_SYSSEARCHPATH])
AC_REQUIRE([AC_LTDL_OBJDIR])
AC_REQUIRE([AC_LTDL_DLPREOPEN])
AC_REQUIRE([AC_LTDL_DLLIB])
AC_REQUIRE([AC_LTDL_SYMBOL_USCORE])
AC_REQUIRE([AC_LTDL_DLSYM_USCORE])
AC_REQUIRE([AC_LTDL_SYS_DLOPEN_DEPLIBS])
AC_REQUIRE([gl_FUNC_ARGZ])
AC_DEFUN([LTDL_INIT],
[AC_REQUIRE([AC_PROG_CC])dnl
AC_REQUIRE([AC_C_CONST])dnl
AC_REQUIRE([AC_HEADER_STDC])dnl
AC_REQUIRE([AC_HEADER_DIRENT])dnl
AC_REQUIRE([LT_SYS_MODULE_EXT])dnl
AC_REQUIRE([LT_SYS_MODULE_PATH])dnl
AC_REQUIRE([LT_SYS_DLSEARCH_PATH])dnl
AC_REQUIRE([LT_LIB_DLLOAD])dnl
AC_REQUIRE([LT_SYS_SYMBOL_USCORE])dnl
AC_REQUIRE([LT_FUNC_DLSYM_USCORE])dnl
AC_REQUIRE([LT_SYS_DLOPEN_DEPLIBS])dnl
AC_REQUIRE([gl_FUNC_ARGZ])dnl
m4_require([_LT_CHECK_OBJDIR])dnl
m4_require([_LT_HEADER_DLFCN])dnl
m4_require([_LT_ENABLE_INSTALL])dnl
m4_require([_LT_CHECK_DLPREOPEN])dnl
# In order that ltdl.c can compile, run AC_CONFIG_HEADERS for the user
# if they did not call it themself. This is so that ltdl.h can pick up
@ -172,73 +182,76 @@ AC_CHECK_HEADERS([memory.h unistd.h dl.h sys/dl.h dld.h mach-o/dyld.h],
AC_CHECK_HEADERS([string.h strings.h], [break], [], [AC_INCLUDES_DEFAULT])
AC_CHECK_FUNCS([closedir opendir readdir], [], [AC_LIBOBJ([lt__dirent])])
])# AC_LIB_LTDL
])# LTDL_INIT
# Old name:
AU_DEFUN([AC_LIB_LTDL], [LTDL_INIT])
# AC_LTDL_ENABLE_INSTALL
# ----------------------
AC_DEFUN([AC_LTDL_ENABLE_INSTALL],
# _LT_ENABLE_INSTALL
# ------------------
m4_defun([_LT_ENABLE_INSTALL],
[AC_ARG_ENABLE([ltdl-install],
[AC_HELP_STRING([--enable-ltdl-install], [install libltdl])])
AM_CONDITIONAL(INSTALL_LTDL, test x"${enable_ltdl_install-no}" != xno)
AM_CONDITIONAL(CONVENIENCE_LTDL, test x"${enable_ltdl_convenience-no}" != xno)
])])# AC_LTDL_ENABLE_INSTALL
])])# _LT_ENABLE_INSTALL
# AC_LTDL_SYS_DLOPEN_DEPLIBS
# --------------------------
AC_DEFUN([AC_LTDL_SYS_DLOPEN_DEPLIBS],
[AC_REQUIRE([AC_CANONICAL_HOST])
# LT_SYS_DLOPEN_DEPLIBS
# ---------------------
AC_DEFUN([LT_SYS_DLOPEN_DEPLIBS],
[AC_REQUIRE([AC_CANONICAL_HOST])dnl
AC_CACHE_CHECK([whether deplibs are loaded by dlopen],
[libltdl_cv_sys_dlopen_deplibs],
[lt_cv_sys_dlopen_deplibs],
[# PORTME does your system automatically load deplibs for dlopen?
# or its logical equivalent (e.g. shl_load for HP-UX < 11)
# For now, we just catch OSes we know something about -- in the
# future, we'll try test this programmatically.
libltdl_cv_sys_dlopen_deplibs=unknown
lt_cv_sys_dlopen_deplibs=unknown
case "$host_os" in
aix3*|aix4.1.*|aix4.2.*)
# Unknown whether this is true for these versions of AIX, but
# we want this `case' here to explicitly catch those versions.
libltdl_cv_sys_dlopen_deplibs=unknown
lt_cv_sys_dlopen_deplibs=unknown
;;
aix[[45]]*)
libltdl_cv_sys_dlopen_deplibs=yes
lt_cv_sys_dlopen_deplibs=yes
;;
darwin*)
# Assuming the user has installed a libdl from somewhere, this is true
# If you are looking for one http://www.opendarwin.org/projects/dlcompat
libltdl_cv_sys_dlopen_deplibs=yes
lt_cv_sys_dlopen_deplibs=yes
;;
gnu* | linux* | kfreebsd*-gnu | knetbsd*-gnu)
# GNU and its variants, using gnu ld.so (Glibc)
libltdl_cv_sys_dlopen_deplibs=yes
lt_cv_sys_dlopen_deplibs=yes
;;
hpux10*|hpux11*)
libltdl_cv_sys_dlopen_deplibs=yes
lt_cv_sys_dlopen_deplibs=yes
;;
irix[[12345]]*|irix6.[[01]]*)
# Catch all versions of IRIX before 6.2, and indicate that we don't
# know how it worked for any of those versions.
libltdl_cv_sys_dlopen_deplibs=unknown
lt_cv_sys_dlopen_deplibs=unknown
;;
irix*)
# The case above catches anything before 6.2, and it's known that
# at 6.2 and later dlopen does load deplibs.
libltdl_cv_sys_dlopen_deplibs=yes
lt_cv_sys_dlopen_deplibs=yes
;;
netbsd*)
libltdl_cv_sys_dlopen_deplibs=yes
lt_cv_sys_dlopen_deplibs=yes
;;
openbsd*)
libltdl_cv_sys_dlopen_deplibs=yes
lt_cv_sys_dlopen_deplibs=yes
;;
osf[[1234]]*)
# dlopen did load deplibs (at least at 4.x), but until the 5.x series,
# it did *not* use an RPATH in a shared library to find objects the
# library depends on, so we explictly say `no'.
libltdl_cv_sys_dlopen_deplibs=no
lt_cv_sys_dlopen_deplibs=no
;;
osf5.0|osf5.0a|osf5.1)
# dlopen *does* load deplibs and with the right loader patch applied
@ -247,111 +260,101 @@ AC_CACHE_CHECK([whether deplibs are loaded by dlopen],
# patch is installed. Since this is the case, all we can really
# say is unknown -- it depends on the patch being installed. If
# it is, this changes to `yes'. Without it, it would be `no'.
libltdl_cv_sys_dlopen_deplibs=unknown
lt_cv_sys_dlopen_deplibs=unknown
;;
osf*)
# the two cases above should catch all versions of osf <= 5.1. Read
# the comments above for what we know about them.
# At > 5.1, deplibs are loaded *and* any RPATH in a shared library
# is used to find them so we can finally say `yes'.
libltdl_cv_sys_dlopen_deplibs=yes
lt_cv_sys_dlopen_deplibs=yes
;;
qnx*)
libltdl_cv_sys_dlopen_deplibs=yes
lt_cv_sys_dlopen_deplibs=yes
;;
solaris*)
libltdl_cv_sys_dlopen_deplibs=yes
lt_cv_sys_dlopen_deplibs=yes
;;
esac
])
if test "$libltdl_cv_sys_dlopen_deplibs" != yes; then
if test "$lt_cv_sys_dlopen_deplibs" != yes; then
AC_DEFINE([LTDL_DLOPEN_DEPLIBS], [1],
[Define if the OS needs help to load dependent libraries for dlopen().])
fi
])# AC_LTDL_SYS_DLOPEN_DEPLIBS
])# LT_SYS_DLOPEN_DEPLIBS
# Old name:
AU_DEFUN([AC_LTDL_SYS_DLOPEN_DEPLIBS], [LT_SYS_DLOPEN_DEPLIBS])
# AC_LTDL_SHLIBEXT
# ----------------
AC_DEFUN([AC_LTDL_SHLIBEXT],
[AC_REQUIRE([AC_LIBTOOL_SYS_DYNAMIC_LINKER])
AC_CACHE_CHECK([which extension is used for loadable modules],
# LT_SYS_MODULE_EXT
# -----------------
AC_DEFUN([LT_SYS_MODULE_EXT],
[m4_require([_LT_SYS_DYNAMIC_LINKER])dnl
AC_CACHE_CHECK([which extension is used for runtime loadable modules],
[libltdl_cv_shlibext],
[
module=yes
eval libltdl_cv_shlibext=$shrext_cmds
])
if test -n "$libltdl_cv_shlibext"; then
AC_DEFINE_UNQUOTED(LTDL_SHLIB_EXT, "$libltdl_cv_shlibext",
[Define to the extension used for shared libraries, say, ".so".])
m4_pattern_allow([LT_MODULE_EXT])dnl
AC_DEFINE_UNQUOTED(LT_MODULE_EXT, "$libltdl_cv_shlibext",
[Define to the extension used for runtime loadable modules, say, ".so".])
fi
])# AC_LTDL_SHLIBEXT
])# LT_SYS_MODULE_EXT
# Old name:
AU_DEFUN([AC_LTDL_SHLIBEXT], [LT_SYS_MODULE_EXT])
# AC_LTDL_SHLIBPATH
# -----------------
AC_DEFUN([AC_LTDL_SHLIBPATH],
[AC_REQUIRE([AC_LIBTOOL_SYS_DYNAMIC_LINKER])
AC_CACHE_CHECK([which variable specifies run-time library path],
[libltdl_cv_shlibpath_var], [libltdl_cv_shlibpath_var="$shlibpath_var"])
if test -n "$libltdl_cv_shlibpath_var"; then
AC_DEFINE_UNQUOTED(LTDL_SHLIBPATH_VAR, "$libltdl_cv_shlibpath_var",
[Define to the name of the environment variable that determines the dynamic library search path.])
# LT_SYS_MODULE_PATH
# ------------------
AC_DEFUN([LT_SYS_MODULE_PATH],
[m4_require([_LT_SYS_DYNAMIC_LINKER])dnl
AC_CACHE_CHECK([which variable specifies run-time module search path],
[lt_cv_module_path_var], [lt_cv_module_path_var="$shlibpath_var"])
if test -n "$lt_cv_module_path_var"; then
m4_pattern_allow([LT_MODULE_PATH_VAR])dnl
AC_DEFINE_UNQUOTED(LT_MODULE_PATH_VAR, "$lt_cv_module_path_var",
[Define to the name of the environment variable that determines the run-time module search path.])
fi
])# AC_LTDL_SHLIBPATH
])# LT_SYS_MODULE_PATH
# Old name:
AU_DEFUN([AC_LTDL_SHLIBPATH], [LT_SYS_MODULE_PATH])
# AC_LTDL_SYSSEARCHPATH
# LT_SYS_DLSEARCH_PATH
# ---------------------
AC_DEFUN([AC_LTDL_SYSSEARCHPATH],
[AC_REQUIRE([AC_LIBTOOL_SYS_DYNAMIC_LINKER])
AC_DEFUN([LT_SYS_DLSEARCH_PATH],
[m4_require([_LT_SYS_DYNAMIC_LINKER])dnl
AC_CACHE_CHECK([for the default library search path],
[libltdl_cv_sys_search_path],
[libltdl_cv_sys_search_path="$sys_lib_dlsearch_path_spec"])
if test -n "$libltdl_cv_sys_search_path"; then
sys_search_path=
for dir in $libltdl_cv_sys_search_path; do
if test -z "$sys_search_path"; then
sys_search_path="$dir"
[lt_cv_sys_dlsearch_path],
[lt_cv_sys_dlsearch_path="$sys_lib_dlsearch_path_spec"])
if test -n "$lt_cv_sys_dlsearch_path"; then
sys_dlsearch_path=
for dir in $lt_cv_sys_dlsearch_path; do
if test -z "$sys_dlsearch_path"; then
sys_dlsearch_path="$dir"
else
sys_search_path="$sys_search_path$PATH_SEPARATOR$dir"
sys_dlsearch_path="$sys_dlsearch_path$PATH_SEPARATOR$dir"
fi
done
AC_DEFINE_UNQUOTED(LTDL_SYSSEARCHPATH, "$sys_search_path",
m4_pattern_allow([LT_DLSEARCH_PATH])dnl
AC_DEFINE_UNQUOTED(LT_DLSEARCH_PATH, "$sys_dlsearch_path",
[Define to the system default library search path.])
fi
])# AC_LTDL_SYSSEARCHPATH
])# LT_SYS_DLSEARCH_PATH
# Old name:
AU_DEFUN([AC_LTDL_SYSSEARCHPATH], [LT_SYS_DLSEARCH_PATH])
# AC_LTDL_OBJDIR
# --------------
AC_DEFUN([AC_LTDL_OBJDIR],
[AC_CACHE_CHECK([for objdir],
[libltdl_cv_objdir],
[libltdl_cv_objdir="$objdir"
if test -n "$objdir"; then
:
else
rm -f .libs 2>/dev/null
mkdir .libs 2>/dev/null
if test -d .libs; then
libltdl_cv_objdir=.libs
else
# MS-DOS does not allow filenames that begin with a dot.
libltdl_cv_objdir=_libs
fi
rmdir .libs 2>/dev/null
fi
])
AC_DEFINE_UNQUOTED(LTDL_OBJDIR, "$libltdl_cv_objdir/",
[Define to the sub-directory in which libtool stores uninstalled libraries.])
])# AC_LTDL_OBJDIR
# AC_LTDL_DLPREOPEN
# _LT_CHECK_DLPREOPEN
# -----------------
AC_DEFUN([AC_LTDL_DLPREOPEN],
[AC_REQUIRE([AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE])
m4_defun([_LT_CHECK_DLPREOPEN],
[m4_require([_LT_CMD_GLOBAL_SYMBOLS])dnl
AC_CACHE_CHECK([whether libtool supports -dlopen/-dlpreopen],
[libltdl_cv_preloaded_symbols],
[if test -n "$lt_cv_sys_global_symbol_pipe"; then
@ -364,12 +367,12 @@ if test x"$libltdl_cv_preloaded_symbols" = xyes; then
AC_DEFINE(HAVE_PRELOADED_SYMBOLS, 1,
[Define if libtool can extract symbol lists from object files.])
fi
])# AC_LTDL_DLPREOPEN
])# _LT_CHECK_DLPREOPEN
# AC_LTDL_DLLIB
# LT_LIB_DLLOAD
# -------------
AC_DEFUN([AC_LTDL_DLLIB],
AC_DEFUN([LT_LIB_DLLOAD],
[m4_pattern_allow([^LT_DLLOADERS$])
LT_DLLOADERS=
AC_SUBST([LT_DLLOADERS])
@ -448,17 +451,20 @@ LIBADD_DL="$LIBADD_DLOPEN $LIBADD_SHL_LOAD"
AC_SUBST([LIBADD_DL])
AC_LANG_POP
])# AC_LTDL_DLLIB
])# LT_LIB_DLLOAD
# Old name:
AU_DEFUN([AC_LTDL_DLLIB], [LT_LIB_DLLOAD])
# AC_LTDL_SYMBOL_USCORE
# LT_SYS_SYMBOL_USCORE
# ---------------------
# does the compiler prefix global symbols with an underscore?
AC_DEFUN([AC_LTDL_SYMBOL_USCORE],
[AC_REQUIRE([AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE])
AC_DEFUN([LT_SYS_SYMBOL_USCORE],
[m4_require([_LT_CMD_GLOBAL_SYMBOLS])dnl
AC_CACHE_CHECK([for _ prefix in compiled symbols],
[ac_cv_sys_symbol_underscore],
[ac_cv_sys_symbol_underscore=no
[lt_cv_sys_symbol_underscore],
[lt_cv_sys_symbol_underscore=no
cat > conftest.$ac_ext <<EOF
void nm_test_func(){}
int main(){nm_test_func;return 0;}
@ -469,7 +475,7 @@ EOF
if AC_TRY_EVAL(NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $ac_nlist) && test -s "$ac_nlist"; then
# See whether the symbols have a leading underscore.
if grep '^. _nm_test_func' "$ac_nlist" >/dev/null; then
ac_cv_sys_symbol_underscore=yes
lt_cv_sys_symbol_underscore=yes
else
if grep '^. nm_test_func ' "$ac_nlist" >/dev/null; then
:
@ -486,14 +492,19 @@ EOF
fi
rm -rf conftest*
])
])# AC_LTDL_SYMBOL_USCORE
sys_symbol_underscore=$lt_cv_sys_symbol_underscore
AC_SUBST([sys_symbol_underscore])
])# LT_SYS_SYMBOL_USCORE
# Old name:
AU_DEFUN([AC_LTDL_SYMBOL_USCORE], [LT_SYS_SYMBOL_USCORE])
# AC_LTDL_DLSYM_USCORE
# LT_FUNC_DLSYM_USCORE
# --------------------
AC_DEFUN([AC_LTDL_DLSYM_USCORE],
[AC_REQUIRE([AC_LTDL_SYMBOL_USCORE])
if test x"$ac_cv_sys_symbol_underscore" = xyes; then
AC_DEFUN([LT_FUNC_DLSYM_USCORE],
[AC_REQUIRE([LT_SYS_SYMBOL_USCORE])dnl
if test x"$lt_cv_sys_symbol_underscore" = xyes; then
if test x"$libltdl_cv_func_dlopen" = xyes ||
test x"$libltdl_cv_lib_dl_dlopen" = xyes ; then
AC_CACHE_CHECK([whether we have to add an underscore for dlsym],
@ -501,7 +512,7 @@ if test x"$ac_cv_sys_symbol_underscore" = xyes; then
[libltdl_cv_need_uscore=unknown
save_LIBS="$LIBS"
LIBS="$LIBS $LIBADD_DLOPEN"
_LT_AC_TRY_DLOPEN_SELF(
_LT_TRY_DLOPEN_SELF(
[libltdl_cv_need_uscore=no], [libltdl_cv_need_uscore=yes],
[], [libltdl_cv_need_uscore=cross])
LIBS="$save_LIBS"
@ -513,4 +524,7 @@ if test x"$libltdl_cv_need_uscore" = xyes; then
AC_DEFINE(NEED_USCORE, 1,
[Define if dlsym() requires a leading underscore in symbol names.])
fi
])# AC_LTDL_DLSYM_USCORE
])# LT_FUNC_DLSYM_USCORE
# Old name:
AU_DEFUN([AC_LTDL_DLSYM_USCORE], [LT_FUNC_DLSYM_USCORE])

23
m4/lt~obsolete.m4 vendored
View File

@ -51,3 +51,26 @@ m4_ifdef([_LT_AC_SHELL_INIT],, [AU_DEFUN([_LT_AC_SHELL_INIT])])
m4_ifdef([_LT_AC_SYS_LIBPATH_AIX],, [AU_DEFUN([_LT_AC_SYS_LIBPATH_AIX])])
m4_ifdef([_LT_PROG_LTMAIN],, [AU_DEFUN([_LT_PROG_LTMAIN])])
m4_ifdef([_LT_AC_TAGVAR],, [AU_DEFUN([_LT_AC_TAGVAR])])
m4_ifdef([AC_LTDL_ENABLE_INSTALL],, [AU_DEFUN([AC_LTDL_ENABLE_INSTALL])])
m4_ifdef([AC_LTDL_PREOPEN],, [AU_DEFUN([AC_LTDL_PREOPEN])])
m4_ifdef([_LT_AC_SYS_COMPILER],, [AU_DEFUN([_LT_AC_SYS_COMPILER])])
m4_ifdef([_LT_AC_LOCK],, [AU_DEFUN([_LT_AC_LOCK])])
m4_ifdef([AC_LIBTOOL_SYS_OLD_ARCHIVE],, [AU_DEFUN([AC_LIBTOOL_SYS_OLD_ARCHIVE])])
m4_ifdef([_LT_AC_TRY_DLOPEN_SELF],, [AU_DEFUN([_LT_AC_TRY_DLOPEN_SELF])])
m4_ifdef([AC_LIBTOOL_PROG_CC_C_O],, [AU_DEFUN([AC_LIBTOOL_PROG_CC_C_O])])
m4_ifdef([AC_LIBTOOL_SYS_HARD_LINK_LOCKS],, [AU_DEFUN([AC_LIBTOOL_SYS_HARD_LINK_LOCKS])])
m4_ifdef([AC_LIBTOOL_OBJDIR],, [AU_DEFUN([AC_LIBTOOL_OBJDIR])])
m4_ifdef([AC_LTDL_OBJDIR],, [AU_DEFUN([AC_LTDL_OBJDIR])])
m4_ifdef([AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH],, [AU_DEFUN([AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH])])
m4_ifdef([AC_LIBTOOL_SYS_LIB_STRIP],, [AU_DEFUN([AC_LIBTOOL_SYS_LIB_STRIP])])
m4_ifdef([AC_PATH_MAGIC],, [AU_DEFUN([AC_PATH_MAGIC])])
m4_ifdef([AC_PROG_LD_GNU],, [AU_DEFUN([AC_PROG_LD_GNU])])
m4_ifdef([AC_PROG_LD_RELOAD_FLAG],, [AU_DEFUN([AC_PROG_LD_RELOAD_FLAG])])
m4_ifdef([AC_DEPLIBS_CHECK_METHOD],, [AU_DEFUN([AC_DEPLIBS_CHECK_METHOD])])
m4_ifdef([AC_LIBTOOL_PROG_COMPILER_NO_RTTI],, [AU_DEFUN([AC_LIBTOOL_PROG_COMPILER_NO_RTTI])])
m4_ifdef([AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE],, [AU_DEFUN([AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE])])
m4_ifdef([AC_LIBTOOL_PROG_COMPILER_PIC],, [AU_DEFUN([AC_LIBTOOL_PROG_COMPILER_PIC])])
m4_ifdef([AC_LIBTOOL_PROG_LD_SHLIBS],, [AU_DEFUN([AC_LIBTOOL_PROG_LD_SHLIBS])])
m4_ifdef([AC_LIBTOOL_POSTDEP_PREDEP],, [AU_DEFUN([AC_LIBTOOL_POSTDEP_PREDEP])])
m4_ifdef([LT_AC_PROG_EGREP],, [AU_DEFUN([LT_AC_PROG_EGREP])])
m4_ifdef([LT_AC_PROG_SED],, [AU_DEFUN([LT_AC_PROG_SED])])

5
tests/cdemo/configure.ac
View File

@ -1,5 +1,5 @@
## Process this file with autoconf to create configure. -*- autoconf -*-
# Copyright (C) 2001, 2003 Free Software Foundation, Inc.
# Copyright (C) 2001, 2003, 2004 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@ -54,8 +54,7 @@ AC_CHECK_HEADERS([math.h])
## ---------------------------- ##
## Libraries required by cdemo. ##
## ---------------------------- ##
AC_CHECK_LIBM
AC_SUBST([LIBM])
LT_LIB_M
## -------- ##

11
tests/demo/configure.ac
View File

@ -1,5 +1,5 @@
## Process this file with autoconf to create configure. -*- autoconf -*-
# Copyright (C) 2001, 2003 Free Software Foundation, Inc.
# Copyright (C) 2001, 2003, 2004 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@ -57,17 +57,16 @@ esac
AM_CONDITIONAL([BINARY_HELLDL], [test "X$binary_helldl" = Xyes])
## ---------------------------- ##
## C headers required by cdemo. ##
## ---------------------------- ##
## --------------------------- ##
## C headers required by demo. ##
## --------------------------- ##
AC_CHECK_HEADERS([string.h math.h])
## --------------------------- ##
## Libraries required by demo. ##
## --------------------------- ##
AC_CHECK_LIBM
AC_SUBST([LIBM])
LT_LIB_M
## -------- ##

17
tests/depdemo/configure.ac
View File

@ -1,5 +1,5 @@
## Process this file with autoconf to create configure. -*- autoconf -*-
# Copyright (C) 2001, 2003 Free Software Foundation, Inc.
# Copyright (C) 2001, 2003, 2004 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@ -51,17 +51,16 @@ AC_SUBST([LIBTOOL_DEPS])
STATIC="\`${CONFIG_SHELL} ./libtool --features | ${SED} -n -e '/enable static/s/^.*\$\$/-static/p'\`"
AC_SUBST([STATIC])
## ---------------------------- ##
## C headers required by cdemo. ##
## ---------------------------- ##
## ------------------------------ ##
## C headers required by depdemo. ##
## ------------------------------ ##
AC_CHECK_HEADERS([math.h])
## ---------------------------- ##
## Libraries required by cdemo. ##
## ---------------------------- ##
AC_CHECK_LIBM
AC_SUBST([LIBM])
## ------------------------------ ##
## Libraries required by depdemo. ##
## ------------------------------ ##
LT_LIB_M
## -------- ##

9
tests/mdemo/configure.ac
View File

@ -1,5 +1,5 @@
## Process this file with autoconf to create configure. -*- autoconf -*-
# Copyright (C) 2001, 2003 Free Software Foundation, Inc.
# Copyright (C) 2001, 2003, 2004 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@ -43,7 +43,7 @@ AC_C_CONST
## ----------------------- ##
## Libtool initialisation. ##
## ----------------------- ##
AC_LIBLTDL_CONVENIENCE([../../libltdl])
LTDL_CONVENIENCE([../../libltdl])
AC_SUBST([INCLTDL])
AC_SUBST([LIBLTDL])
@ -62,10 +62,9 @@ AC_CHECK_HEADERS([math.h])
## ---------------------------- ##
## Libraries required by cdemo. ##
## Libraries required by mdemo. ##
## ---------------------------- ##
AC_CHECK_LIBM
AC_SUBST([LIBM])
LT_LIB_M
## -------- ##

12
tests/mdemo2/configure.ac
View File

@ -1,5 +1,5 @@
## Process this file with autoconf to create configure. -*- autoconf -*-
# Copyright (C) 2001, 2003 Free Software Foundation, Inc.
# Copyright (C) 2001, 2003, 2004 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@ -51,14 +51,14 @@ test "X$enable_static" = Xyes && STATIC="-static"
AC_SUBST([STATIC])
## ---------------------------- ##
## ----------------------------- ##
## C headers required by mdemo2. ##
## ---------------------------- ##
## ----------------------------- ##
## ---------------------------- ##
## Libraries required by cdemo. ##
## ---------------------------- ##
## ----------------------------- ##
## Libraries required by mdemo2. ##
## ----------------------------- ##
## -------- ##

9
tests/pdemo/configure.ac
View File

@ -1,5 +1,5 @@
## Process this file with autoconf to create configure. -*- autoconf -*-
# Copyright (C) 2001, 2003 Free Software Foundation, Inc.
# Copyright (C) 2001, 2003, 2004 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@ -57,16 +57,15 @@ AM_CONDITIONAL([BINARY_HELLDL], [test "X$binary_helldl" = Xyes])
## ---------------------------- ##
## C headers required by cdemo. ##
## C headers required by pdemo. ##
## ---------------------------- ##
AC_CHECK_HEADERS([string.h math.h])
## ---------------------------- ##
## Libraries required by cdemo. ##
## Libraries required by pdemo. ##
## ---------------------------- ##
AC_CHECK_LIBM
AC_SUBST([LIBM])
LT_LIB_M
## -------- ##

17
tests/tagdemo/configure.ac
View File

@ -1,5 +1,5 @@
## Process this file with autoconf to create configure. -*- autoconf -*-
# Copyright (C) 2001, 2003 Free Software Foundation, Inc.
# Copyright (C) 2001, 2003, 2004 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@ -67,17 +67,16 @@ AC_LANG([C++])
LT_INIT
## ---------------------------- ##
## C headers required by cdemo. ##
## ---------------------------- ##
## ------------------------------ ##
## C headers required by tagdemo. ##
## ------------------------------ ##
AC_CHECK_HEADERS([math.h])
## ---------------------------- ##
## Libraries required by cdemo. ##
## ---------------------------- ##
AC_CHECK_LIBM
AC_SUBST([LIBM])
## ------------------------------ ##
## Libraries required by tagdemo. ##
## ------------------------------ ##
LT_LIB_M
## -------- ##