From 901419d028ef11309bd01c6ca5afa48a5e53551e Mon Sep 17 00:00:00 2001 From: Jon Parise Date: Mon, 4 Jul 2005 20:37:07 +0000 Subject: [PATCH] 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. --- run-tests.php | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/run-tests.php b/run-tests.php index 3ec57e78c7..04d25a5506 100755 --- a/run-tests.php +++ b/run-tests.php @@ -506,8 +506,14 @@ if (!getenv('NO_INTERACTION')) { $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'); -- 2.50.1