cvs: php-src(PHP_5_2) / Makefile.global
| From: | Jani Taskinen | Date: | Sat, 09 Jun 2007 12:06:53 +0000 |
| Subject: | cvs: php-src(PHP_5_2) / Makefile.global | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-44764@lists.php.net to get a copy of this message | ||
sniper Sat Jun 9 12:06:53 2007 UTC
Modified files: (Branch: PHP_5_2)
/php-src Makefile.global
Log:
- Fix special case of no ini file in use or not found
http://cvs.php.net/viewvc.cgi/php-src/Makefile.global?r1=1.57.2.5.2.4&r2=1.57.2.5.2.5&diff_format=u
Index: php-src/Makefile.global
diff -u php-src/Makefile.global:1.57.2.5.2.4 php-src/Makefile.global:1.57.2.5.2.5
--- php-src/Makefile.global:1.57.2.5.2.4 Sat Jun 9 11:53:12 2007
+++ php-src/Makefile.global Sat Jun 9 12:06:53 2007
@@ -79,7 +79,7 @@
CC="$(CC)" \
$(PHP_EXECUTABLE) $(PHP_TEST_SETTINGS) $(top_srcdir)/run-tests.php -d extension_dir=modules/
$(PHP_TEST_SHARED_EXTENSIONS) tests/; \
elif test ! -z "$(SAPI_CLI_PATH)" && test -x "$(SAPI_CLI_PATH)"; then
\
- $(EGREP) -v '^extension[\t\ ]='
$(top_builddir)/$(SAPI_CLI_PATH) -r 'echo
php_ini_loaded_file();' > $(top_builddir)/tmp-php.ini; \
+ $(EGREP) -v '^extension[\t\ ]=' $(top_builddir)/$(SAPI_CLI_PATH) -r 'echo
(php_ini_loaded_file()) ? php_ini_loaded_file() : "no_ini_file";' >
$(top_builddir)/tmp-php.ini; \
TEST_PHP_EXECUTABLE=$(top_builddir)/$(SAPI_CLI_PATH) \
TEST_PHP_SRCDIR=$(top_srcdir) \
CC="$(CC)" \