[master] fix libjson test, add summary details

diff --git a/configure b/configure
index 2e7ddd777114e66371aafa2c3da5efeef1d3126c..7d9473604fd1490a7cc34a61db4d1c50c50d4a44 100755 (executable)
--- a/configure
+++ b/configure
@@ -16026,7 +16026,7 @@ else
 fi
 
 
-have_libjson=
+have_libjson=""
 case "$use_libjson" in
        no)
                libjson_libs=""
@@ -18048,12 +18048,12 @@ fi
 
 done
 
-                for ac_header in linux/capability.h sys/capability.h
+               for ac_header in linux/capability.h sys/capability.h
 do :
   as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
 ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "#ifdef HAVE_LINUX_TYPES_H
-                                  #include <linux/types.h>
-                                  #endif
+                                 #include <linux/types.h>
+                                 #endif
 
 "
 if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
@@ -23323,13 +23323,16 @@ test "$use_pkcs11" = "no" || echo "    PKCS#11/Cryptoki support (--with-pks11)"
 # these lines are only printed if run with --enable-full-report
 if test "$enable_full_report" = "yes"; then
     test "$enable_ipv6" = "no" -o "$found_ipv6" = "no" || \
-        echo "    IPv6 support"
-    test "X$USE_OPENSSL" = "X" || echo "    OpenSSL cryptography/DNSSEC"
-    test "$OPENSSL_GOST" != "yes" || echo "    GOST algorithm support"
-    test "$OPENSSL_ECDSA" != "yes" || echo "    ECDSA algorithm support"
-    test "X$PYTHON" = "X" || echo "    Python tools"
-    test "X$libxml2_libs" = "X" || echo "    XML statistics"
-    test "X$libjson_libs" = "X" || echo "    JSON statistics"
+        echo "    IPv6 support (--enable-ipv6)"
+    test "X$USE_OPENSSL" = "X" || \
+            echo "    OpenSSL cryptography/DNSSEC (--with-openssl)"
+    test "$OPENSSL_GOST" != "yes" || \
+            echo "    GOST algorithm support (--with-gost)"
+    test "$OPENSSL_ECDSA" != "yes" || \
+            echo "    ECDSA algorithm support (--with-ecdsa)"
+    test "X$PYTHON" = "X" || echo "    Python tools (--with-python)"
+    test "X$libxml2_libs" = "X" || echo "    XML statistics (--with-libxml2)"
+    test "X$have_libjson" = "X" || echo "    JSON statistics (--with-libjson)"
 fi
 
 echo "    Dynamically loadable zone (DLZ) drivers:"
@@ -23363,15 +23366,17 @@ test "$want_backtrace" = "yes" || \
     echo "    Print backtrace on crash (--enable-backtrace)"
 test "$use_pkcs11" = "no" && echo "    PKCS#11/Cryptoki support (--with-pks11)"
 
-test "$enable_ipv6" = "no" -o "$found_ipv6" = "no" && echo "    IPv6 support"
-test "X$USE_OPENSSL" = "X" && echo "    OpenSSL cryptography/DNSSEC"
+test "$enable_ipv6" = "no" -o "$found_ipv6" = "no" && \
+        echo "    IPv6 support (--enable-ipv6)"
+test "X$USE_OPENSSL" = "X" && \
+        echo "    OpenSSL cryptography/DNSSEC (--with-openssl)"
 test "X$USE_OPENSSL" != "X" -a "$OPENSSL_GOST" != "yes" && \
-    echo "    GOST algorithm support"
+    echo "    GOST algorithm support (--with-gost)"
 test "X$USE_OPENSSL" != "X" -a "$OPENSSL_ECDSA" != "yes" && \
-    echo "    ECDSA algorithm support"
-test "X$PYTHON" = "X" && echo "    Python tools"
-test "X$libxml2_libs" = "X" && echo "    XML statistics"
-test "X$libjson_libs" = "X" && echo "    JSON statistics"
+    echo "    ECDSA algorithm support (--with-ecdsa)"
+test "X$PYTHON" = "X" && echo "    Python tools (--with-python)"
+test "X$libxml2_libs" = "X" && echo "    XML statistics (--with-libxml2)"
+test "X$have_libjson" = "X" && echo "    JSON statistics (--with-libjson)"
 
 echo "========================================================================"
 

