wez Sat Dec 6 10:16:17 2003 EDT
Modified files:
/php-src/ext/standard config.w32
Log:
use quotes if the user specifies a path, but don't otherwise (since we don't want
the getenv calls quoted).
Index: php-src/ext/standard/config.w32
diff -u php-src/ext/standard/config.w32:1.1 php-src/ext/standard/config.w32:1.2
--- php-src/ext/standard/config.w32:1.1 Tue Dec 2 18:16:58 2003
+++ php-src/ext/standard/config.w32 Sat Dec 6 10:16:17 2003
@@ -1,5 +1,5 @@
// vim:ft=javascript
-// $Id: config.w32,v 1.1 2003/12/02 23:16:58 wez Exp $
+// $Id: config.w32,v 1.2 2003/12/06 15:16:17 wez Exp $
ARG_WITH("config-file-scan-dir", "Dir to check for additional php ini files", "");
AC_DEFINE("PHP_CONFIG_FILE_SCAN_DIR", PHP_CONFIG_FILE_SCAN_DIR);
@@ -7,7 +7,11 @@
ARG_WITH("config-file-path", "Where to find php.ini",
'(getenv("SystemRoot"))?getenv("SystemRoot"):""');
-AC_DEFINE("PHP_CONFIG_FILE_PATH", PHP_CONFIG_FILE_PATH, null, false);
+if (PHP_CONFIG_FILE_PATH == null) {
+ AC_DEFINE("PHP_CONFIG_FILE_PATH", PHP_CONFIG_FILE_PATH, null, false);
+} else {
+ AC_DEFINE("PHP_CONFIG_FILE_PATH", PHP_CONFIG_FILE_PATH);
+}
EXTENSION("standard", "array.c base64.c basic_functions.c browscap.c \
crc32.c crypt.c cyr_convert.c datetime.c dir.c dl.c dns.c exec.c \
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
