From: foobar <sniper@php.net>
Date: Wed, 19 Jan 2005 01:30:23 +0000 (+0000)
Subject: - Fixed bug #29136 (make test - libtool failure on MacOSX)
X-Git-Tag: RELEASE_0_2~250
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=91ea475f4da1ef997bbedba5dfbc3a974b9efb42;p=php

- Fixed bug #29136 (make test - libtool failure on MacOSX)
---

diff --git a/run-tests.php b/run-tests.php
index 6a66e013a0..e0bc14b3d9 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;