+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).
# 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
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
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
#endif
-#if DEBUG
#if HAVE_DLPREOPEN
/* emulate dynamic linking using dld_preloaded_symbols */
#undef LT_DLTYPE_TOP
#define LT_DLTYPE_TOP &dldpre
-#endif
#endif
static lt_dlhandle handles;
# 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