CVS update: php3

Date: Monday June 7, 1999 @ 11:00 Author: steinm Update of /repository/php3 In directory php:/tmp/cvs-serv15929 Modified Files: ChangeLog config.h.in configure.in Log Message: - added support for upcoming pdflib 2.0 Index: php3/ChangeLog diff -u php3/ChangeLog:1.668 php3/ChangeLog:1.669 --- php3/ChangeLog:1.668 Sat Jun 5 12:05:10 1999 +++ php3/ChangeLog Mon Jun 7 11:00:06 1999 @@ -1,6 +1,8 @@ PHP 3.0 CHANGE LOG ChangeLog ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||| +- added support for upcoming pdflib 2.0 (U. Steinmann) + June 6 1999, Version 3.0.9 - added preg_quote() function (Andrey) - fixed OCI8 crash for "Fetch out of sequence". (Thies) Index: php3/config.h.in diff -u php3/config.h.in:1.165 php3/config.h.in:1.166 --- php3/config.h.in:1.165 Thu Jun 3 08:03:05 1999 +++ php3/config.h.in Mon Jun 7 11:00:07 1999 @@ -360,6 +360,9 @@ /* Define if you have the pdflib library */ #define HAVE_PDFLIB 0 +/* Define if you have the pdflib library */ +#define HAVE_PDFLIB2 0 + /* Define if you have the fdftk library */ #define HAVE_FDFLIB 0 Index: php3/configure.in diff -u php3/configure.in:1.389 php3/configure.in:1.390 --- php3/configure.in:1.389 Thu Jun 3 08:03:05 1999 +++ php3/configure.in Mon Jun 7 11:00:08 1999 @@ -1,4 +1,4 @@ -dnl $Id: configure.in,v 1.389 1999/06/03 12:03:05 sas Exp $ +dnl $Id: configure.in,v 1.390 1999/06/07 15:00:08 steinm Exp $ dnl Process this file with autoconf to produce a configure script. AC_INIT(main.c) @@ -1849,29 +1849,41 @@ AC_MSG_RESULT(no) ;; yes) AC_MSG_RESULT(yes) - AC_MSG_WARN(!!!!! Attention !!!!!) + AC_MSG_WARN(!!!!! Attention for pdflib 0.6 !!!!!) AC_MSG_WARN(In order to ensure proper working of the pdf module, you should) AC_MSG_WARN(modify the pdflib distribution. Take out line 190 in) AC_MSG_WARN(file p_basic.c which closes the pdf file. Read also the php3) AC_MSG_WARN(documentation for more information.) AC_CHECK_LIB(pdf, PDF_open, [AC_DEFINE(HAVE_PDFLIB) PDFLIB_LIBS="-lpdf"], - [AC_MSG_ERROR(pdflib module requires pdflib 0.6)]) ;; + [AC_MSG_ERROR(pdflib module requires at least pdflib 0.6)]) + AC_CHECK_LIB(pdf, PDF_new, [AC_DEFINE(HAVE_PDFLIB2) PDFLIB_LIBS="-lpdf -lz"], + [AC_MSG_WARN(No pdflib 2.0 support. Consider an update.)]) ;; *) - test -f $withval/include/pdf.h && PDFLIB_INCLUDE="-I$withval/include" - if test -n "$PDFLIB_INCLUDE" ; then + test -d $withval/include && PDFLIB_INCLUDE="-I$withval/include" + if test -f $withval/include/pdf.h ; then AC_MSG_RESULT(yes) - AC_MSG_WARN(!!!!! Attention !!!!!) - AC_MSG_WARN(In order to ensure proper working of the pdf module, you should) - AC_MSG_WARN(modify the pdflib distribution. Take out line 190 in) - AC_MSG_WARN(file p_basic.c which closes the pdf file. Read also) - AC_MSG_WARN(the php3 documentation for more information.) + AC_MSG_WARN(!!!!! Attention for pdflib 0.6 !!!!!) + AC_MSG_WARN(In order to ensure proper working of the pdf module, you should) + AC_MSG_WARN(modify the pdflib distribution. Take out line 190 in) + AC_MSG_WARN(file p_basic.c which closes the pdf file. Read also) + 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"], - [AC_MSG_ERROR(pdflib module requires pdflib 0.6.)]) + AC_CHECK_LIB(pdf, PDF_open, [AC_DEFINE(HAVE_PDFLIB) PDFLIB_LIBS="-L$withval/lib -lpdf -lz"], + [AC_MSG_ERROR(pdflib module requires at least pdflib 0.6.)]) LIBS=$old_LIBS else - AC_MSG_RESULT(no) + 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_ERROR(pdflib module require at least pdflib 0.6.)]) + LIBS=$old_LIBS + else + AC_MSG_RESULT(no) + fi fi ;; esac ],[