* libltdl/Makefile.am (libdlloader_la_SOURCES): Remove lt__strl.c

from default build files.
* m4/ltdl.m4 (LTDL_INIT): Arrange to build lt__strl.c only when
needed.

diff --git a/ChangeLog b/ChangeLog
index 4088e8416f2b7b940d03398f8db0996de3e62e37..3f77f732f8b396e62ab3b68cf29cd71d1cc4b04b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2004-12-13  Bob Friesenhahn  <bfriesen@simple.dallas.tx.us>
+
+       * libltdl/Makefile.am (libdlloader_la_SOURCES): Remove lt__strl.c
+       from default build files.
+       * m4/ltdl.m4 (LTDL_INIT): Arrange to build lt__strl.c only when
+       needed.
+
 2004-12-13  Albert Chin-A-Young  <china@thewrittenword.com>
 
        * libtool.m4 (_LT_LINKER_SHLIBS, _LT_LANG_CXX_CONFIG):

diff --git a/libltdl/Makefile.am b/libltdl/Makefile.am
index 9ec0624c4f4dd62004a359fd6dfb3f79dbdc4a69..cc8a2bd68030d2f5c2fd4c8e8fe922036c554533 100644 (file)
--- a/libltdl/Makefile.am
+++ b/libltdl/Makefile.am
@@ -36,7 +36,7 @@ pkgincludedir         = $(includedir)/libltdl
 lib_LTLIBRARIES                = libdlloader.la
 libdlloader_la_SOURCES  = libltdl/lt_error.h lt_error.c \
                          libltdl/lt__private.h \
-                          lt__strl.c libltdl/lt__strl.h \
+                          libltdl/lt__strl.h \
                           libltdl/lt_system.h \
                          libltdl/lt__alloc.h lt__alloc.c \
                          libltdl/lt__glibc.h \
@@ -74,6 +74,7 @@ ltdldatadir           = $(pkgdatadir)/libltdl
 nobase_ltdldata_DATA   = COPYING.LIB Makefile.am README configure.ac \
                          $(libltdl_la_SOURCES) $(libdlloader_la_SOURCES) \
                          lt__dirent.c libltdl/lt__dirent.h \
+                          lt__strl.c libltdl/lt__strl.h \
                          argz_.h argz.c
 
 ## Make sure these will be cleaned even when they're not built by default:

diff --git a/m4/ltdl.m4 b/m4/ltdl.m4
index 90c9d2bcae6eff5487def237dd6e744f7dd74398..d7a82f09ae7ae58f734ce6226af6ec320f958500 100644 (file)
--- a/m4/ltdl.m4
+++ b/m4/ltdl.m4
@@ -188,7 +188,7 @@ AC_CHECK_HEADERS([memory.h unistd.h dl.h sys/dl.h dld.h mach-o/dyld.h],
 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_CHECK_FUNCS([strlcat strlcpy], [], [AC_LIBOBJ([lt__strl])])
 ])# LTDL_INIT
 
 # Old name: