CVS update: php3

Date: Friday June 11, 1999 @ 2:43 Author: steinm Update of /repository/php3 In directory php:/tmp/cvs-serv18807 Modified Files: configure.in Log Message: - made configure more intelligent to check for additional libs needed by upcoming pdflib 2.0. I wonder if this is way it should be done. Index: php3/configure.in diff -u php3/configure.in:1.390 php3/configure.in:1.391 --- php3/configure.in:1.390 Mon Jun 7 11:00:08 1999 +++ php3/configure.in Fri Jun 11 02:43:15 1999 @@ -1,4 +1,4 @@ -dnl $Id: configure.in,v 1.390 1999/06/07 15:00:08 steinm Exp $ +dnl $Id: configure.in,v 1.391 1999/06/11 06:43:15 steinm Exp $ dnl Process this file with autoconf to produce a configure script. AC_INIT(main.c) @@ -1869,16 +1869,49 @@ AC_MSG_WARN(the php3 documentation for more information.) old_LIBS=$LIBS LIBS="$LIBS -L$withval/lib" - AC_CHECK_LIB(pdf, PDF_open, [AC_DEFINE(HAVE_PDFLIB) PDFLIB_LIBS="-L$withval/lib -lpdf -lz"], + AC_CHECK_LIB(pdf, PDF_open, [AC_DEFINE(HAVE_PDFLIB) PDFLIB_LIBS="-L$withval/lib -lpdf"], [AC_MSG_ERROR(pdflib module requires at least pdflib 0.6.)]) LIBS=$old_LIBS else if test -f $withval/include/pdflib.h ; then - AC_MSG_RESULT(yes) old_LIBS=$LIBS - LIBS="$LIBS -lz -L$withval/lib" - AC_CHECK_LIB(z,deflate, PDF_LIBS="$PDF_LIBS -lz",,) - AC_CHECK_LIB(pdf, PDF_new, [AC_DEFINE(HAVE_PDFLIB) AC_DEFINE(HAVE_PDFLIB2) PDFLIB_LIBS="-L$withval/lib -lpdf -lz"], + AC_MSG_RESULT(yes) + + old_withval=$withval + if test -z $ZLIB_LIBS; then + AC_MSG_CHECKING(for zlib needed by pdflib 2.0) + AC_ARG_WITH(zlib-dir, + [ --with-zlib-dir=DIR zlib dir],[ + 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)],) + ],[ + AC_MSG_RESULT(no) + ]) + else + echo "checking for libz needed by pdflib 2.0... already zlib support" + PDFLIB_LIBS=$ZLIB_LIBS + LIBS="$LIBS $ZLIB_LIBS" + fi + AC_MSG_CHECKING(for libtiff needed by pdflib 2.0) + AC_ARG_WITH(tiff-dir, + [ --with-tiff-dir=DIR tiff dir],[ + AC_MSG_RESULT(yes) + if test -z $withval; then + withval="/usr/local" + fi + LIBS="$LIBS -L$withval/lib -ltiff -ljpeg -lgz" + AC_CHECK_LIB(tiff,TIFFOpen, [PDFLIB_LIBS="$PDFLIB_LIBS -L$withval/lib -ltiff -ljpeg -lgz"],[AC_MSG_RESULT(no)],) + ],[ + AC_MSG_RESULT(no) + ]) + withval=$old_withval + + LIBS="$LIBS -L$withval/lib" + AC_CHECK_LIB(pdf, PDF_new, [AC_DEFINE(HAVE_PDFLIB) AC_DEFINE(HAVE_PDFLIB2) PDFLIB_LIBS="$PDFLIB_LIBS -L$withval/lib -lpdf"], [AC_MSG_ERROR(pdflib module require at least pdflib 0.6.)]) LIBS=$old_LIBS else