From: Alexandre Oliva <oliva@dcc.unicamp.br>
Date: Wed, 23 Dec 1998 19:33:09 +0000 (+0000)
Subject: 	* libltdl/Makefile.am: install libltdl conditionally...
X-Git-Tag: automake_1-4~82
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=48c804561ad5b1b2fbf375bf8965dcb2d69ee775;p=thirdparty%2Flibtool.git

	* 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
---

diff --git a/ChangeLog b/ChangeLog
index 10a74321e..01ba10971 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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).
diff --git a/libltdl/Makefile.am b/libltdl/Makefile.am
index e325a53b1..5347e5b96 100644
--- a/libltdl/Makefile.am
+++ b/libltdl/Makefile.am
@@ -5,19 +5,23 @@
 # level Makefile.
 AUTOMAKE_OPTIONS = no-dependencies foreign
 
-ltdls.lo: ltdl.c
-	$(LTCOMPILE) -DDEBUG -o $@ -c $<
+LTDL_VERSION = -version-info 0:1:1
 
-lib_LTLIBRARIES = libltdl.la libltdls.la
+if INSTALL_LTDL
+LTDL_FLAGS = $(LTDL_VERSION) -rpath $(libdir) 
+include_HEADERS = ltdl.h
+else
+LTDL_FLAGS =
+noinst_HEADERS = ltdl.h
+endif
 
-libltdl_la_SOURCES = ltdl.c ltdl.h
-libltdl_la_LDFLAGS = $(LIBADD_DL) 
+EXTRA_LTLIBRARIES = libltdl.la
 
-libltdls_la_LIBADD = ltdls.lo
-libltdls_la_SOURCES = ltdl.h
-libltdls_la_LDFLAGS = $(LIBADD_DL) 
+lib_LTLIBRARIES = @LIBLIBS@
+noinst_LTLIBRARIES = @NOINSTLIBS@
 
-include_HEADERS = ltdl.h
+libltdl_la_SOURCES = ltdl.c
+libltdl_la_LDFLAGS = $(LTDL_FLAGS) $(LIBADD_DL)
 
 # rebuild the libtool script if needed
 ltdl.lo: libtool
diff --git a/libltdl/configure.in b/libltdl/configure.in
index 11da93437..9409128a0 100644
--- a/libltdl/configure.in
+++ b/libltdl/configure.in
@@ -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
diff --git a/libltdl/ltdl.c b/libltdl/ltdl.c
index d1b0c121a..46433da1d 100644
--- a/libltdl/ltdl.c
+++ b/libltdl/ltdl.c
@@ -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;
diff --git a/mdemo/Makefile.am b/mdemo/Makefile.am
index 06a31bf39..10c322789 100644
--- a/mdemo/Makefile.am
+++ b/mdemo/Makefile.am
@@ -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