Clean up --with-tuning=large remnants

The change introduced by commit be159f556568abb9a5dbc494f8441eefdd304a7f
was not fully complete.  Adjust ./configure summary so that it reflects
the new way the --with-tuning switch works, fixing the Autoconf variable
used for determining the value of that switch.  Fix win32utils/Configure
so that it behaves the same way as its Unix counterpart.

diff --git a/configure.ac b/configure.ac
index c4df46715468127b91447b9d42db111b37f53565..acc31a3b9a4790e53ebdc367fdfbf84f684f0d66 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -2915,7 +2915,7 @@ report() {
     if test "yes" = "$enable_full_report" -o "standard" = "$locktype"; then
        echo "        Mutex lock type: $locktype"
     fi
-    test "large" = "$use_tuning" && echo "    Large-system tuning (--with-tuning)"
+    test "small" = "$with_tuning" && echo "    Small-system tuning (--with-tuning)"
     test "no" = "$use_dnstap" || \
            echo "    Allow 'dnstap' packet logging (--enable-dnstap)"
     test -z "$MAXMINDDB_LIBS" || echo "    GeoIP2 access control (--enable-geoip)"
@@ -2975,7 +2975,7 @@ report() {
 
     echo "Features disabled or unavailable on this platform:"
     test "no" = "$found_ipv6" && echo "    IPv6 support (--enable-ipv6)"
-    test "large" = "$use_tuning" || echo "    Large-system tuning (--with-tuning)"
+    test "small" = "$with_tuning" || echo "    Small-system tuning (--with-tuning)"
 
     test "no" = "$use_dnstap" && \
            echo "    Allow 'dnstap' packet logging (--enable-dnstap)"

diff --git a/win32utils/Configure b/win32utils/Configure
index 137f8beaf12bdaf1416c1cd61c962d8e4ad45587..6bd8ce4fed6234781f65aadc48a482fec73224f4 100644 (file)
--- a/win32utils/Configure
+++ b/win32utils/Configure
@@ -438,7 +438,7 @@ my @help = (
 "  with-iconv[=PATH]     path of the iconv DLL [default=same than idn]\n",
 "  with-zlib[=PATH]      build with zlib library yes|no|path\n",
 "  with-vcredist[=PATH]  visual C++ redistributable package yes|path\n",
-"  with-tuning=OPTION    tune for platform size (large|default)\n",
+"  with-tuning=OPTION    tune for platform size (small|default)\n",
 "  with-cross-compile    32 / 64 bit build / host platforms\n",
 "\nOptional Visual Studio project parameters:\n",
 "  with-tools-version=VERSION     set the ToolsVersion attribute to VERSION\n",
@@ -856,8 +856,8 @@ sub mywith {
             $cross_compile = "yes";
         }
     } elsif ($key =~ /^tuning$/i) {
-        if ($val =~ /^large$/i) {
-            $tuning = "large";
+        if ($val =~ /^small$/i) {
+            $tuning = "small";
         }
     } elsif ($key =~ /^tools-version$/i) {
         $configvar{"TOOLS_VERSION"} = $val;
@@ -2127,7 +2127,7 @@ if (!grep { -f and -x } $vcredist_path) {
 }
 
 # tuning
-if ($tuning eq "large") {
+if ($tuning ne "small") {
     $configdefh{"TUNE_LARGE"} = 1;
 }