cvs: php-src / Makefile.global

hholzgra Mon Aug 8 13:49:32 2005 EDT Modified files: /php-src Makefile.global Log: put the -d extension loading options in the right place, get rid of basename http://cvs.php.net/diff.php/php-src/Makefile.global?r1=1.56&r2=1.57&ty=u Index: php-src/Makefile.global diff -u php-src/Makefile.global:1.56 php-src/Makefile.global:1.57 --- php-src/Makefile.global:1.56 Mon Aug 8 12:06:47 2005 +++ php-src/Makefile.global Mon Aug 8 13:49:32 2005 @@ -47,12 +47,12 @@ 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) \