cvs: php4 / configure.in /ext/cpdf config.m4 /ext/pdf config.m4

sas Tue Aug 21 07:45:34 2001 EDT Modified files: /php4 configure.in /php4/ext/cpdf config.m4 /php4/ext/pdf config.m4 Log: Further work on autoconf-2.5x support Index: php4/configure.in diff -u php4/configure.in:1.274 php4/configure.in:1.275 --- php4/configure.in:1.274 Tue Aug 21 07:03:45 2001 +++ php4/configure.in Tue Aug 21 07:45:28 2001 @@ -1,4 +1,4 @@ -dnl ## $Id: configure.in,v 1.274 2001/08/21 11:03:45 sas Exp $ -*- sh -*- +dnl ## $Id: configure.in,v 1.275 2001/08/21 11:45:28 sas Exp $ -*- sh -*- dnl ## Process this file with autoconf to produce a configure script. divert(1) @@ -122,6 +122,7 @@ AC_PROG_LEX if test -n "$LEX"; then AC_DECL_YYTEXT + : fi dnl ## Make flex scanners use const if they can, even if __STDC__ is not @@ -934,7 +935,7 @@ AC_OUTPUT($ALL_OUTPUT_FILES, [], [ -if test "\$CONFIG_FILES" = "$ALL_OUTPUT_FILES"; then +if test "\$CONFIG_FILES" = "$ALL_OUTPUT_FILES" || test -z "\$CONFIG_FILES"; then REDO_ALL=yes fi @@ -953,9 +954,10 @@ # Create configuration headers # -if test -d TSRM; then - echo '#include "../main/php_config.h"' > TSRM/tsrm_config.h -fi +test -d TSRM || mkdir TSRM +echo '#include "../main/php_config.h"' > TSRM/tsrm_config.h + +test -d Zend || mkdir Zend cat >Zend/zend_config.h <<FEO #include "../main/php_config.h" Index: php4/ext/cpdf/config.m4 diff -u php4/ext/cpdf/config.m4:1.6 php4/ext/cpdf/config.m4:1.7 --- php4/ext/cpdf/config.m4:1.6 Sat May 12 07:08:47 2001 +++ php4/ext/cpdf/config.m4 Tue Aug 21 07:45:33 2001 @@ -1,4 +1,4 @@ -dnl $Id: config.m4,v 1.6 2001/05/12 11:08:47 sas Exp $ +dnl $Id: config.m4,v 1.7 2001/08/21 11:45:33 sas Exp $ AC_MSG_CHECKING(whether to include cpdflib support) AC_ARG_WITH(cpdflib, @@ -13,7 +13,7 @@ AC_MSG_RESULT(yes) PHP_EXTENSION(cpdf) AC_CHECK_LIB(cpdf, cpdf_open, [AC_DEFINE(HAVE_CPDFLIB,1,[Whether you have cpdflib])], - [AC_MSG_ERROR(Cpdf module requires cpdflib >= 2.)]) + [AC_MSG_ERROR([Cpdf module requires cpdflib >= 2.])]) PHP_ADD_LIBRARY(cpdf) PHP_ADD_LIBRARY(tiff) PHP_ADD_LIBRARY(jpeg) @@ -59,7 +59,7 @@ LIBS="$LIBS -L$withval/lib" AC_CHECK_LIB(cpdf, cpdf_open, [AC_DEFINE(HAVE_CPDFLIB,1,[Whether you have cpdflib])], - [AC_MSG_ERROR(Cpdflib module requires cpdflib >= 2.)]) + [AC_MSG_ERROR([Cpdflib module requires cpdflib >= 2.])]) LIBS=$old_LIBS PHP_ADD_LIBRARY_WITH_PATH(cpdf, $withval/lib) PHP_ADD_INCLUDE($CPDFLIB_INCLUDE) Index: php4/ext/pdf/config.m4 diff -u php4/ext/pdf/config.m4:1.21 php4/ext/pdf/config.m4:1.22 --- php4/ext/pdf/config.m4:1.21 Thu Jun 14 00:35:10 2001 +++ php4/ext/pdf/config.m4 Tue Aug 21 07:45:33 2001 @@ -1,5 +1,5 @@ dnl -dnl $Id: config.m4,v 1.21 2001/06/14 04:35:10 sniper Exp $ +dnl $Id: config.m4,v 1.22 2001/08/21 11:45:33 sas Exp $ dnl PHP_ARG_WITH(pdflib,whether to include PDFlib support, @@ -18,7 +18,7 @@ AC_CHECK_LIB(pdf, PDF_show_boxed, [ AC_DEFINE(HAVE_PDFLIB,1,[ ]) ],[ - AC_MSG_ERROR(pdflib extension requires at least pdflib 3.x. You may also need libtiff and libjpeg. If so, use the options --with-tiff-dir=<DIR> and --with-jpeg-dir=<DIR>) + AC_MSG_ERROR([pdflib extension requires at least pdflib 3.x. You may also need libtiff and libjpeg. If so, use the options --with-tiff-dir=<DIR> and --with-jpeg-dir=<DIR>]) ],[ -ltiff -ljpeg -lpng -lz ]) @@ -34,7 +34,7 @@ if test -n "$PDFLIB_INCLUDE" ; then if test "$PHP_ZLIB_DIR" = "no"; then - AC_MSG_ERROR(PDF extension requires ZLIB. Use --with-zlib-dir=<DIR>) + AC_MSG_ERROR([PDF extension requires ZLIB. Use --with-zlib-dir=<DIR>]) fi PHP_ADD_LIBRARY_WITH_PATH(z, $PHP_ZLIB_DIR/lib, PDFLIB_SHARED_LIBADD) @@ -47,7 +47,7 @@ [ PHP_ADD_LIBRARY_WITH_PATH(jpeg, $PHP_JPEG_DIR/lib, PDFLIB_SHARED_LIBADD) ],[ - AC_MSG_ERROR(libjpeg not found!) + AC_MSG_ERROR([libjpeg not found!]) ],[ -L$PHP_JPEG_DIR/lib ]) @@ -69,7 +69,7 @@ [ PHP_ADD_LIBRARY_WITH_PATH(png, $PHP_PNG_DIR/lib, PDFLIB_SHARED_LIBADD) ],[ - AC_MSG_ERROR(libpng not found!) + AC_MSG_ERROR([libpng not found!]) ],[ -L$PHP_PNG_DIR/lib ]) @@ -91,7 +91,7 @@ [ PHP_ADD_LIBRARY_WITH_PATH(tiff, $PHP_TIFF_DIR/lib, PDFLIB_SHARED_LIBADD) ],[ - AC_MSG_ERROR(libtiff not found!) + AC_MSG_ERROR([libtiff not found!]) ],[ -L$PHP_TIFF_DIR/lib ]) @@ -111,7 +111,7 @@ PHP_ADD_LIBRARY_WITH_PATH(pdf, $PHP_PDFLIB/lib, PDFLIB_SHARED_LIBADD) PHP_ADD_INCLUDE($PDFLIB_INCLUDE) ],[ - AC_MSG_ERROR(pdflib extension requires at least pdflib 3.x.) + AC_MSG_ERROR([pdflib extension requires at least pdflib 3.x.]) ],[ -L$PHP_PDFLIB/lib ])