sniper Sun Oct 20 22:46:15 2002 EDT Modified files: /php4/ext/domxml config.m4 /php4/ext/gd config.m4 /php4/ext/mysql config.m4 /php4/ext/pdf config.m4 Log: - Prevent resetting the PHP_*_DIR variables if already set. Index: php4/ext/domxml/config.m4 diff -u php4/ext/domxml/config.m4:1.41 php4/ext/domxml/config.m4:1.42 --- php4/ext/domxml/config.m4:1.41 Wed Sep 4 14:47:22 2002 +++ php4/ext/domxml/config.m4 Sun Oct 20 22:46:11 2002 @@ -1,5 +1,5 @@ dnl -dnl $Id: config.m4,v 1.41 2002/09/04 18:47:22 sniper Exp $ +dnl $Id: config.m4,v 1.42 2002/10/21 02:46:11 sniper Exp $ dnl AC_DEFUN(PHP_DOM_CHECK_VERSION,[ @@ -22,6 +22,11 @@ PHP_ARG_WITH(dom, for DOM support, [ --with-dom[=DIR] Include DOM support (requires libxml >= 2.4.14). DIR is the libxml install directory.]) + +if test -z "$PHP_ZLIB_DIR"; then + PHP_ARG_WITH(zlib-dir, for the location of libz, + [ --with-zlib-dir[=DIR] DOMXML: Set the path to libz install prefix.], no, no) +fi if test "$PHP_DOM" != "no"; then Index: php4/ext/gd/config.m4 diff -u php4/ext/gd/config.m4:1.116 php4/ext/gd/config.m4:1.117 --- php4/ext/gd/config.m4:1.116 Sat Oct 19 09:27:53 2002 +++ php4/ext/gd/config.m4 Sun Oct 20 22:46:12 2002 @@ -1,5 +1,5 @@ dnl -dnl $Id: config.m4,v 1.116 2002/10/19 13:27:53 sniper Exp $ +dnl $Id: config.m4,v 1.117 2002/10/21 02:46:12 sniper Exp $ dnl dnl @@ -9,14 +9,20 @@ PHP_ARG_WITH(gd, for GD support, [ --with-gd[=DIR] Include GD support (DIR is GD's install dir).]) -PHP_ARG_WITH(jpeg-dir, for the location of libjpeg, -[ --with-jpeg-dir=DIR GD: Set the path to libjpeg install prefix.], no, no) +if test -z "$PHP_JPEG_DIR"; then + PHP_ARG_WITH(jpeg-dir, for the location of libjpeg, + [ --with-jpeg-dir=DIR GD: Set the path to libjpeg install prefix.], no, no) +fi -PHP_ARG_WITH(png-dir, for the location of libpng, -[ --with-png-dir=DIR GD: Set the path to libpng install prefix.], no, no) +if test -z "$PHP_PNG_DIR"; then + PHP_ARG_WITH(png-dir, for the location of libpng, + [ --with-png-dir=DIR GD: Set the path to libpng install prefix.], no, no) +fi -PHP_ARG_WITH(zlib-dir, for the location of libz, -[ --with-zlib-dir[=DIR] GD: Set the path to libz install prefix.], no, no) +if test -z "$PHP_ZLIB_DIR"; then + PHP_ARG_WITH(zlib-dir, for the location of libz, + [ --with-zlib-dir[=DIR] GD: Set the path to libz install prefix.], no, no) +fi PHP_ARG_WITH(xpm-dir, for the location of libXpm, [ --with-xpm-dir=DIR GD: Set the path to libXpm install prefix.], no, no) Index: php4/ext/mysql/config.m4 diff -u php4/ext/mysql/config.m4:1.53 php4/ext/mysql/config.m4:1.54 --- php4/ext/mysql/config.m4:1.53 Wed Sep 4 14:47:23 2002 +++ php4/ext/mysql/config.m4 Sun Oct 20 22:46:12 2002 @@ -1,5 +1,5 @@ dnl -dnl $Id: config.m4,v 1.53 2002/09/04 18:47:23 sniper Exp $ +dnl $Id: config.m4,v 1.54 2002/10/21 02:46:12 sniper Exp $ dnl sinclude(ext/mysql/libmysql/acinclude.m4) @@ -48,8 +48,14 @@ If unspecified, the bundled MySQL library will be used.], yes) PHP_ARG_WITH(mysql-sock, for specified location of the MySQL UNIX socket, -[ --with-mysql-sock[=DIR] Location of the MySQL unix socket pointer. - If unspecified, the default locations are searched.], no, no) +[ --with-mysql-sock[=DIR] MySQL: Location of the MySQL unix socket pointer. + If unspecified, the default locations are searched.], no, +no) + +if test -z "$PHP_ZLIB_DIR"; then + PHP_ARG_WITH(zlib-dir, for the location of libz, + [ --with-zlib-dir[=DIR] MySQL: Set the path to libz install prefix.], no, no) +fi + if test "$PHP_MYSQL" != "no"; then AC_DEFINE(HAVE_MYSQL, 1, [Whether you have MySQL]) Index: php4/ext/pdf/config.m4 diff -u php4/ext/pdf/config.m4:1.34 php4/ext/pdf/config.m4:1.35 --- php4/ext/pdf/config.m4:1.34 Thu Oct 17 00:21:52 2002 +++ php4/ext/pdf/config.m4 Sun Oct 20 22:46:13 2002 @@ -1,22 +1,28 @@ dnl -dnl $Id: config.m4,v 1.34 2002/10/17 04:21:52 sniper Exp $ +dnl $Id: config.m4,v 1.35 2002/10/21 02:46:13 sniper Exp $ dnl PHP_ARG_WITH(pdflib,for PDFlib support, [ --with-pdflib[=DIR] Include PDFlib support.]) -PHP_ARG_WITH(jpeg-dir, for the location of libjpeg, -[ --with-jpeg-dir[=DIR] PDFLIB: define libjpeg install directory. +if test -z "$PHP_JPEG_DIR"; then + PHP_ARG_WITH(jpeg-dir, for the location of libjpeg, + [ --with-jpeg-dir[=DIR] PDFLIB: define libjpeg install directory. (OPTIONAL for PDFlib v4)], no, no) +fi -PHP_ARG_WITH(png-dir, for the location of libpng, -[ --with-png-dir[=DIR] PDFLIB: define libpng install directory. +if test -z "$PHP_PNG_DIR"; then + PHP_ARG_WITH(png-dir, for the location of libpng, + [ --with-png-dir[=DIR] PDFLIB: define libpng install directory. (OPTIONAL for PDFlib v4)], no, no) +fi -PHP_ARG_WITH(zlib-dir, for the location of libz, -[ --with-zlib-dir[=DIR] PDFLIB: define libz install directory. +if test -z "$PHP_ZLIB_DIR"; then + PHP_ARG_WITH(zlib-dir, for the location of libz, + [ --with-zlib-dir[=DIR] PDFLIB: define libz install directory. (OPTIONAL for PDFlib v4)], no, no) - +fi + PHP_ARG_WITH(tiff-dir, for the location of libtiff, [ --with-tiff-dir[=DIR] PDFLIB: define libtiff install directory. (OPTIONAL for PDFlib v4)], no, no) @@ -121,4 +127,3 @@ ;; esac fi -
-- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php