mirror/libtool
2
0
Fork 0
mirror of git://git.savannah.gnu.org/libtool.git synced 2025-03-25 16:00:24 +08:00
Code Issues Packages Projects Releases Wiki Activity

*** empty log message ***

Browse Source
This commit is contained in:
Thomas Tanner 1998-12-23 10:27:14 +00:00
parent 69964bda16
commit 05928ae6f2
5 changed files with 31 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ChangeLog
View File

@ -1,3 +1,12 @@
1998-12-23 Thomas Tanner <tanner@gmx.de>
* libltdl/Makefile.am: build two versions of libltdl:
libltdl (support native dlopen if available, otherwise dlpreopen),
libltdls (like libltdl, but always support for dlpreopen)
* libltdl/ltdl.c: ditto
* libltdl/configure.in: warn if dlopen is not supported
* mdemo/Makefile.am (mdemo.debug): use libltdls
1998-12-22 Alexandre Oliva <oliva@dcc.unicamp.br>
* Makefile.am (SUBDIRS): prepend `.' to avoid am-recursive

12
libltdl/Makefile.am
View File

@ -5,10 +5,18 @@
# level Makefile.
AUTOMAKE_OPTIONS = no-dependencies foreign
lib_LTLIBRARIES = libltdl.la
libltdl_la_SOURCES = ltdl.c
ltdls.lo: ltdl.c
$(LTCOMPILE) -DDEBUG -o $@ -c $<
lib_LTLIBRARIES = libltdl.la libltdls.la
libltdl_la_SOURCES = ltdl.c ltdl.h
libltdl_la_LDFLAGS = $(LIBADD_DL)
libltdls_la_LIBADD = ltdls.lo
libltdls_la_SOURCES = ltdl.h
libltdls_la_LDFLAGS = $(LIBADD_DL)
include_HEADERS = ltdl.h
# rebuild the libtool script if needed

10
libltdl/configure.in
View File

@ -23,16 +23,22 @@ if test x"$libltdl_cv_dlpreopen" = x"yes"; then
AC_DEFINE(HAVE_DLPREOPEN)
fi
supported=yes
LIBADD_DL=
AC_CHECK_FUNCS(dlopen, AC_DEFINE(HAVE_LIBDL),
[AC_CHECK_LIB(dl, dlopen, [AC_DEFINE(HAVE_LIBDL) LIBADD_DL="-ldl"],
[AC_CHECK_LIB(dld, dld_link, [AC_DEFINE(HAVE_DLD) LIBADD_DL="-ldld"],
[AC_CHECK_FUNCS(shl_load, AC_DEFINE(HAVE_SHL_LOAD) )]
[AC_CHECK_FUNCS(shl_load, AC_DEFINE(HAVE_SHL_LOAD), supported=no )]
)]
)]
)
AC_SUBST(LIBADD_DL)
if test "$supported" = no; then
AC_MSG_WARN(Can't find dlopen support: Please make sure that your programs use -dlopen/-dlpreopen.)
AC_DEFINE(DEBUG)
fi
AM_SYS_SYMBOL_UNDERSCORE
if test x"$USE_SYMBOL_UNDERSCORE" = xyes; then
if test x"$ac_cv_func_dlopen" = xyes ||
@ -53,7 +59,7 @@ main() { void *self, *ptr1, *ptr2; self=dlopen(NULL,RTLD_LAZY);
fi
if test x"$libltdl_cv_need_uscore" = xyes; then
AC_DEFINE(NEED_USCORE)
AC_DEFINE(NEED_USCORE)
fi
dnl Output the makefile

2
libltdl/ltdl.c
View File

@ -361,6 +361,7 @@ wll = { LT_DLTYPE_TOP, wll_init, wll_exit,
#endif
#if DEBUG
#if HAVE_DLPREOPEN
/* emulate dynamic linking using dld_preloaded_symbols */
@ -436,6 +437,7 @@ dldpre = { LT_DLTYPE_TOP, dldpre_init, dldpre_exit,
#undef LT_DLTYPE_TOP
#define LT_DLTYPE_TOP &dldpre
#endif
#endif
static lt_dlhandle handles;

4
mdemo/Makefile.am
View File

@ -27,7 +27,7 @@ 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_LDADD = ../libltdl/libltdls.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_DEPENDENCIES = ../libltdl/libltdls.la libfoo1.la libfoo2.la