cvs: php4 /ext/pdf config.m4

sniper Fri Jun 28 21:19:31 2002 EDT Modified files: /php4/ext/pdf config.m4 Log: - Fix the shared problem. (the previous patch really didn't fix anything) Index: php4/ext/pdf/config.m4 diff -u php4/ext/pdf/config.m4:1.30 php4/ext/pdf/config.m4:1.31 --- php4/ext/pdf/config.m4:1.30 Fri Jun 28 12:47:35 2002 +++ php4/ext/pdf/config.m4 Fri Jun 28 21:19:31 2002 @@ -1,14 +1,27 @@ dnl -dnl $Id: config.m4,v 1.30 2002/06/28 16:47:35 avsm Exp $ +dnl $Id: config.m4,v 1.31 2002/06/29 01:19:31 sniper Exp $ dnl PHP_ARG_WITH(pdflib,for PDFlib support, [ --with-pdflib[=DIR] Include PDFlib support.]) -remember_ext_shared=$ext_shared + +pdflib_ext_shared=$ext_shared + +PHP_ARG_WITH(jpeg-dir, for the location of libjpeg, +[ --with-jpeg-dir[=DIR] PDFLIB: define libjpeg install directory. + (OPTIONAL for PDFlib v4)]) + +PHP_ARG_WITH(png-dir, for the location of libpng, +[ --with-png-dir[=DIR] PDFLIB: define libpng install directory. + (OPTIONAL for PDFlib v4)]) + +PHP_ARG_WITH(tiff-dir, for the location of libtiff, +[ --with-tiff-dir[=DIR] PDFLIB: define libtiff install directory. + (OPTIONAL for PDFlib v4)]) if test "$PHP_PDFLIB" != "no"; then - PHP_NEW_EXTENSION(pdf, pdf.c, $ext_shared) + PHP_NEW_EXTENSION(pdf, pdf.c, $pdflib_ext_shared) PHP_SUBST(PDFLIB_SHARED_LIBADD) dnl # @@ -16,11 +29,6 @@ dnl # dnl # libjpeg - - PHP_ARG_WITH(jpeg-dir, for the location of libjpeg, - [ --with-jpeg-dir[=DIR] PDFLIB: define libjpeg install directory. - (OPTIONAL for PDFlib v4)]) - if test "$PHP_JPEG_DIR" != "no"; then PHP_CHECK_LIBRARY(jpeg,jpeg_read_header, [ @@ -35,11 +43,6 @@ fi dnl # libpng - - PHP_ARG_WITH(png-dir, for the location of libpng, - [ --with-png-dir[=DIR] PDFLIB: define libpng install directory. - (OPTIONAL for PDFlib v4)]) - if test "$PHP_PNG_DIR" != "no"; then PHP_CHECK_LIBRARY(png,png_create_info_struct, [ @@ -54,11 +57,6 @@ fi dnl # libtiff - - PHP_ARG_WITH(tiff-dir, for the location of libtiff, - [ --with-tiff-dir[=DIR] PDFLIB: define libtiff install directory. - (OPTIONAL for PDFlib v4)]) - if test "$PHP_TIFF_DIR" != "no"; then PHP_CHECK_LIBRARY(tiff,TIFFOpen, [ @@ -73,7 +71,6 @@ fi dnl # zlib - AC_MSG_CHECKING([for the location of zlib]) if test "$PHP_ZLIB_DIR" = "no"; then AC_MSG_RESULT([no. If configure fails, try --with-zlib-dir=<DIR>]) @@ -82,12 +79,10 @@ PHP_ADD_LIBRARY_WITH_PATH(z, $PHP_ZLIB_DIR/lib, PDFLIB_SHARED_LIBADD) fi - dnl # dnl # The main PDFlib configure dnl # - ext_shared=$remember_ext_shared case $PHP_PDFLIB in yes) AC_CHECK_LIB(pdf, PDF_show_boxed, [