mirrors/php-src
0
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-11-27 03:44:07 +08:00
Code Issues Packages Projects Releases Wiki Activity

- Prevent resetting the PHP_*_DIR variables if already set.

Browse Source
This commit is contained in:
foobar 2002-10-21 02:46:13 +00:00
parent 821349465a
commit 3be17e3f26
4 changed files with 38 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ext/domxml/config.m4
View File

@ -23,6 +23,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
DOMXML_DIR_ADD=""

18
ext/gd/config.m4
View File

@ -9,14 +9,20 @@ dnl
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)

10
ext/mysql/config.m4
View File

@ -48,8 +48,14 @@ PHP_ARG_WITH(mysql, for MySQL support,
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])

21
ext/pdf/config.m4
View File

@ -5,18 +5,24 @@ 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 @@ See config.log for more information.
;;
esac
fi