MFH

diff --git a/Makefile.global b/Makefile.global
index dd7c2722d7d090abbf9528b0cc80371b84f0469b..8115f1e0309a7818f75a6e26bc5558fd446bafce 100644 (file)
--- a/Makefile.global
+++ b/Makefile.global
@@ -69,7 +69,7 @@ install-headers:
        
 install-su: install-pear
 
-PHP_TEST_SHARED_EXTENSIONS=`(for i in $(PHP_MODULES); do . $$i ; echo -n "-d extension=$$dlname "; done)`
+PHP_TEST_SHARED_EXTENSIONS=`(if test ! -z "$(PHP_MODULES)"; then for i in $(PHP_MODULES); do . $$i ; echo -n "-d extension=$$dlname "; done; fi;)`
 PHP_TEST_SETTINGS=-d 'open_basedir=' -d 'safe_mode=0' -d 'output_buffering=0' -d 'memory_limit=-1'
 
 test: all 
@@ -79,7 +79,12 @@ test: all
                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()) ? php_ini_loaded_file() : "no_ini_file";'` > $(top_builddir)/tmp-php.ini; \
+               INI_FILE=`$(top_builddir)/$(SAPI_CLI_PATH) -r 'echo php_ini_loaded_file();'`; \
+               if test -z "$(INI_FILE)"; then \
+                       echo "" > $(top_builddir)/tmp-php.ini; \
+               else \
+                       $(EGREP) -v '^extension[\t\ ]=' "$(INI_FILE)" > $(top_builddir)/tmp-php.ini; \
+               fi; \
                TEST_PHP_EXECUTABLE=$(top_builddir)/$(SAPI_CLI_PATH) \
                TEST_PHP_SRCDIR=$(top_srcdir) \
                CC="$(CC)" \