From: Peter Ekberg <peda@lysator.liu.se>
Date: Thu, 28 Jul 2005 10:59:32 +0000 (+0000)
Subject: * libltdl/Makefile.am: Make the LTDLOPEN define controllable
X-Git-Tag: release-2-1b~601
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d3a95f3f9ec68ccd671bcbc1a62ea3af3a9ce993;p=thirdparty%2Flibtool.git

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

diff --git a/ChangeLog b/ChangeLog
index 119a86b9b..160b78cdb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2005-07-28  Peter Ekberg  <peda@lysator.liu.se>
+
+	* 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  <peda@lysator.liu.se>
 
 	* tests/mdemo-dryrun.test: ls -l in MSYS sometimes shows year,
diff --git a/libltdl/Makefile.am b/libltdl/Makefile.am
index 03db42088..941042ce6 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: