cvs: php-src / run-tests.php

sniper Tue Jan 18 20:30:24 2005 EDT Modified files: /php-src run-tests.php Log: - Fixed bug #29136 (make test - libtool failure on MacOSX) http://cvs.php.net/diff.php/php-src/run-tests.php?r1=1.200&r2=1.201&ty=u Index: php-src/run-tests.php diff -u php-src/run-tests.php:1.200 php-src/run-tests.php:1.201 --- php-src/run-tests.php:1.200 Thu Dec 16 07:34:25 2004 +++ php-src/run-tests.php Tue Jan 18 20:30:23 2005 @@ -485,7 +485,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;