Disable auto extras when TEST_BUILD_MODULES is set in test-build.

diff --git a/tools/test-build b/tools/test-build
index 978b60bc1c1cbfd0527a91e9ab75e823eccc86ac..48988b687120ca5fbee2289bb9dc8ac9576b6b2e 100755 (executable)
--- a/tools/test-build
+++ b/tools/test-build
@@ -55,8 +55,12 @@ foreach my $compiler (@compilers) {
        push @socketengines, 'poll' if test_header $compiler, 'poll.h';
        foreach my $socketengine (@socketengines) {
                say "Attempting to build using the $compiler compiler and the $socketengine socket engine...";
-               system './configure', '--enable-extras', $ENV{TEST_BUILD_MODULES} if defined $ENV{TEST_BUILD_MODULES};
-               if (system './configure', '--development', '--socketengine', $socketengine) {
+               my @configure_flags;
+               if (defined $ENV{TEST_BUILD_MODULES}) {
+                       system './configure', '--enable-extras', $ENV{TEST_BUILD_MODULES};
+                       push @configure_flags, '--disable-auto-extras';
+               }
+               if (system './configure', '--development', '--socketengine', $socketengine, @configure_flags) {
                        say "Failed to configure using the $compiler compiler and the $socketengine socket engine!";
                        exit 1;
                }