iliaa Tue Dec 23 13:20:47 2003 EDT
Modified files:
/php-src run-tests.php
Log:
Properly detect bundled libtool when PHP is built in a separate directory.
Detect version of system libtool, which is used by phpize.
Index: php-src/run-tests.php
diff -u php-src/run-tests.php:1.183 php-src/run-tests.php:1.184
--- php-src/run-tests.php:1.183 Tue Dec 16 10:00:24 2003
+++ php-src/run-tests.php Tue Dec 23 13:20:46 2003
@@ -454,13 +454,14 @@
$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 @@
}
$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";
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
