jon Mon Jul 4 16:37:08 2005 EDT
Modified files:
/php-src run-tests.php
Log:
If the PHP_AUTOCONF and PHP_AUTOMAKE environmental variables are set, use
them when describing the build environment.
Support for these variables was originally added to build/build2.mk:1.36.
As a side note, the build system uses PHP_AUTOHEADER. Perhaps it should
be listed on its own in the build environment for completeness, despite it
being a component of the autoconf package.
http://cvs.php.net/diff.php/php-src/run-tests.php?r1=1.215&r2=1.216&ty=u
Index: php-src/run-tests.php
diff -u php-src/run-tests.php:1.215 php-src/run-tests.php:1.216
--- php-src/run-tests.php:1.215 Mon Jun 20 03:26:46 2005
+++ php-src/run-tests.php Mon Jul 4 16:37:07 2005
@@ -506,8 +506,14 @@
$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');
+ /* Determine the names of the autotools executables. */
+ $automake = (!empty($_ENV['PHP_AUTOMAKE'])) ?
$_ENV['PHP_AUTOMAKE'] : 'automake';
+ $autoconf = (!empty($_ENV['PHP_AUTOCONF'])) ?
$_ENV['PHP_AUTOCONF'] : 'autoconf';
+
+ /* Extract the tools' versions (overwriting our local
variables). */
+ $automake = shell_exec("$automake --version");
+ $autoconf = shell_exec("$autoconf --version");
+
/* Always use the generated libtool - Mac OSX uses
'glibtool' */
$libtool = shell_exec($CUR_DIR . '/libtool --version');
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
