cvs: /php4/ext/pdf config.m4

steinm Thu Aug 19 13:07:27 1999 EDT Modified files: /php4/ext/pdf config.m4 Log: On the way to make configure more robust Index: php4/ext/pdf/config.m4 diff -u php4/ext/pdf/config.m4:1.4 php4/ext/pdf/config.m4:1.5 --- php4/ext/pdf/config.m4:1.4 Thu Aug 12 02:23:27 1999 +++ php4/ext/pdf/config.m4 Thu Aug 19 13:07:26 1999 @@ -1,6 +1,6 @@ -dnl $Id: config.m4,v 1.4 1999/08/12 06:23:27 steinm Exp $ +dnl $Id: config.m4,v 1.5 1999/08/19 17:07:26 steinm Exp $ -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 @@ 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 @@ 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"