sbnc (1.2-20) 11-use-external-ltdl.diff

# Remove embedded libltdl dependencie, we want to link shared against it.

diff -Naur sbnc-1.2.orig/configure.ac sbnc-1.2/configure.ac
--- sbnc-1.2.orig/configure.ac	2008-06-24 11:19:19.000000000 +0200
+++ sbnc-1.2/configure.ac	2008-06-24 11:21:43.000000000 +0200
@@ -61,7 +61,6 @@
 AC_CHECK_LIB(eay32, X509_NAME_oneline)
 
 sinclude(./tcl.m4)
-sinclude(./src/libltdl/acinclude.m4)
 
 sinclude(./cares2.m4)
 sinclude(./cares.m4)
@@ -124,7 +123,6 @@
 AC_CONFIG_FILES([Makefile \
                  scripts/Makefile \
                  src/c-ares/Makefile \
-                 src/libltdl/Makefile \
                  src/snprintf/Makefile \
                  src/rpc/Makefile \
                  bnctcl/Makefile \
diff -Naur sbnc-1.2.orig/src/Makefile.am sbnc-1.2/src/Makefile.am
--- sbnc-1.2.orig/src/Makefile.am	2008-06-24 11:19:19.000000000 +0200
+++ sbnc-1.2/src/Makefile.am	2008-06-24 11:22:49.000000000 +0200
@@ -1,4 +1,4 @@
-SUBDIRS=snprintf md5 libltdl rpc sbncloader
+SUBDIRS=snprintf md5 rpc sbncloader
 
 pkglibdir=$(exec_prefix)/${MOD_DIR}
 bindir=$(exec_prefix)
@@ -69,7 +69,7 @@
 	win32.h \
 	Zone.h \
 	fdhelper.h
-libsbnc_la_LIBADD=md5/libmd5.la rpc/librpc.la libltdl/libltdlc.la snprintf/libsnprintf.la @SSLLDFLAGS@
+libsbnc_la_LIBADD=md5/libmd5.la rpc/librpc.la snprintf/libsnprintf.la @SSLLDFLAGS@
 libsbnc_la_LDFLAGS=-no-undefined
 AM_CFLAGS=-DSBNC -DRPCCLIENT @SSLCFLAGS@
 AM_CPPFLAGS=-DSBNC -DRPCCLIENT @SSLCFLAGS@
diff -Naur sbnc-1.2.orig/src/Makefile.in sbnc-1.2/src/Makefile.in
--- sbnc-1.2.orig/src/Makefile.in	2008-06-24 11:19:19.000000000 +0200
+++ sbnc-1.2/src/Makefile.in	2008-06-24 11:46:07.000000000 +0200
@@ -136,7 +136,7 @@
 TK_VERSION = @TK_VERSION@
 VERSION = @VERSION@
 
-SUBDIRS = snprintf md5 libltdl rpc sbncloader
+SUBDIRS = snprintf md5 rpc sbncloader
 
 pkglibdir = $(exec_prefix)/${MOD_DIR}
 bindir = $(exec_prefix)
@@ -144,7 +144,7 @@
 pkglib_LTLIBRARIES = libsbnc.la
 libsbnc_la_SOURCES = Banlist.cpp 	Cache.cpp 	Config.cpp 	ConfigModule.cpp 	Core.cpp 	Log.cpp 	User.cpp 	Channel.cpp 	ClientConnection.cpp 	ClientConnectionMultiplexer.cpp 	Connection.cpp 	DnsEvents.cpp 	FIFOBuffer.cpp 	FloodControl.cpp 	IdentSupport.cpp 	IRCConnection.cpp 	Keyring.cpp 	Match.cpp 	Module.cpp 	Nick.cpp 	Queue.cpp 	sbnc.cpp 	sslhelper.c 	Timer.cpp 	TrafficStats.cpp 	utility.cpp 	Banlist.h 	Config.h 	ConfigModule.h 	Core.h 	Log.h 	User.h 	Cache.h 	Channel.h 	ClientConnection.h 	ClientConnectionMultiplexer.h 	Connection.h 	DnsEvents.h 	FIFOBuffer.h 	FloodControl.h 	Hashtable.h 	IdentSupport.h 	IRCConnection.h 	Keyring.h 	List.h 	Listener.h 	Match.h 	ModuleFar.h 	Module.h 	Nick.h 	Object.h 	Persistable.h 	Result.h 	Queue.h 	sbnc.h 	SocketEvents.h 	StdAfx.h 	Timer.h 	TrafficStats.h 	unix.h 	utility.h 	Vector.h 	win32.h 	Zone.h 	fdhelper.h
 
-libsbnc_la_LIBADD = md5/libmd5.la rpc/librpc.la libltdl/libltdlc.la snprintf/libsnprintf.la -lcares @SSLLDFLAGS@
+libsbnc_la_LIBADD = md5/libmd5.la rpc/librpc.la snprintf/libsnprintf.la -lltdl -lcares @SSLLDFLAGS@
 libsbnc_la_LDFLAGS = -no-undefined
 AM_CFLAGS = -DSBNC -DRPCCLIENT @SSLCFLAGS@
 AM_CPPFLAGS = -DSBNC -DRPCCLIENT @SSLCFLAGS@
@@ -158,7 +158,7 @@
 CPPFLAGS = @CPPFLAGS@
 LIBS = @LIBS@
 libsbnc_la_DEPENDENCIES =  md5/libmd5.la \
-rpc/librpc.la libltdl/libltdlc.la snprintf/libsnprintf.la
+rpc/librpc.la snprintf/libsnprintf.la
 libsbnc_la_OBJECTS =  Banlist.lo Cache.lo Config.lo ConfigModule.lo \
 Core.lo Log.lo User.lo Channel.lo ClientConnection.lo \
 ClientConnectionMultiplexer.lo Connection.lo DnsEvents.lo FIFOBuffer.lo \
diff -Naur sbnc-1.2.orig/src/sbncloader/Makefile.am sbnc-1.2/src/sbncloader/Makefile.am
--- sbnc-1.2.orig/src/sbncloader/Makefile.am	2008-06-24 11:19:19.000000000 +0200
+++ sbnc-1.2/src/sbncloader/Makefile.am	2008-06-24 11:23:58.000000000 +0200
@@ -2,7 +2,7 @@
 
 bin_PROGRAMS=sbnc
 sbnc_SOURCES=sbncloader.cpp Service.cpp Service.h
-sbnc_LDADD=../libltdl/libltdlc.la ../rpc/librpc.la ../snprintf/libsnprintf.la
+sbnc_LDADD=../rpc/librpc.la ../snprintf/libsnprintf.la -lltdl
 AM_CFLAGS=-DRPCSERVER
 AM_CPPFLAGS=-DRPCSERVER
 
diff -Naur sbnc-1.2.orig/src/sbncloader/Makefile.in sbnc-1.2/src/sbncloader/Makefile.in
--- sbnc-1.2.orig/src/sbncloader/Makefile.in	2008-06-24 11:19:19.000000000 +0200
+++ sbnc-1.2/src/sbncloader/Makefile.in	2008-06-24 11:45:07.000000000 +0200
@@ -141,7 +141,7 @@
 
 bin_PROGRAMS = sbnc
 sbnc_SOURCES = sbncloader.cpp Service.cpp Service.h
-sbnc_LDADD = ../libltdl/libltdlc.la ../rpc/librpc.la ../snprintf/libsnprintf.la
+sbnc_LDADD = ../rpc/librpc.la ../snprintf/libsnprintf.la -lltdl
 AM_CFLAGS = -DRPCSERVER
 AM_CPPFLAGS = -DRPCSERVER
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
@@ -155,7 +155,7 @@
 CPPFLAGS = @CPPFLAGS@
 LIBS = @LIBS@
 sbnc_OBJECTS =  sbncloader.$(OBJEXT) Service.$(OBJEXT)
-sbnc_DEPENDENCIES =  ../libltdl/libltdlc.la ../rpc/librpc.la \
+sbnc_DEPENDENCIES =  ../rpc/librpc.la \
 ../snprintf/libsnprintf.la
 sbnc_LDFLAGS = 
 CXXFLAGS = @CXXFLAGS@
diff -Naur sbnc-1.2.orig/src/StdAfx.h sbnc-1.2/src/StdAfx.h
--- sbnc-1.2.orig/src/StdAfx.h	2008-06-24 11:19:19.000000000 +0200
+++ sbnc-1.2/src/StdAfx.h	2008-06-24 11:25:06.000000000 +0200
@@ -61,7 +61,7 @@
 #		undef DLL_EXPORT
 #		define WAS_DLL_EXPORT
 #	endif
-#	include "libltdl/ltdl.h"
+#	include <ltdl.h>
 #	ifdef WAS_DLL_EXPORT
 #		define DLL_EXPORT
 #	endif