* 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 02d304976ffaed7a5a35f9b9aa931520c56f65c5..f9a8163410722e2ef0f56532f042fe4d3934133a 100644 (file)
--- 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 12b6221660c9eb825e49865c8a7d7f2c4e8e1f49..86ad56a281ae58149fc1f704b53c5c953b3e3dec 100644 (file)
--- 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 845bf6e41b3af76f83fd0b2f13fec2bcd673d381..926570face4e9f02b32949290a043f93b676dddc 100644 (file)
--- 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: