- dropped support for version of pdflib < 3.0

- better detection of libs required for pdflib

1 files changed, 24 insertions, 27 deletions

diff --git a/ext/pdf/config.m4 b/ext/pdf/config.m4
index 861bc166f0..bdcde9910a 100644
--- a/ext/pdf/config.m4
+++ b/ext/pdf/config.m4
@@ -1,8 +1,8 @@
 dnl $Id$
 
-AC_MSG_CHECKING(whether to include Pdflib 2.x support)
+AC_MSG_CHECKING(whether to include Pdflib 3.x support)
 AC_ARG_WITH(pdflib,
-[  --with-pdflib[=DIR]     Include pdflib 2.x support.
+[  --with-pdflib[=DIR]     Include pdflib 3.x support.
                           DIR is the pdflib install directory,
                           defaults to /usr/local.],
 [
@@ -16,8 +16,8 @@ echo $withval
       old_LDFLAGS=$LDFLAGS
 		  old_LIBS=$LIBS
 		  LIBS="$LIBS -ltiff -ljpeg -lpng -lz"
-      AC_CHECK_LIB(pdf, PDF_close, [AC_DEFINE(HAVE_PDFLIB,1,[ ])],
-        [AC_MSG_ERROR(pdflib extension requires pdflib 2.x. You may as well need libtiff and libjpeg. In such a case use the options --with-tiff-dir=<DIR> and --with-jpeg-dir=<DIR>)])
+      AC_CHECK_LIB(pdf, PDF_show_boxed, [AC_DEFINE(HAVE_PDFLIB,1,[ ])],
+        [AC_MSG_ERROR(pdflib extension requires at least pdflib 3.x. You may as well need libtiff and libjpeg. In such a case use the options --with-tiff-dir=<DIR> and --with-jpeg-dir=<DIR>)])
       LIBS=$old_LIBS
       LDFLAGS=$old_LDFLAGS
       AC_ADD_LIBRARY(pdf)
@@ -34,10 +34,9 @@ echo $withval
         old_withval=$withval
 
         if test $HAVE_ZLIB; then
-          AC_MSG_CHECKING([for zlib (needed by pdflib 2.x)])
+          AC_MSG_CHECKING([for zlib (needed by pdflib 3.x)])
           AC_ARG_WITH(zlib-dir,
-          [  --with-zlib-dir[=DIR]   zlib dir for pdflib 2.x or include zlib support],[
-            AC_MSG_RESULT( )
+          [  --with-zlib-dir[=DIR]   zlib dir for pdflib 3.x or include zlib support],[
             if test -z $withval; then
               withval="/usr/local"
             fi
@@ -47,19 +46,18 @@ echo $withval
             LIBS=$old_LIBS
             AC_ADD_LIBRARY_WITH_PATH(z, $withval/lib)
           ],[
-            AC_MSG_RESULT(no)
-            AC_MSG_WARN(If configure fails try --with-zlib=<DIR>)
+            AC_CHECK_LIB(z,deflate, ,[AC_MSG_RESULT(no, try --with-zlib=<DIR>)],)
+            AC_ADD_LIBRARY(z)
+            LIBS="$LIBS -lz"
           ])
         else
-          echo "checking for libz needed by pdflib 2.x... already zlib support"
+          echo "checking for libz needed by pdflib 3.x... already zlib support"
           PDFLIB_LIBS="$ZLIB_LIBS"
           LIBS="$LIBS -lz"
         fi
 
-        AC_MSG_CHECKING([for libjpeg (needed by pdflib 2.x)])
         AC_ARG_WITH(jpeg-dir,
-        [  --with-jpeg-dir[=DIR]   jpeg dir for pdflib 2.x],[
-          AC_MSG_RESULT(yes)
+        [  --with-jpeg-dir[=DIR]   jpeg dir for pdflib 3.x],[
           if test -z $withval; then
             withval="/usr/local"
           fi
@@ -70,14 +68,13 @@ echo $withval
           AC_ADD_LIBRARY_WITH_PATH(jpeg, $withval/lib)
           LIBS="$LIBS -L$withval/lib -ljpeg"
         ],[
-          AC_MSG_RESULT(no)
-          AC_MSG_WARN(If configure fails try --with-jpeg-dir=<DIR>)
+          AC_CHECK_LIB(jpeg,jpeg_read_header, ,[AC_MSG_RESULT(no, try --with-jpeg-dir=<DIR>)],)
+          AC_ADD_LIBRARY(jpeg)
+          LIBS="$LIBS -ljpeg"
         ]) 
 
-        AC_MSG_CHECKING([for libpng (needed by pdflib 2.x)])
         AC_ARG_WITH(png-dir,
-        [  --with-png-dir[=DIR]   png dir for pdflib 2.x],[
-          AC_MSG_RESULT(yes)
+        [  --with-png-dir[=DIR]   png dir for pdflib 3.x],[
           if test -z $withval; then
             withval="/usr/local"
           fi
@@ -88,14 +85,13 @@ echo $withval
           AC_ADD_LIBRARY_WITH_PATH(png, $withval/lib)
           LIBS="$LIBS -L$withval/lib -lpng"
         ],[
-          AC_MSG_RESULT(no)
-          AC_MSG_WARN(If configure fails try --with-png-dir=<DIR>)
+          AC_CHECK_LIB(png,png_create_info_struct, ,[AC_MSG_RESULT(no, try --with-png-dir=<DIR>)],)
+          AC_ADD_LIBRARY(png)
+          LIBS="$LIBS -lpng"
         ]) 
 
-        AC_MSG_CHECKING([for libtiff (needed by pdflib 2.x)])
         AC_ARG_WITH(tiff-dir,
-        [  --with-tiff-dir[=DIR]   tiff dir for pdflib 2.x],[
-          AC_MSG_RESULT(yes)
+        [  --with-tiff-dir[=DIR]   tiff dir for pdflib 3.x],[
           if test -z $withval; then
             withval="/usr/local"
           fi
@@ -106,15 +102,16 @@ echo $withval
           AC_ADD_LIBRARY_WITH_PATH(tiff, $withval/lib)
           LIBS="$LIBS -L$withval/lib -ltiff"
         ],[
-          AC_MSG_RESULT(no)
-          AC_MSG_WARN(If configure fails try --with-tiff-dir=<DIR>)
+          AC_CHECK_LIB(tiff,TIFFOpen, ,[AC_MSG_RESULT(no, Try --with-tiff-dir=<DIR>)],)
+          AC_ADD_LIBRARY(tiff)
+          LIBS="$LIBS -ltiff"
         ]) 
         withval=$old_withval
 
         old_LIBS=$LIBS
         LIBS="$LIBS -L$withval/lib"
-        AC_CHECK_LIB(pdf, PDF_close, [AC_DEFINE(HAVE_PDFLIB,1,[ ]) PDFLIB_LIBS="$PDFLIB_LIBS -L$withval/lib -lpdf"],
-          [AC_MSG_ERROR(pdflib extension requires pdflib 2.x.)])
+        AC_CHECK_LIB(pdf, PDF_show_boxed, [AC_DEFINE(HAVE_PDFLIB,1,[ ]) PDFLIB_LIBS="$PDFLIB_LIBS -L$withval/lib -lpdf"],
+          [AC_MSG_ERROR(pdflib extension requires pdflib 3.x.)])
         LIBS=$old_LIBS
         AC_ADD_LIBRARY_WITH_PATH(pdf, $withval/lib)
         AC_ADD_INCLUDE($PDFLIB_INCLUDE)