Commit beda680f authored by Evan Hunt's avatar Evan Hunt

minor cosmetic fixes

- the configuration summary reported zlib compression was not
  supported even when it was.
- when bind.keys.h was regenerated it violated clang-format style.
parent 9a537205
Pipeline #35037 passed with stages
in 32 minutes and 50 seconds
......@@ -18272,6 +18272,8 @@ fi ;; #(
as_fn_error $? "Specifying zlib installation path is not supported, adjust PKG_CONFIG_PATH instead" "$LINENO" 5 ;;
esac
#
# In solaris 10, SMF can manage named service
#
......@@ -26010,8 +26012,8 @@ report() {
echo "Configuration summary:"
echo "-------------------------------------------------------------------------------"
echo "Optional features enabled:"
if test "yes" = "$enable_full_report" -o "standard" = "$locktype"; then
echo " Mutex lock type: $locktype"
if test "yes" = "$enable_full_report" -o "standard" = "$with_locktype"; then
echo " Mutex lock type: $with_locktype"
fi
test "small" = "$with_tuning" && echo " Small-system tuning (--with-tuning)"
test "no" = "$use_dnstap" || \
......@@ -26025,7 +26027,7 @@ report() {
test "X$PYTHON" = "X" || echo " Python tools (--with-python)"
test "X$LIBXML2_LIBS" = "X" || echo " XML statistics (--with-libxml2)"
test "X$JSON_C_LIBS" = "X" || echo " JSON statistics (--with-json-c): $JSON_C_CFLAGS $JSON_C_LIBS"
test "X$ZLIB" = "X" || echo " HTTP zlib compression (--with-zlib)"
test "X$ZLIB_LIBS" = "X" || echo " HTTP zlib compression (--with-zlib)"
test "X$NZD_TOOLS" = "X" || echo " LMDB database to store configuration for 'addzone' zones (--with-lmdb)"
test "no" = "$with_libidn2" || echo " IDN support (--with-libidn2)"
fi
......@@ -26103,7 +26105,7 @@ report() {
test "X$PYTHON" = "X" && echo " Python tools (--with-python)"
test "X$LIBXML2_LIBS" = "X" && echo " XML statistics (--with-libxml2)"
test "X$JSON_C_LIBS" = "X" && echo " JSON statistics (--with-json-c)"
test "X$ZLIB" = "X" && echo " HTTP zlib compression (--with-zlib)"
test "X$ZLIB_LIBS" = "X" && echo " HTTP zlib compression (--with-zlib)"
test "X$NZD_TOOLS" = "X" && echo " LMDB database to store configuration for 'addzone' zones (--with-lmdb)"
test "no" = "$with_libidn2" && echo " IDN support (--with-libidn2)"
......
......@@ -1328,6 +1328,8 @@ AS_CASE([$with_zlib],
[yes],[PKG_CHECK_MODULES([ZLIB], [zlib],
[AC_DEFINE([HAVE_ZLIB], [1], [Use zlib library])])],
[AC_MSG_ERROR([Specifying zlib installation path is not supported, adjust PKG_CONFIG_PATH instead])])
AC_SUBST([ZLIB_CFLAGS])
AC_SUBST([ZLIB_LIBS])
#
# In solaris 10, SMF can manage named service
......@@ -2914,8 +2916,8 @@ report() {
echo "Configuration summary:"
echo "-------------------------------------------------------------------------------"
echo "Optional features enabled:"
if test "yes" = "$enable_full_report" -o "standard" = "$locktype"; then
echo " Mutex lock type: $locktype"
if test "yes" = "$enable_full_report" -o "standard" = "$with_locktype"; then
echo " Mutex lock type: $with_locktype"
fi
test "small" = "$with_tuning" && echo " Small-system tuning (--with-tuning)"
test "no" = "$use_dnstap" || \
......@@ -2929,7 +2931,7 @@ report() {
test "X$PYTHON" = "X" || echo " Python tools (--with-python)"
test "X$LIBXML2_LIBS" = "X" || echo " XML statistics (--with-libxml2)"
test "X$JSON_C_LIBS" = "X" || echo " JSON statistics (--with-json-c): $JSON_C_CFLAGS $JSON_C_LIBS"
test "X$ZLIB" = "X" || echo " HTTP zlib compression (--with-zlib)"
test "X$ZLIB_LIBS" = "X" || echo " HTTP zlib compression (--with-zlib)"
test "X$NZD_TOOLS" = "X" || echo " LMDB database to store configuration for 'addzone' zones (--with-lmdb)"
test "no" = "$with_libidn2" || echo " IDN support (--with-libidn2)"
fi
......@@ -3007,7 +3009,7 @@ report() {
test "X$PYTHON" = "X" && echo " Python tools (--with-python)"
test "X$LIBXML2_LIBS" = "X" && echo " XML statistics (--with-libxml2)"
test "X$JSON_C_LIBS" = "X" && echo " JSON statistics (--with-json-c)"
test "X$ZLIB" = "X" && echo " HTTP zlib compression (--with-zlib)"
test "X$ZLIB_LIBS" = "X" && echo " HTTP zlib compression (--with-zlib)"
test "X$NZD_TOOLS" = "X" && echo " LMDB database to store configuration for 'addzone' zones (--with-lmdb)"
test "no" = "$with_libidn2" && echo " IDN support (--with-libidn2)"
......
......@@ -23,7 +23,7 @@ while (<>) {
$lines .= $_ . "\n";
}
my $mkey = '#define TRUST_ANCHORS "\\' . "\n" . $lines . "\"\n";
my $mkey = "#define TRUST_ANCHORS \\\n\t\"\\\n" . $lines . "\"\n";
print "#ifndef BIND_KEYS_H\n";
print "#define BIND_KEYS_H 1\n";
......
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