diff options
| author | Ilia Alshanetsky <iliaa@php.net> | 2003-12-23 18:20:46 +0000 |
|---|---|---|
| committer | Ilia Alshanetsky <iliaa@php.net> | 2003-12-23 18:20:46 +0000 |
| commit | bdc30961d0765a4b5b9e1d52e294d869b9d1b22b (patch) | |
| tree | 4d8120ff726354e162bee3a7f7d4f7c20bd19912 /run-tests.php | |
| parent | 20d64aa24eeb24b88693ef12a9b394e2ec5d7157 (diff) | |
| download | php-git-bdc30961d0765a4b5b9e1d52e294d869b9d1b22b.tar.gz | |
Properly detect bundled libtool when PHP is built in a separate directory.
Detect version of system libtool, which is used by phpize.
Diffstat (limited to 'run-tests.php')
| -rwxr-xr-x | run-tests.php | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/run-tests.php b/run-tests.php index 1370614ac3..55b4528e24 100755 --- a/run-tests.php +++ b/run-tests.php @@ -454,13 +454,14 @@ if (!getenv('NO_INTERACTION')) { $failed_tests_data .= "\n" . $sep . 'BUILD ENVIRONMENT' . $sep; $failed_tests_data .= "OS:\n" . PHP_OS . " - " . php_uname() . "\n\n"; - $ldd = $automake = $autoconf = $libtool = $compiler = 'N/A'; + $ldd = $automake = $autoconf = $sys_libtool = $libtool = $compiler = 'N/A'; if (substr(PHP_OS, 0, 3) != "WIN") { $automake = shell_exec('automake --version'); $autoconf = shell_exec('autoconf --version'); /* Always use the generated libtool - Mac OSX uses 'glibtool' */ - $libtool = shell_exec('./libtool --version'); + $libtool = shell_exec($_SERVER['PWD'] . '/libtool --version'); + $sys_libtool = shell_exec('libtool --version'); /* Try the most common flags for 'version' */ $flags = array('-v', '-V', '--version'); $cc_status=0; @@ -475,7 +476,8 @@ if (!getenv('NO_INTERACTION')) { } $failed_tests_data .= "Automake:\n$automake\n"; $failed_tests_data .= "Autoconf:\n$autoconf\n"; - $failed_tests_data .= "Libtool:\n$libtool\n"; + $failed_tests_data .= "Bundled Libtool:\n$libtool\n"; + $failed_tests_data .= "System Libtool:\n$sys_libtool\n"; $failed_tests_data .= "Compiler:\n$compiler\n"; $failed_tests_data .= "Bison:\n". @shell_exec('bison --version'). "\n"; $failed_tests_data .= "Libraries:\n$ldd\n"; |