summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUwe Steinmann <steinm@php.net>1999-08-19 17:07:27 +0000
committerUwe Steinmann <steinm@php.net>1999-08-19 17:07:27 +0000
commitc3fe95d97132cdd2ac30646e1147ebb63908b911 (patch)
treee6dd2fb684bcf9e232421021c5d7c78ed25c29f0
parentaeec4e198a348ab782d2c3dd543218e849b27299 (diff)
downloadphp-git-c3fe95d97132cdd2ac30646e1147ebb63908b911.tar.gz
On the way to make configure more robust
-rw-r--r--ext/pdf/config.m425
1 files changed, 13 insertions, 12 deletions
diff --git a/ext/pdf/config.m4 b/ext/pdf/config.m4
index 2c977a7acd..635912ccf1 100644
--- a/ext/pdf/config.m4
+++ b/ext/pdf/config.m4
@@ -1,6 +1,6 @@
dnl $Id$
-AC_MSG_CHECKING(whether to include Pdflib 2.0 support)
+AC_MSG_CHECKING(whether to include Pdflib 2.x support)
AC_ARG_WITH(pdflib,
[ --with-pdflib[=DIR] Include pdflib 2.x support.
DIR is the pdflib install directory,
@@ -23,50 +23,51 @@ echo $withval
AC_MSG_RESULT(yes)
PHP_EXTENSION(pdf)
old_LIBS=$LIBS
-
old_withval=$withval
+
if test $HAVE_ZLIB; then
- AC_MSG_CHECKING([for zlib (needed by pdflib 2.0)])
+ AC_MSG_CHECKING([for zlib (needed by pdflib 2.x)])
AC_ARG_WITH(zlib-dir,
- [ --with-zlib-dir[=DIR] zlib dir for pdflib 2.0 or include zlib support],[
+ [ --with-zlib-dir[=DIR] zlib dir for pdflib 2.x or include zlib support],[
AC_MSG_RESULT( )
if test -z $withval; then
withval="/usr/local"
fi
- LIBS="$LIBS -L$withval/lib -lz"
AC_CHECK_LIB(z,deflate, [PDFLIB_LIBS="-L$withval/lib -lz"],[AC_MSG_RESULT(no)],)
+ LIBS="$LIBS -L$withval/lib -lz"
],[
AC_MSG_RESULT(no)
AC_MSG_WARN(If configure fails try --with-zlib=<DIR>)
])
else
- echo "checking for libz needed by pdflib 2.0... already zlib support"
+ echo "checking for libz needed by pdflib 2.x... already zlib support"
PDFLIB_LIBS="$ZLIB_LIBS"
LIBS="$LIBS -lz"
fi
- AC_MSG_CHECKING([for libjpeg (needed by pdflib 2.0)])
+ AC_MSG_CHECKING([for libjpeg (needed by pdflib 2.x)])
AC_ARG_WITH(jpeg-dir,
- [ --with-jpeg-dir[=DIR] jpeg dir for pdflib 2.0],[
+ [ --with-jpeg-dir[=DIR] jpeg dir for pdflib 2.x],[
AC_MSG_RESULT(yes)
if test -z $withval; then
withval="/usr/local"
fi
LIBS="$LIBS -L$withval/lib -ljpeg"
AC_CHECK_LIB(jpeg,jpeg_read_header, [PDFLIB_LIBS="$PDFLIB_LIBS -L$withval/lib -ljpeg"],[AC_MSG_RESULT(no)],)
+ LIBS="$LIBS -L$withval/lib -ljpeg"
],[
AC_MSG_RESULT(no)
AC_MSG_WARN(If configure fails try --with-jpeg-dir=<DIR>)
])
- AC_MSG_CHECKING([for libtiff (needed by pdflib 2.0)])
+ AC_MSG_CHECKING([for libtiff (needed by pdflib 2.x)])
AC_ARG_WITH(tiff-dir,
- [ --with-tiff-dir[=DIR] tiff dir for pdflib 2.0],[
+ [ --with-tiff-dir[=DIR] tiff dir for pdflib 2.x],[
AC_MSG_RESULT(yes)
if test -z $withval; then
withval="/usr/local"
fi
- LIBS="$LIBS -L$withval/lib -ltiff"
+ LIBS="$LIBS -L$withval/lib -ltiff -ljpeg"
AC_CHECK_LIB(tiff,TIFFOpen, [PDFLIB_LIBS="$PDFLIB_LIBS -L$withval/lib -ltiff"],[AC_MSG_RESULT(no)],)
],[
AC_MSG_RESULT(no)
@@ -76,7 +77,7 @@ echo $withval
LIBS="$LIBS -L$withval/lib"
AC_CHECK_LIB(pdf, PDF_close, [AC_DEFINE(HAVE_PDFLIB) PDFLIB_LIBS="$PDFLIB_LIBS -L$withval/lib -lpdf"],
- [AC_MSG_ERROR(pdflib extension requires pdflib 2.0.)])
+ [AC_MSG_ERROR(pdflib extension requires pdflib 2.x.)])
LIBS=$old_LIBS
EXTRA_LIBS="$EXTRA_LIBS $PDFLIB_LIBS"
INCLUDES="$INCLUDES $PDFLIB_INCLUDE"