From: foobar <sniper@php.net>
Date: Mon, 21 Oct 2002 02:46:13 +0000 (+0000)
Subject: - Prevent resetting the PHP_*_DIR variables if already set.
X-Git-Tag: php-4.3.0pre2~247
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=3be17e3f266ef2363e6955b504a9f1e819ed9097;p=php

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

diff --git a/ext/domxml/config.m4 b/ext/domxml/config.m4
index 4a8ac216f8..5806908302 100644
--- a/ext/domxml/config.m4
+++ b/ext/domxml/config.m4
@@ -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=""
diff --git a/ext/gd/config.m4 b/ext/gd/config.m4
index 3710d1488e..ad328a2e26 100644
--- a/ext/gd/config.m4
+++ b/ext/gd/config.m4
@@ -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)
diff --git a/ext/mysql/config.m4 b/ext/mysql/config.m4
index e0e0c19966..e59a0d5190 100644
--- a/ext/mysql/config.m4
+++ b/ext/mysql/config.m4
@@ -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])
diff --git a/ext/pdf/config.m4 b/ext/pdf/config.m4
index e0f40d3327..01ff4f918e 100644
--- a/ext/pdf/config.m4
+++ b/ext/pdf/config.m4
@@ -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
-