diff --git a/configure.in b/configure.in
index c32a5b9adff78bf618f23b3bc222d18fa0a559ea..ee71941c5dcc6163a010d9fbbc4f9591412d819b 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1502,7 +1502,7 @@ AC_ARG_WITH(libjson,
 [  --with-libjson[=PATH]     Build with libjson0 library [yes|no|path]],
     use_libjson="$withval", use_libjson="auto")
 
-have_libjson=
+have_libjson=""
 case "$use_libjson" in
        no)
                libjson_libs=""
@@ -3930,13 +3930,16 @@ test "$use_pkcs11" = "no" || echo "    PKCS#11/Cryptoki support (--with-pks11)"
 # these lines are only printed if run with --enable-full-report 
 if test "$enable_full_report" = "yes"; then
     test "$enable_ipv6" = "no" -o "$found_ipv6" = "no" || \
-        echo "    IPv6 support"
-    test "X$USE_OPENSSL" = "X" || echo "    OpenSSL cryptography/DNSSEC"
-    test "$OPENSSL_GOST" != "yes" || echo "    GOST algorithm support"
-    test "$OPENSSL_ECDSA" != "yes" || echo "    ECDSA algorithm support"
-    test "X$PYTHON" = "X" || echo "    Python tools"
-    test "X$libxml2_libs" = "X" || echo "    XML statistics"
-    test "X$libjson_libs" = "X" || echo "    JSON statistics"
+        echo "    IPv6 support (--enable-ipv6)"
+    test "X$USE_OPENSSL" = "X" || \
+            echo "    OpenSSL cryptography/DNSSEC (--with-openssl)"
+    test "$OPENSSL_GOST" != "yes" || \
+            echo "    GOST algorithm support (--with-gost)"
+    test "$OPENSSL_ECDSA" != "yes" || \
+            echo "    ECDSA algorithm support (--with-ecdsa)"
+    test "X$PYTHON" = "X" || echo "    Python tools (--with-python)"
+    test "X$libxml2_libs" = "X" || echo "    XML statistics (--with-libxml2)"
+    test "X$have_libjson" = "X" || echo "    JSON statistics (--with-libjson)"
 fi
 
 echo "    Dynamically loadable zone (DLZ) drivers:"
@@ -3970,15 +3973,17 @@ test "$want_backtrace" = "yes" || \
     echo "    Print backtrace on crash (--enable-backtrace)"
 test "$use_pkcs11" = "no" && echo "    PKCS#11/Cryptoki support (--with-pks11)"
 
-test "$enable_ipv6" = "no" -o "$found_ipv6" = "no" && echo "    IPv6 support"
-test "X$USE_OPENSSL" = "X" && echo "    OpenSSL cryptography/DNSSEC"
+test "$enable_ipv6" = "no" -o "$found_ipv6" = "no" && \
+        echo "    IPv6 support (--enable-ipv6)"
+test "X$USE_OPENSSL" = "X" && \
+        echo "    OpenSSL cryptography/DNSSEC (--with-openssl)"
 test "X$USE_OPENSSL" != "X" -a "$OPENSSL_GOST" != "yes" && \
-    echo "    GOST algorithm support"
+    echo "    GOST algorithm support (--with-gost)"
 test "X$USE_OPENSSL" != "X" -a "$OPENSSL_ECDSA" != "yes" && \
-    echo "    ECDSA algorithm support"
-test "X$PYTHON" = "X" && echo "    Python tools"
-test "X$libxml2_libs" = "X" && echo "    XML statistics"
-test "X$libjson_libs" = "X" && echo "    JSON statistics"
+    echo "    ECDSA algorithm support (--with-ecdsa)"
+test "X$PYTHON" = "X" && echo "    Python tools (--with-python)"
+test "X$libxml2_libs" = "X" && echo "    XML statistics (--with-libxml2)"
+test "X$have_libjson" = "X" && echo "    JSON statistics (--with-libjson)"
 
 echo "========================================================================"