diff options
| -rw-r--r-- | ext/pdf/config.h.stub | 1 | ||||
| -rw-r--r-- | ext/pdf/config.m4 | 8 |
2 files changed, 5 insertions, 4 deletions
diff --git a/ext/pdf/config.h.stub b/ext/pdf/config.h.stub index 11c404a9f7..fa9fed71eb 100644 --- a/ext/pdf/config.h.stub +++ b/ext/pdf/config.h.stub @@ -1,2 +1,3 @@ /* Define if you have the pdflib library */ #define HAVE_PDFLIB 0 + diff --git a/ext/pdf/config.m4 b/ext/pdf/config.m4 index a410edf3b8..981bea33c1 100644 --- a/ext/pdf/config.m4 +++ b/ext/pdf/config.m4 @@ -13,7 +13,7 @@ echo $withval yes) AC_MSG_RESULT(yes) PHP_EXTENSION(pdf) - AC_CHECK_LIB(pdf, PDF_close, [AC_DEFINE(HAVE_PDFLIB) PDFLIB_LIBS="-lpdf"], + AC_CHECK_LIB(pdf, PDF_close, [AC_DEFINE(HAVE_PDFLIB) PDFLIB_LIBS="-lpdf -lz"], [AC_MSG_ERROR(pdflib extension requires pdflib 2.0.)]) EXTRA_LIBS="$EXTRA_LIBS $PDFLIB_LIBS" ;; @@ -24,7 +24,7 @@ echo $withval PHP_EXTENSION(pdf) old_LIBS=$LIBS - if test -z $ZLIB_LIBS; then + if test $HAVE_ZLIB; then old_withval=$withval AC_MSG_CHECKING([for zlib (needed by pdflib 2.0)]) AC_ARG_WITH(zlib-dir, @@ -39,12 +39,12 @@ echo $withval AC_MSG_RESULT(no) AC_MSG_WARN(If configure fails try --with-zlib=<DIR>) ]) + withval=$old_withval else echo "checking for libz needed by pdflib 2.0... already zlib support" PDFLIB_LIBS="$ZLIB_LIBS" - LIBS="$LIBS $ZLIB_LIBS" + LIBS="$LIBS -lz" fi - withval=$old_withval LIBS="$LIBS -L$withval/lib" AC_CHECK_LIB(pdf, PDF_close, [AC_DEFINE(HAVE_PDFLIB) PDFLIB_LIBS="-L$withval/lib -lpdf"], |