[patch] Use system libltdl

naim-0.11.8.3.2-system_libltdl.patch (text/plain), 2.10 KB, created by Samuli Suominen (RETIRED) on 2010-03-03 10:38:04 UTC

diff -ur naim-0.11.8.3.2.orig/configure.ac naim-0.11.8.3.2/configure.ac
--- naim-0.11.8.3.2.orig/configure.ac	2008-11-27 06:20:37.000000000 +0200
+++ naim-0.11.8.3.2/configure.ac	2010-03-03 12:33:15.000000000 +0200
@@ -16,19 +16,8 @@
 echo ""
 echo "Configuring libtool"
 echo ""
-AC_LIBLTDL_CONVENIENCE
-AC_LIBTOOL_DLOPEN
-AC_LIBTOOL_WIN32_DLL
-AC_PROG_LIBTOOL
-AC_SUBST([INCLTDL])
-AC_SUBST([LIBLTDL])
-
-
-echo ""
-echo ""
-echo "Configuring ltdl"
-echo ""
-AC_LIB_LTDL
+LT_PREREQ([2.2.6])
+LT_INIT([dlopen win32-dll disable-static])
 
 
 echo ""
@@ -47,7 +36,6 @@
 AC_CONFIG_FILES([
 Makefile
 libfiretalk/Makefile
-libltdl/Makefile
 secs/Makefile
 src/Makefile
 CYGWIN-PATCHES/Makefile
diff -ur naim-0.11.8.3.2.orig/Makefile.am naim-0.11.8.3.2/Makefile.am
--- naim-0.11.8.3.2.orig/Makefile.am	2008-09-15 00:06:07.000000000 +0300
+++ naim-0.11.8.3.2/Makefile.am	2010-03-03 12:33:30.000000000 +0200
@@ -1,4 +1,4 @@
-SUBDIRS = libfiretalk libltdl secs src CYGWIN-PATCHES
+SUBDIRS = libfiretalk secs src CYGWIN-PATCHES
 
 man_MANS = doc/naim.1 doc/nicq.1 doc/nirc.1 doc/nlily.1
 pkgdoc_DATA = FAQ README
diff -ur naim-0.11.8.3.2.orig/src/Makefile.am naim-0.11.8.3.2/src/Makefile.am
--- naim-0.11.8.3.2.orig/src/Makefile.am	2008-11-27 06:20:03.000000000 +0200
+++ naim-0.11.8.3.2/src/Makefile.am	2010-03-03 12:35:22.000000000 +0200
@@ -49,7 +49,7 @@
 libnaim_core_la_SOURCES = ${NAIM_CORE}
 libnaim_core_la_CFLAGS = ${AM_CFLAGS} -DDLSEARCHPATH='"${pkgmoddir}"'
 libnaim_core_la_LIBADD = \
-	@LIBLTDL@ \
+	-lltdl \
 	@CURSESLIB@ @NETLIB@
 libnaim_core_la_LDFLAGS = -export-dynamic -no-undefined \
 	-Wl,--whole-archive -Wl,../libfiretalk/libfiretalk.a -Wl,../secs/libsecs.a -Wl,--no-whole-archive
@@ -57,7 +57,7 @@
 NAIM_SOURCES = ${NAIM_CORE}
 NAIM_LDADD = \
 	../libfiretalk/libfiretalk.a \
-	@LIBLTDL@ \
+	-lltdl \
 	../secs/libsecs.a \
 	@CURSESLIB@ @NETLIB@
 endif
@@ -66,7 +66,7 @@
 naim_LDADD = ${NAIM_LDADD}
 naim_LDFLAGS = -dlopen self -export-dynamic -no-undefined
 
-INCLUDES = -I${top_srcdir}/include -I${top_srcdir}/libfiretalk ${INCLTDL}
+INCLUDES = -I${top_srcdir}/include -I${top_srcdir}/libfiretalk
 
 
 conio_keys.h: ${srcdir}/conio.c