cvs: php4 /ext/pdf config.m4
| From: | Jani Taskinen | Date: | Thu, 10 May 2001 00:54:45 +0000 |
| Subject: | cvs: php4 /ext/pdf config.m4 | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-5636@lists.php.net to get a copy of this message | ||
sniper Wed May 9 17:54:45 2001 EDT
Modified files:
/php4/ext/pdf config.m4
Log:
Cleaned up this a bit..
Index: php4/ext/pdf/config.m4 diff -u php4/ext/pdf/config.m4:1.17 php4/ext/pdf/config.m4:1.18 --- php4/ext/pdf/config.m4:1.17 Tue Mar 27 12:34:39 2001 +++ php4/ext/pdf/config.m4 Wed May 9 17:54:44 2001 @@ -1,4 +1,6 @@ -dnl $Id: config.m4,v 1.17 2001/03/27 20:34:39 sniper Exp $ +dnl +dnl $Id: config.m4,v 1.18 2001/05/10 00:54:44 sniper Exp $ +dnl PHP_ARG_WITH(pdflib,whether to include PDFlib support, [ --with-pdflib[=DIR] Include pdflib 3.x support. DIR is the pdflib @@ -6,120 +8,112 @@ Set DIR to "shared" to build as dl, or "shared,DIR" to build as dl and still specify DIR.]) +if test "$PHP_PDFLIB" != "no"; then + + PHP_SUBST(PDFLIB_SHARED_LIBADD) + PHP_EXTENSION(pdf, $ext_shared) + case "$PHP_PDFLIB" in yes) - PHP_EXTENSION(pdf, $ext_shared) - old_LDFLAGS=$LDFLAGS - old_LIBS=$LIBS - LIBS="$LIBS -ltiff -ljpeg -lpng -lz" 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>) + ],[ + -ltiff -ljpeg -lpng -lz ]) - LIBS=$old_LIBS - LDFLAGS=$old_LDFLAGS - PHP_SUBST(PDFLIB_SHARED_LIBADD) - PHP_ADD_LIBRARY(pdf, PDFLIB_SHARED_LIBADD) - PHP_ADD_LIBRARY(tiff) - PHP_ADD_LIBRARY(png) - PHP_ADD_LIBRARY(jpeg) - PHP_ADD_LIBRARY(z) - ;; - no) - ;; + + PHP_ADD_LIBRARY(pdf,, PDFLIB_SHARED_LIBADD) + PHP_ADD_LIBRARY(tiff,, PDFLIB_SHARED_LIBADD) + PHP_ADD_LIBRARY(png,, PDFLIB_SHARED_LIBADD) + PHP_ADD_LIBRARY(jpeg,, PDFLIB_SHARED_LIBADD) + PHP_ADD_LIBRARY(z,, PDFLIB_SHARED_LIBADD) + ;; *) - test -f $withval/include/pdflib.h && PDFLIB_INCLUDE="$withval/include" + test -f $PHP_PDFLIB/include/pdflib.h && PDFLIB_INCLUDE="$PHP_PDFLIB/include" if test -n "$PDFLIB_INCLUDE" ; then - PHP_EXTENSION(pdf, $ext_shared) - old_withval=$withval - if test $HAVE_ZLIB; then - AC_MSG_CHECKING([for zlib (needed by pdflib 3.x)]) - AC_ARG_WITH(zlib-dir, - [ --with-zlib-dir[=DIR] zlib dir for pdflib 3.x or include zlib support],[ - 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=$old_LIBS - PHP_ADD_LIBRARY_WITH_PATH(z, $withval/lib) - ],[ - AC_CHECK_LIB(z,deflate, ,[AC_MSG_RESULT(no, try --with-zlib=<DIR>)],) - PHP_ADD_LIBRARY(z) - LIBS="$LIBS -lz" + if test "$PHP_ZLIB" = "no"; then + AC_MSG_CHECKING([for zlib (needed by pdflib)]) + + AC_CHECK_LIB(z,deflate, + [ + PHP_ADD_LIBRARY_WITH_PATH(z, $PHP_ZLIB_DIR/lib, PDFLIB_SHARED_LIBADD) + ],[ + AC_MSG_ERROR(libz.(a|so) not found! Try with --with-zlib-dir=<DIR>) + ],[ + -L$PHP_ZLIB_DIR/lib ]) else - echo "checking for libz needed by pdflib 3.x... already zlib support" - PDFLIB_LIBS="$ZLIB_LIBS" - LIBS="$LIBS -lz" + echo "checking for libz needed by pdflib... already zlib support" fi - AC_ARG_WITH(jpeg-dir, - [ --with-jpeg-dir[=DIR] jpeg dir for pdflib 3.x],[ - if test -z $withval; then - withval="/usr/local" - fi - 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 - PHP_ADD_LIBRARY_WITH_PATH(jpeg, $withval/lib) - LIBS="$LIBS -L$withval/lib -ljpeg" - ],[ - AC_CHECK_LIB(jpeg,jpeg_read_header, ,[AC_MSG_RESULT(no, try --with-jpeg-dir=<DIR>)],) - PHP_ADD_LIBRARY(jpeg) - LIBS="$LIBS -ljpeg" - ]) - - AC_ARG_WITH(png-dir, - [ --with-png-dir[=DIR] png dir for pdflib 3.x],[ - if test -z $withval; then - withval="/usr/local" - fi - old_LIBS=$LIBS - LIBS="$LIBS -L$withval/lib" - AC_CHECK_LIB(png,png_create_info_struct, [PDFLIB_LIBS="$PDFLIB_LIBS -L$withval/lib -lpng"],[AC_MSG_RESULT(no)],) - LIBS=$old_LIBS - PHP_ADD_LIBRARY_WITH_PATH(png, $withval/lib) - LIBS="$LIBS -L$withval/lib -lpng" - ],[ - AC_CHECK_LIB(png,png_create_info_struct, ,[AC_MSG_RESULT(no, try --with-png-dir=<DIR>)],) - PHP_ADD_LIBRARY(png) - LIBS="$LIBS -lpng" - ]) - - AC_ARG_WITH(tiff-dir, - [ --with-tiff-dir[=DIR] tiff dir for pdflib 3.x],[ - if test -z $withval; then - withval="/usr/local" - fi - 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 - PHP_ADD_LIBRARY_WITH_PATH(tiff, $withval/lib) - LIBS="$LIBS -L$withval/lib -ltiff" - ],[ + + PHP_ARG_WITH(jpeg-dir, for the location of libjpeg, + [ --with-jpeg-dir[=DIR] PDFLIB: define libjpeg install directory]) + + if test "$PHP_JPEG_DIR" != "no" -a "$PHP_JPEG_DIR"; then + AC_CHECK_LIB(jpeg,jpeg_read_header, + [ + PHP_ADD_LIBRARY_WITH_PATH(jpeg, $PHP_JPEG_DIR/lib, PDFLIB_SHARED_LIBADD) + ],[ + AC_MSG_ERROR(libjpeg not found!) + ],[ + -L$PHP_JPEG_DIR/lib + ]) + else + AC_CHECK_LIB(jpeg,jpeg_read_header,[ ],[AC_MSG_RESULT(no, try --with-jpeg-dir=<DIR>)]) + PHP_ADD_LIBRARY(jpeg,, PDFLIB_SHARED_LIBADD) + fi + + + PHP_ARG_WITH(png-dir, for the location of libpng, + [ --with-png-dir[=DIR] PDFLIB: define libpng install directory]) + + if test "$PHP_PNG_DIR" != "no" -a "$PHP_PNG_DIR"; then + AC_CHECK_LIB(png,png_create_info_struct, + [ + PHP_ADD_LIBRARY_WITH_PATH(png, $PHP_PNG_DIR/lib, PDFLIB_SHARED_LIBADD) + ],[ + AC_MSG_ERROR(libpng not found!) + ],[ + -L$PHP_PNG_DIR/lib + ]) + else + AC_CHECK_LIB(png,png_create_info_struct,[ ],[AC_MSG_RESULT(no, try --with-png-dir=<DIR>)]) + PHP_ADD_LIBRARY(png,, PDFLIB_SHARED_LIBADD) + fi + + + PHP_ARG_WITH(tiff-dir, for the location of libtiff, + [ --with-tiff-dir[=DIR] PDFLIB: define libtiff install directory]) + + if test "$PHP_TIFF_DIR" != "no" -a "$PHP_TIFF_DIR"; then + AC_CHECK_LIB(tiff,TIFFOpen, + [ + PHP_ADD_LIBRARY_WITH_PATH(tiff, $PHP_TIFF_DIR/lib, PDFLIB_SHARED_LIBADD) + ],[ + AC_MSG_ERROR(libtiff not found!) + ],[ + -L$PHP_TIFF_DIR/lib + ]) + else AC_CHECK_LIB(tiff,TIFFOpen, ,[AC_MSG_RESULT(no, Try --with-tiff-dir=<DIR>)],) - PHP_ADD_LIBRARY(tiff) - LIBS="$LIBS -ltiff" - ]) - withval=$old_withval - - old_LIBS=$LIBS - LIBS="$LIBS -L$withval/lib" - AC_CHECK_LIB(pdf, PDF_show_boxed, [ + PHP_ADD_LIBRARY(tiff,, PDFLIB_SHARED_LIBADD) + fi + + + AC_CHECK_LIB(pdf, PDF_show_boxed, + [ AC_DEFINE(HAVE_PDFLIB,1,[ ]) - PDFLIB_LIBS="$PDFLIB_LIBS -L$withval/lib -lpdf" + PHP_ADD_LIBRARY_WITH_PATH(pdf, $PHP_PDFLIB/lib, PDFLIB_SHARED_LIBADD) + PHP_ADD_INCLUDE($PDFLIB_INCLUDE) ],[ AC_MSG_ERROR(pdflib extension requires pdflib 3.x.) + ],[ + -L$PHP_PDFLIB/lib ]) - LIBS=$old_LIBS - PHP_SUBST(PDFLIB_SHARED_LIBADD) - PHP_ADD_LIBRARY_WITH_PATH(pdf, $withval/lib, PDFLIB_SHARED_LIBADD) - PHP_ADD_INCLUDE($PDFLIB_INCLUDE) - fi ;; + fi + ;; esac +fi
Index: php4/ext/pdf/config.m4 diff -u php4/ext/pdf/config.m4:1.17 php4/ext/pdf/config.m4:1.18 --- php4/ext/pdf/config.m4:1.17 Tue Mar 27 12:34:39 2001 +++ php4/ext/pdf/config.m4 Wed May 9 17:54:44 2001 @@ -1,4 +1,6 @@ -dnl $Id: config.m4,v 1.17 2001/03/27 20:34:39 sniper Exp $ +dnl +dnl $Id: config.m4,v 1.18 2001/05/10 00:54:44 sniper Exp $ +dnl PHP_ARG_WITH(pdflib,whether to include PDFlib support, [ --with-pdflib[=DIR] Include pdflib 3.x support. DIR is the pdflib @@ -6,120 +8,112 @@ Set DIR to "shared" to build as dl, or "shared,DIR" to build as dl and still specify DIR.]) +if test "$PHP_PDFLIB" != "no"; then + + PHP_SUBST(PDFLIB_SHARED_LIBADD) + PHP_EXTENSION(pdf, $ext_shared) + case "$PHP_PDFLIB" in yes) - PHP_EXTENSION(pdf, $ext_shared) - old_LDFLAGS=$LDFLAGS - old_LIBS=$LIBS - LIBS="$LIBS -ltiff -ljpeg -lpng -lz" 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>) + ],[ + -ltiff -ljpeg -lpng -lz ]) - LIBS=$old_LIBS - LDFLAGS=$old_LDFLAGS - PHP_SUBST(PDFLIB_SHARED_LIBADD) - PHP_ADD_LIBRARY(pdf, PDFLIB_SHARED_LIBADD) - PHP_ADD_LIBRARY(tiff) - PHP_ADD_LIBRARY(png) - PHP_ADD_LIBRARY(jpeg) - PHP_ADD_LIBRARY(z) - ;; - no) - ;; + + PHP_ADD_LIBRARY(pdf,, PDFLIB_SHARED_LIBADD) + PHP_ADD_LIBRARY(tiff,, PDFLIB_SHARED_LIBADD) + PHP_ADD_LIBRARY(png,, PDFLIB_SHARED_LIBADD) + PHP_ADD_LIBRARY(jpeg,, PDFLIB_SHARED_LIBADD) + PHP_ADD_LIBRARY(z,, PDFLIB_SHARED_LIBADD) + ;; *) - test -f $withval/include/pdflib.h && PDFLIB_INCLUDE="$withval/include" + test -f $PHP_PDFLIB/include/pdflib.h && PDFLIB_INCLUDE="$PHP_PDFLIB/include" if test -n "$PDFLIB_INCLUDE" ; then - PHP_EXTENSION(pdf, $ext_shared) - old_withval=$withval - if test $HAVE_ZLIB; then - AC_MSG_CHECKING([for zlib (needed by pdflib 3.x)]) - AC_ARG_WITH(zlib-dir, - [ --with-zlib-dir[=DIR] zlib dir for pdflib 3.x or include zlib support],[ - 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=$old_LIBS - PHP_ADD_LIBRARY_WITH_PATH(z, $withval/lib) - ],[ - AC_CHECK_LIB(z,deflate, ,[AC_MSG_RESULT(no, try --with-zlib=<DIR>)],) - PHP_ADD_LIBRARY(z) - LIBS="$LIBS -lz" + if test "$PHP_ZLIB" = "no"; then + AC_MSG_CHECKING([for zlib (needed by pdflib)]) + + AC_CHECK_LIB(z,deflate, + [ + PHP_ADD_LIBRARY_WITH_PATH(z, $PHP_ZLIB_DIR/lib, PDFLIB_SHARED_LIBADD) + ],[ + AC_MSG_ERROR(libz.(a|so) not found! Try with --with-zlib-dir=<DIR>) + ],[ + -L$PHP_ZLIB_DIR/lib ]) else - echo "checking for libz needed by pdflib 3.x... already zlib support" - PDFLIB_LIBS="$ZLIB_LIBS" - LIBS="$LIBS -lz" + echo "checking for libz needed by pdflib... already zlib support" fi - AC_ARG_WITH(jpeg-dir, - [ --with-jpeg-dir[=DIR] jpeg dir for pdflib 3.x],[ - if test -z $withval; then - withval="/usr/local" - fi - 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 - PHP_ADD_LIBRARY_WITH_PATH(jpeg, $withval/lib) - LIBS="$LIBS -L$withval/lib -ljpeg" - ],[ - AC_CHECK_LIB(jpeg,jpeg_read_header, ,[AC_MSG_RESULT(no, try --with-jpeg-dir=<DIR>)],) - PHP_ADD_LIBRARY(jpeg) - LIBS="$LIBS -ljpeg" - ]) - - AC_ARG_WITH(png-dir, - [ --with-png-dir[=DIR] png dir for pdflib 3.x],[ - if test -z $withval; then - withval="/usr/local" - fi - old_LIBS=$LIBS - LIBS="$LIBS -L$withval/lib" - AC_CHECK_LIB(png,png_create_info_struct, [PDFLIB_LIBS="$PDFLIB_LIBS -L$withval/lib -lpng"],[AC_MSG_RESULT(no)],) - LIBS=$old_LIBS - PHP_ADD_LIBRARY_WITH_PATH(png, $withval/lib) - LIBS="$LIBS -L$withval/lib -lpng" - ],[ - AC_CHECK_LIB(png,png_create_info_struct, ,[AC_MSG_RESULT(no, try --with-png-dir=<DIR>)],) - PHP_ADD_LIBRARY(png) - LIBS="$LIBS -lpng" - ]) - - AC_ARG_WITH(tiff-dir, - [ --with-tiff-dir[=DIR] tiff dir for pdflib 3.x],[ - if test -z $withval; then - withval="/usr/local" - fi - 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 - PHP_ADD_LIBRARY_WITH_PATH(tiff, $withval/lib) - LIBS="$LIBS -L$withval/lib -ltiff" - ],[ + + PHP_ARG_WITH(jpeg-dir, for the location of libjpeg, + [ --with-jpeg-dir[=DIR] PDFLIB: define libjpeg install directory]) + + if test "$PHP_JPEG_DIR" != "no" -a "$PHP_JPEG_DIR"; then + AC_CHECK_LIB(jpeg,jpeg_read_header, + [ + PHP_ADD_LIBRARY_WITH_PATH(jpeg, $PHP_JPEG_DIR/lib, PDFLIB_SHARED_LIBADD) + ],[ + AC_MSG_ERROR(libjpeg not found!) + ],[ + -L$PHP_JPEG_DIR/lib + ]) + else + AC_CHECK_LIB(jpeg,jpeg_read_header,[ ],[AC_MSG_RESULT(no, try --with-jpeg-dir=<DIR>)]) + PHP_ADD_LIBRARY(jpeg,, PDFLIB_SHARED_LIBADD) + fi + + + PHP_ARG_WITH(png-dir, for the location of libpng, + [ --with-png-dir[=DIR] PDFLIB: define libpng install directory]) + + if test "$PHP_PNG_DIR" != "no" -a "$PHP_PNG_DIR"; then + AC_CHECK_LIB(png,png_create_info_struct, + [ + PHP_ADD_LIBRARY_WITH_PATH(png, $PHP_PNG_DIR/lib, PDFLIB_SHARED_LIBADD) + ],[ + AC_MSG_ERROR(libpng not found!) + ],[ + -L$PHP_PNG_DIR/lib + ]) + else + AC_CHECK_LIB(png,png_create_info_struct,[ ],[AC_MSG_RESULT(no, try --with-png-dir=<DIR>)]) + PHP_ADD_LIBRARY(png,, PDFLIB_SHARED_LIBADD) + fi + + + PHP_ARG_WITH(tiff-dir, for the location of libtiff, + [ --with-tiff-dir[=DIR] PDFLIB: define libtiff install directory]) + + if test "$PHP_TIFF_DIR" != "no" -a "$PHP_TIFF_DIR"; then + AC_CHECK_LIB(tiff,TIFFOpen, + [ + PHP_ADD_LIBRARY_WITH_PATH(tiff, $PHP_TIFF_DIR/lib, PDFLIB_SHARED_LIBADD) + ],[ + AC_MSG_ERROR(libtiff not found!) + ],[ + -L$PHP_TIFF_DIR/lib + ]) + else AC_CHECK_LIB(tiff,TIFFOpen, ,[AC_MSG_RESULT(no, Try --with-tiff-dir=<DIR>)],) - PHP_ADD_LIBRARY(tiff) - LIBS="$LIBS -ltiff" - ]) - withval=$old_withval - - old_LIBS=$LIBS - LIBS="$LIBS -L$withval/lib" - AC_CHECK_LIB(pdf, PDF_show_boxed, [ + PHP_ADD_LIBRARY(tiff,, PDFLIB_SHARED_LIBADD) + fi + + + AC_CHECK_LIB(pdf, PDF_show_boxed, + [ AC_DEFINE(HAVE_PDFLIB,1,[ ]) - PDFLIB_LIBS="$PDFLIB_LIBS -L$withval/lib -lpdf" + PHP_ADD_LIBRARY_WITH_PATH(pdf, $PHP_PDFLIB/lib, PDFLIB_SHARED_LIBADD) + PHP_ADD_INCLUDE($PDFLIB_INCLUDE) ],[ AC_MSG_ERROR(pdflib extension requires pdflib 3.x.) + ],[ + -L$PHP_PDFLIB/lib ]) - LIBS=$old_LIBS - PHP_SUBST(PDFLIB_SHARED_LIBADD) - PHP_ADD_LIBRARY_WITH_PATH(pdf, $withval/lib, PDFLIB_SHARED_LIBADD) - PHP_ADD_INCLUDE($PDFLIB_INCLUDE) - fi ;; + fi + ;; esac +fi