cvs: /php4/ext/cpdf config.m4 /php4/ext/domxml config.m4 /php4/ext/pdf config.m4

steinm Thu Dec 9 02:16:06 1999 EDT Modified files: /php4/ext/cpdf config.m4 /php4/ext/domxml config.m4 /php4/ext/pdf config.m4 Log: - improved configuration due to compile problems which suddently show up Index: php4/ext/cpdf/config.m4 diff -u php4/ext/cpdf/config.m4:1.1 php4/ext/cpdf/config.m4:1.2 --- php4/ext/cpdf/config.m4:1.1 Mon Nov 22 10:28:26 1999 +++ php4/ext/cpdf/config.m4 Thu Dec 9 02:15:34 1999 @@ -1,4 +1,4 @@ -dnl $Id: config.m4,v 1.1 1999/11/22 15:28:26 steinm Exp $ +dnl $Id: config.m4,v 1.2 1999/12/09 07:15:34 steinm Exp $ AC_MSG_CHECKING(whether to include cpdflib support) AC_ARG_WITH(cpdflib, @@ -15,6 +15,8 @@ AC_CHECK_LIB(cpdf, cpdf_open, [AC_DEFINE(HAVE_CPDFLIB)], [AC_MSG_ERROR(Cpdf module requires cpdflib >= 2.)]) AC_ADD_LIBRARY(cpdf) + AC_ADD_LIBRARY(tiff) + AC_ADD_LIBRARY(jpeg) ;; *) test -f $withval/include/cpdflib.h && CPDFLIB_INCLUDE="$withval/include" @@ -31,10 +33,9 @@ if test -z $withval; then withval="/usr/local" fi - LIBS="$LIBS -L$withval/lib -ljpeg" + LIBS="$LIBS -L$withval/lib" AC_CHECK_LIB(jpeg,jpeg_read_header, ,[AC_MSG_RESULT(no)],) AC_ADD_LIBRARY_WITH_PATH(jpeg, $withval/lib) - LIBS="$LIBS -L$withval/lib -ljpeg" ],[ AC_MSG_RESULT(no) AC_MSG_WARN(If configure fails try --with-jpeg-dir=<DIR>) @@ -47,7 +48,7 @@ if test -z $withval; then withval="/usr/local" fi - LIBS="$LIBS -L$withval/lib -ljpeg" + LIBS="$LIBS -L$withval/lib" AC_CHECK_LIB(tiff,TIFFOpen, ,[AC_MSG_RESULT(no)],) AC_ADD_LIBRARY_WITH_PATH(tiff, $withval/lib) ],[ @@ -56,7 +57,7 @@ ]) withval=$old_withval - LIBS="$LIBS -L$withval/lib -ltiff" + LIBS="$LIBS -L$withval/lib" AC_CHECK_LIB(cpdf, cpdf_open, [AC_DEFINE(HAVE_CPDFLIB)], [AC_MSG_ERROR(Cpdflib module requires cpdflib >= 2.)]) LIBS=$old_LIBS Index: php4/ext/domxml/config.m4 diff -u php4/ext/domxml/config.m4:1.2 php4/ext/domxml/config.m4:1.3 --- php4/ext/domxml/config.m4:1.2 Thu Nov 25 01:56:40 1999 +++ php4/ext/domxml/config.m4 Thu Dec 9 02:15:35 1999 @@ -1,4 +1,4 @@ -dnl $Id: config.m4,v 1.2 1999/11/25 06:56:40 steinm Exp $ +dnl $Id: config.m4,v 1.3 1999/12/09 07:15:35 steinm Exp $ AC_MSG_CHECKING(whether to include DOM support) AC_ARG_WITH(dom, @@ -17,8 +17,8 @@ AC_CHECK_LIB(xml, xmlNewDoc, [AC_DEFINE(HAVE_DOMXML)], [AC_MSG_ERROR(DOM module requires libxml >= 1.0)]) LIBS=$old_LIBS - AC_ADD_LIBRARY(xml) AC_ADD_LIBRARY(gz) + AC_ADD_LIBRARY(xml) AC_ADD_INCLUDE(/usr/local/include) ;; *) Index: php4/ext/pdf/config.m4 diff -u php4/ext/pdf/config.m4:1.6 php4/ext/pdf/config.m4:1.7 --- php4/ext/pdf/config.m4:1.6 Tue Dec 7 05:49:19 1999 +++ php4/ext/pdf/config.m4 Thu Dec 9 02:15:36 1999 @@ -1,4 +1,4 @@ -dnl $Id: config.m4,v 1.6 1999/12/07 10:49:19 steinm Exp $ +dnl $Id: config.m4,v 1.7 1999/12/09 07:15:36 steinm Exp $ AC_MSG_CHECKING(whether to include Pdflib 2.x support) AC_ARG_WITH(pdflib, @@ -30,7 +30,6 @@ if test -n "$PDFLIB_INCLUDE" ; then AC_MSG_RESULT(yes) PHP_EXTENSION(pdf) - old_LIBS=$LIBS old_withval=$withval if test $HAVE_ZLIB; then @@ -41,9 +40,11 @@ if test -z $withval; then withval="/usr/local" fi + old_LIBS=$LIBS + LIBS="$LIBS -L$withval/lib" AC_CHECK_LIB(z,deflate, [PDFLIB_LIBS="-L$withval/lib -lz"],[AC_MSG_RESULT(no)],) - LIBS="$LIBS -L$withval/lib -lz" - AC_ADD_LIBRARY_WITH_PATH(z, $/withvallib) + LIBS=$old_LIBS + AC_ADD_LIBRARY_WITH_PATH(z, $withval/lib) ],[ AC_MSG_RESULT(no) AC_MSG_WARN(If configure fails try --with-zlib=<DIR>) @@ -61,8 +62,10 @@ if test -z $withval; then withval="/usr/local" fi - LIBS="$LIBS -L$withval/lib -ljpeg" + old_LIBS=$LIBS + LIBS="$LIBS -L$withval/lib" AC_CHECK_LIB(jpeg,jpeg_read_header, [PDFLIB_LIBS="$PDFLIB_LIBS -L$withval/lib -ljpeg"],[AC_MSG_RESULT(no)],) + LIBS=$old_LIBS AC_ADD_LIBRARY_WITH_PATH(jpeg, $withval/lib) LIBS="$LIBS -L$withval/lib -ljpeg" ],[ @@ -77,21 +80,25 @@ if test -z $withval; then withval="/usr/local" fi - LIBS="$LIBS -L$withval/lib -ltiff -ljpeg" + old_LIBS=$LIBS + LIBS="$LIBS -L$withval/lib" AC_CHECK_LIB(tiff,TIFFOpen, [PDFLIB_LIBS="$PDFLIB_LIBS -L$withval/lib -ltiff"],[AC_MSG_RESULT(no)],) + LIBS=$old_LIBS AC_ADD_LIBRARY_WITH_PATH(tiff, $withval/lib) + LIBS="$LIBS -L$withval/lib -ltiff" ],[ AC_MSG_RESULT(no) AC_MSG_WARN(If configure fails try --with-tiff-dir=<DIR>) ]) withval=$old_withval + old_LIBS=$LIBS 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.x.)]) + LIBS=$old_LIBS AC_ADD_LIBRARY_WITH_PATH(pdf, $withval/lib) AC_ADD_INCLUDE($PDFLIB_INCLUDE) - LIBS=$old_LIBS else AC_MSG_RESULT(no) fi ;;