sniper Tue Jan 18 20:30:35 2005 EDT
Modified files: (Branch: PHP_5_0)
/php-src run-tests.php
Log:
MFH: - Fixed bug #29136 (make test - libtool failure on MacOSX)
http://cvs.php.net/diff.php/php-src/run-tests.php?r1=1.195.2.3&r2=1.195.2.4&ty=u
Index: php-src/run-tests.php
diff -u php-src/run-tests.php:1.195.2.3 php-src/run-tests.php:1.195.2.4
--- php-src/run-tests.php:1.195.2.3 Thu Dec 16 07:35:37 2004
+++ php-src/run-tests.php Tue Jan 18 20:30:34 2005
@@ -476,7 +476,11 @@
$autoconf = shell_exec('autoconf --version');
/* Always use the generated libtool - Mac OSX uses
'glibtool' */
$libtool = shell_exec($_SERVER['PWD'] . '/libtool
--version');
- $sys_libtool = shell_exec('libtool --version');
+
+ /* Use shtool to find out if there is glibtool present
(MacOSX) */
+ $sys_libtool_path =
shell_exec("{$_SERVER['PWD']}/build/shtool path glibtool libtool");
+ $sys_libtool = shell_exec(str_replace("\n", "",
$sys_libtool_path) . ' --version');
+
/* Try the most common flags for 'version' */
$flags = array('-v', '-V', '--version');
$cc_status=0;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
