put the -d extension loading options in the right place,

get rid of basename

diff --git a/Makefile.global b/Makefile.global
index d4a92a2e278cccdc18589a80649f48afa45d1b13..62d4a61b1f0b9b8ea49f98c4a208d7bb239daf39 100644 (file)
--- a/Makefile.global
+++ b/Makefile.global
@@ -47,12 +47,12 @@ install-modules: build-modules
 
 install-su: install-pear
 
-test: 
+test: all 
        -@if test ! -z $(PHP_EXECUTABLE) && test -x $(PHP_EXECUTABLE); then \
                TEST_PHP_EXECUTABLE=$(PHP_EXECUTABLE) \
                TEST_PHP_SRCDIR=$(top_srcdir) \
                CC="$(CC)" \
-                       $(PHP_EXECUTABLE) -d 'extension_dir=modules/' -d 'extension='`basename $(PHP_MODULES) .la`'.so' -d 'open_basedir=' -d 'safe_mode=0' -d 'output_buffering=0' -d 'memory_limit=-1' $(top_srcdir)/run-tests.php tests/; \
+                       $(PHP_EXECUTABLE) -d 'open_basedir=' -d 'safe_mode=0' -d 'output_buffering=0' -d 'memory_limit=-1' $(top_srcdir)/run-tests.php -d 'extension_dir=modules/' -d `( . $(PHP_MODULES) ; echo extension=$$dlname)` tests/; \
        elif test ! -z $(SAPI_CLI_PATH) && test -x $(SAPI_CLI_PATH); then \
                TEST_PHP_EXECUTABLE=$(top_builddir)/$(SAPI_CLI_PATH) \
                TEST_PHP_SRCDIR=$(top_srcdir) \