From: Bob Friesenhahn <bfriesen@simple.dallas.tx.us>
Date: Mon, 13 Dec 2004 19:28:40 +0000 (+0000)
Subject: * libltdl/Makefile.am (libdlloader_la_SOURCES): Remove lt__strl.c
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e52cc94a6fc004a9c25c447221c288f2e2a05ec2;p=thirdparty%2Flibtool.git

* 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 4088e8416..3f77f732f 100644
--- 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 9ec0624c4..cc8a2bd68 100644
--- 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 90c9d2bca..d7a82f09a 100644
--- 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: