[patch] iscan-2.29.1-drop-ltdl.patch

iscan-2.29.1-drop-ltdl.patch (text/plain), 2.06 KB, created by Matthew Schultz on 2013-02-06 03:27:21 UTC

diff -u -r iscan-2.29.1.orig/backend/Makefile.am iscan-2.29.1/backend/Makefile.am
--- iscan-2.29.1.orig/backend/Makefile.am	2013-02-05 21:19:09.948970995 -0600
+++ iscan-2.29.1/backend/Makefile.am	2013-02-05 21:20:17.208483990 -0600
@@ -58,7 +58,6 @@
 
 libepkowa_la_CPPFLAGS = \
 	$(AM_CPPFLAGS) \
-	$(LTDLINCL) \
 	-I$(top_srcdir)/include \
 	-I$(top_srcdir)/non-free \
 	$(XML_CFLAGS) \
@@ -70,7 +69,7 @@
 	-lm \
 	$(XML_LIBS) \
 	$(LIBUSB_1_0_LIBS) \
-	$(LIBLTDL)
+	-lltdl
 libepkowa_la_SOURCES = \
 	$(sane_backends_files) \
 	ipc.c \
diff -u -r iscan-2.29.1.orig/configure.ac iscan-2.29.1/configure.ac
--- iscan-2.29.1.orig/configure.ac	2013-02-05 21:19:09.946971011 -0600
+++ iscan-2.29.1/configure.ac	2013-02-05 21:21:52.391797577 -0600
@@ -266,14 +266,10 @@
 dnl  The somewhat obscure LT_AC_PROG_SED is here to make sure that the
 dnl  SED environment variable gets set before it's used by the libtool
 dnl  machinery.  This works around buggy libtool versions.
-LT_AC_PROG_SED
-AC_LIBLTDL_INSTALLABLE
-AC_LIBTOOL_DLOPEN
 AC_PROG_LIBTOOL
-AC_LIB_LTDL
-AC_SUBST(LTDLINCL)
-AC_SUBST(LIBLTDL)
-
+AC_LTDL_SHLIBPATH
+AC_LTDL_SHLIBEXT
+AC_LTDL_SYSSEARCHPATH
 
 dnl  Graphic file format options
 
diff -u -r iscan-2.29.1.orig/frontend/Makefile.am iscan-2.29.1/frontend/Makefile.am
--- iscan-2.29.1.orig/frontend/Makefile.am	2013-02-05 21:19:09.975970799 -0600
+++ iscan-2.29.1/frontend/Makefile.am	2013-02-05 21:22:14.646637550 -0600
@@ -34,7 +34,7 @@
 iscan_LDADD = \
 	$(top_builddir)/lib/libimage-stream.la \
 	-lsane \
-	@LIBLTDL@ \
+	-lltdl \
 	@GTK_LIBS@ \
 	@GDK_IMLIB_LIBS@ \
 	$(top_builddir)/non-free/libesmod.so
diff -u -r iscan-2.29.1.orig/lib/Makefile.am iscan-2.29.1/lib/Makefile.am
--- iscan-2.29.1.orig/lib/Makefile.am	2013-02-05 21:19:09.942971036 -0600
+++ iscan-2.29.1/lib/Makefile.am	2013-02-05 21:22:49.686385938 -0600
@@ -30,7 +30,7 @@
 libimage_stream_la_CPPFLAGS = -I$(top_srcdir)/include
 libimage_stream_la_LDFLAGS = -static
 libimage_stream_la_LIBADD  = \
-	$(LIBLTDL) \
+	-lltdl \
 	$(top_builddir)/lib/pdf/libpdf.la
 libimage_stream_la_SOURCES = \
 	$(libimage_stream_la_files)