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.

diff --git a/configure b/configure
index bf6137bf16930ecf711bd03c8be2920551216fa7..efd5fdf703fcbef80e82a1550bc218df861c9035 100755 (executable)
--- a/configure
+++ b/configure
@@ -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)"
 

diff --git a/configure.ac b/configure.ac
index 6e9aa407592803923fffd5cc24fb51ffa09df2f2..674e0de43c28eba4044b0c1310f8607ff6db41f3 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -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)"
 

diff --git a/util/bindkeys.pl b/util/bindkeys.pl
index 633b2d3d9f7ab3c96462d088ec3f0256118e14ff..55d6cb2cc9f65947771583f587647bb027194c7a 100755 (executable)
--- a/util/bindkeys.pl
+++ b/util/bindkeys.pl
@@ -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";