Commit a5fc3a63 authored by Michał Kępień's avatar Michał Kępień

Clean up --with-tuning=large remnants

The change introduced by commit be159f55
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.
parent 86405d3b
Pipeline #34722 canceled with stages
in 42 minutes
......@@ -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)"
......
......@@ -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;
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment