From d31c75fdbe54f3bf25d654d2c79f2aaec4ab59d9 Mon Sep 17 00:00:00 2001 From: Peter Ekberg Date: Thu, 28 Jul 2005 11:00:37 +0000 Subject: [PATCH] * libltdl/Makefile.am: Make the LTDLOPEN define controllable from the configure script. * m4/ltdl.m4 (LTDL_INIT): Set the LTDLOPEN define according to libname_spec. --- ChangeLog | 7 +++++++ libltdl/Makefile.am | 4 ++-- m4/ltdl.m4 | 4 ++++ 3 files changed, 13 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 02d304976..f9a816341 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2005-07-28 Peter Ekberg + + * libltdl/Makefile.am: Make the LTDLOPEN define controllable + from the configure script. + * m4/ltdl.m4 (LTDL_INIT): Set the LTDLOPEN define according + to libname_spec. + 2005-07-28 Peter Ekberg * tests/mdemo-dryrun.test: ls -l in MSYS sometimes shows year, diff --git a/libltdl/Makefile.am b/libltdl/Makefile.am index 12b622166..86ad56a28 100644 --- a/libltdl/Makefile.am +++ b/libltdl/Makefile.am @@ -60,13 +60,13 @@ libltdl_la_SOURCES = libltdl/lt__alloc.h \ lt_error.c \ ltdl.c ltdl.h \ slist.c -libltdl_la_CPPFLAGS = -DLTDLOPEN=libltdl $(AM_CPPFLAGS) +libltdl_la_CPPFLAGS = -DLTDLOPEN=$(LTDLOPEN) $(AM_CPPFLAGS) libltdl_la_LDFLAGS = $(AM_LDFLAGS) $(VERSION_INFO) $(LT_DLPREOPEN) libltdl_la_LIBADD = $(LTLIBOBJS) libltdl_la_DEPENDENCIES = $(LT_DLLOADERS) $(LTLIBOBJS) $(BUILT_SOURCES) libltdlc_la_SOURCES = $(libltdl_la_SOURCES) -libltdlc_la_CPPFLAGS = -DLTDLOPEN=libltdlc $(AM_CPPFLAGS) +libltdlc_la_CPPFLAGS = -DLTDLOPEN=$(LTDLOPEN)c $(AM_CPPFLAGS) libltdlc_la_LDFLAGS = $(AM_LDFLAGS) $(LT_DLPREOPEN) libltdlc_la_LIBADD = $(libltdl_la_LIBADD) libltdlc_la_DEPENDENCIES= $(libltdl_la_DEPENDENCIES) diff --git a/m4/ltdl.m4 b/m4/ltdl.m4 index 845bf6e41..926570fac 100644 --- a/m4/ltdl.m4 +++ b/m4/ltdl.m4 @@ -174,6 +174,10 @@ AC_CHECK_HEADERS([string.h strings.h], [break], [], [AC_INCLUDES_DEFAULT]) AC_CHECK_FUNCS([closedir opendir readdir], [], [AC_LIBOBJ([lt__dirent])]) AC_CHECK_FUNCS([strlcat strlcpy], [], [AC_LIBOBJ([lt__strl])]) + +name=ltdl +LTDLOPEN=`eval "\\$ECHO \"$libname_spec\""` +AC_SUBST([LTDLOPEN]) ])# LTDL_INIT # Old name: -- 2.47.2