File iscan.patch of Package iscan (Revision 5b8473211edc26da4ef36af0813f5823)

Currently displaying revision 5b8473211edc26da4ef36af0813f5823 , Show latest

37
 
1
--- a/configure.ac
2
+++ b/configure.ac
3
@@ -282,6 +282,7 @@ AC_DEFUN([ISCAN_FILE_FORMAT],
4
          AC_HELP_STRING([--enable-$1],
5
                 [ensure support for the $3 file format]),
6
          [if test "x$enable_$1" != xno; then
7
+           PKG_CHECK_MODULES($3, $4)
8
              iff_header="`echo $2 | $as_tr_sh`"
9
              AC_CHECK_HEADERS([$2])
10
              if test `eval echo '$ac_cv_header_'$iff_header` \
11
@@ -292,9 +293,9 @@ AC_DEFUN([ISCAN_FILE_FORMAT],
12
          [AC_CHECK_HEADERS([$2])])
13
    ])
14
 
15
-ISCAN_FILE_FORMAT(jpeg,jpeglib.h,JPEG)
16
-ISCAN_FILE_FORMAT(png,png.h,PNG)
17
-ISCAN_FILE_FORMAT(tiff,tiffio.h,TIFF)
18
+ISCAN_FILE_FORMAT(jpeg,jpeglib.h,JPEG,libjpeg)
19
+ISCAN_FILE_FORMAT(png,png.h,PNG,libpng)
20
+ISCAN_FILE_FORMAT(tiff,tiffio.h,TIFF,libtiff-4)
21
 
22
 
23
 dnl  Support for performance measurements.
24
--- a/lib/Makefile.am
25
+++ b/lib/Makefile.am
26
@@ -27,8 +27,8 @@ SUBDIRS = \
27
 
28
 if ENABLE_FRONTEND
29
 noinst_LTLIBRARIES = libimage-stream.la
30
-libimage_stream_la_CPPFLAGS = -I$(top_srcdir)/include
31
-libimage_stream_la_LDFLAGS = -static
32
+libimage_stream_la_CPPFLAGS = -I$(top_srcdir)/include $(PNG_CFLAGS) $(JPEG_CFLAGS) $(TIFF_CFLAGS)
33
+libimage_stream_la_LDFLAGS = -static $(PNG_LIBS) $(JPEG_LIBS) $(TIFF_LIBS)
34
 libimage_stream_la_LIBADD  = \
35
    $(LIBLTDL) \
36
    $(top_builddir)/lib/pdf/libpdf.la
37