blob: 10fc19fadd2019a00d58ab193ca35c60d5fbb5c5 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
|
Index: iscan-2.21.0/backend/Makefile.am
===================================================================
--- iscan-2.21.0.orig/backend/Makefile.am
+++ iscan-2.21.0/backend/Makefile.am
@@ -60,7 +60,6 @@ noinst_LTLIBRARIES = \
libepkowa_la_CPPFLAGS = \
$(AM_CPPFLAGS) \
- $(LTDLINCL) \
-I$(top_srcdir)/include \
-I$(top_srcdir)/non-free \
-DV_MAJOR=$(SANE_MAJOR) -DV_MINOR=$(SANE_MINOR)
@@ -68,7 +67,7 @@ libepkowa_la_LDFLAGS = \
-static
libepkowa_la_LIBADD = \
-lm \
- $(LIBLTDL)
+ -lltdl
libepkowa_la_SOURCES = \
$(sane_backends_files) \
marshal.c \
Index: iscan-2.21.0/configure.ac
===================================================================
--- iscan-2.21.0.orig/configure.ac
+++ iscan-2.21.0/configure.ac
@@ -237,14 +237,10 @@ AC_CHECK_FUNCS([\
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_LTDL_SHLIBPATH
+AC_LTDL_SHLIBEXT
+AC_LTDL_SYSSEARCHPATH
-AC_LIB_LTDL
-AC_SUBST(LTDLINCL)
-AC_SUBST(LIBLTDL)
-
dnl Graphic file format options
Index: iscan-2.21.0/frontend/Makefile.am
===================================================================
--- iscan-2.21.0.orig/frontend/Makefile.am
+++ iscan-2.21.0/frontend/Makefile.am
@@ -34,7 +34,7 @@ iscan_CXXFLAGS = \
iscan_LDADD = \
$(top_builddir)/lib/libimage-stream.la \
-lsane \
- @LIBLTDL@ \
+ -lltdl \
@GTK_LIBS@ \
@GDK_IMLIB_LIBS@ \
$(top_builddir)/non-free/libesmod.so
Index: iscan-2.21.0/lib/Makefile.am
===================================================================
--- iscan-2.21.0.orig/lib/Makefile.am
+++ iscan-2.21.0/lib/Makefile.am
@@ -29,7 +29,7 @@ noinst_LTLIBRARIES = libimage-stream.la
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)
|
GitWeb
