summaryrefslogtreecommitdiff
path: root/run-tests.php
diff options
context:
space:
mode:
authorfoobar <sniper@php.net>2005-01-19 01:30:23 (GMT)
committerfoobar <sniper@php.net>2005-01-19 01:30:23 (GMT)
commit91ea475f4da1ef997bbedba5dfbc3a974b9efb42 (patch)
tree536ff0f575508c495f89ecd63bf97b8321e30bef /run-tests.php
parent434d068994922902a4a30b1735d1deabf6e51dd0 (diff)
downloadphp-91ea475f4da1ef997bbedba5dfbc3a974b9efb42.tar.gz
- Fixed bug #29136 (make test - libtool failure on MacOSX)
Diffstat (limited to 'run-tests.php')
-rwxr-xr-xrun-tests.php6
1 files changed, 5 insertions, 1 deletions
diff --git a/run-tests.php b/run-tests.php
index 6a66e01..e0bc14b 100755
--- a/run-tests.php
+++ b/run-tests.php
@@ -485,7 +485,11 @@ if (!getenv('NO_INTERACTION')) {
$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;