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

* libltdl/Makefile.am: install libltdl conditionally...

Browse Source 
* libltdl/configure.in: ... if --enable-ltdl-install is issued
	* libltdl/ltdl.c: removed #ifdef DEBUG
	* mdemo/Makefile.am (mdemo_debug_LDADD, mdemo_debug_DEPENDENCIES):
	use libltdl.la
This commit is contained in:
Alexandre Oliva 1998-12-23 19:33:09 +00:00 committed by Alexandre Oliva
parent 0f08944a49
commit 48c804561a
5 changed files with 38 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ChangeLog
View File

@ -1,3 +1,11 @@
1998-12-23 Alexandre Oliva <oliva@dcc.unicamp.br>
* libltdl/Makefile.am: install libltdl conditionally...
* libltdl/configure.in: ... if --enable-ltdl-install is issued
* libltdl/ltdl.c: removed #ifdef DEBUG
* mdemo/Makefile.am (mdemo_debug_LDADD, mdemo_debug_DEPENDENCIES):
use libltdl.la
1998-12-23 Gary V. Vaughan <gvaughan@oranda.demon.co.uk>
* doc/PLATFORMS: added my cygwin32 box (i686-pc-cygwin32).

26
libltdl/Makefile.am
View File

@ -5,19 +5,23 @@
# level Makefile.
AUTOMAKE_OPTIONS = no-dependencies foreign
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)
LTDL_VERSION = -version-info 0:1:1
if INSTALL_LTDL
LTDL_FLAGS = $(LTDL_VERSION) -rpath $(libdir)
include_HEADERS = ltdl.h
else
LTDL_FLAGS =
noinst_HEADERS = ltdl.h
endif
EXTRA_LTLIBRARIES = libltdl.la
lib_LTLIBRARIES = @LIBLIBS@
noinst_LTLIBRARIES = @NOINSTLIBS@
libltdl_la_SOURCES = ltdl.c
libltdl_la_LDFLAGS = $(LTDL_FLAGS) $(LIBADD_DL)
# rebuild the libtool script if needed
ltdl.lo: libtool

17
libltdl/configure.in
View File

@ -3,6 +3,19 @@ dnl Initialize the ltdl package.
AC_INIT(ltdl.c)
AM_INIT_AUTOMAKE(libltdl,1.0)
AC_ARG_ENABLE(ltdl-install,
[--enable-ltdl-install install libltdl (breaks check before install)])
AM_CONDITIONAL(INSTALL_LTDL, test x$enable_ltdl_install = xyes)
if test x$enable_ltdl_install = xyes; then
LIBLIBS=libltdl.la
NOINSTLIBS=
else
LIBLIBS=
NOINSTLIBS=libltdl.la
fi
AC_SUBST(LIBLIBS)
AC_SUBST(NOINSTLIBS)
AC_PROG_CC
AM_PROG_LIBTOOL
@ -11,10 +24,6 @@ AC_CHECK_HEADERS(malloc.h memory.h stdlib.h unistd.h stdio.h ctype.h dlfcn.h dl.
AC_CHECK_HEADERS(string.h strings.h, break)
AC_CHECK_FUNCS(strdup strrchr rindex)
AC_ARG_ENABLE(ltdl-install,
[--enable-ltdl-install install libltdl (breaks check before install)])
AM_CONDITIONAL(INSTALL_LTDL, test x$enable_ltdl_install = xyes)
AC_CACHE_CHECK([whether libtool supports -dlopen/-dlpreopen],
libltdl_cv_dlpreopen, [dnl
if grep '^global_symbol_pipe=..*$' ./libtool >/dev/null; then

2
libltdl/ltdl.c
View File

@ -388,7 +388,6 @@ wll = { LT_DLTYPE_TOP, wll_init, wll_exit,
#endif
#if DEBUG
#if HAVE_DLPREOPEN
/* emulate dynamic linking using dld_preloaded_symbols */
@ -464,7 +463,6 @@ 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/libltdls.la
mdemo_debug_LDADD = ../libltdl/libltdl.la
mdemo_debug_LDFLAGS = -static -export-dynamic \
-dlopen libfoo1.la -dlopen libfoo2.la
mdemo_debug_DEPENDENCIES = ../libltdl/libltdls.la libfoo1.la libfoo2.la
mdemo_debug_DEPENDENCIES = ../libltdl/libltdl.la libfoo1.la libfoo2.la