Commit d94e2244 authored by Evan Hunt's avatar Evan Hunt

[master] fix libjson test, add summary details

parent 09fec186
...@@ -16026,7 +16026,7 @@ else ...@@ -16026,7 +16026,7 @@ else
fi fi
have_libjson= have_libjson=""
case "$use_libjson" in case "$use_libjson" in
no) no)
libjson_libs="" libjson_libs=""
...@@ -18048,12 +18048,12 @@ fi ...@@ -18048,12 +18048,12 @@ fi
done done
for ac_header in linux/capability.h sys/capability.h for ac_header in linux/capability.h sys/capability.h
do : do :
as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` 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 ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "#ifdef HAVE_LINUX_TYPES_H
#include <linux/types.h> #include <linux/types.h>
#endif #endif
" "
if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : 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)" ...@@ -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 # these lines are only printed if run with --enable-full-report
if test "$enable_full_report" = "yes"; then if test "$enable_full_report" = "yes"; then
test "$enable_ipv6" = "no" -o "$found_ipv6" = "no" || \ test "$enable_ipv6" = "no" -o "$found_ipv6" = "no" || \
echo " IPv6 support" echo " IPv6 support (--enable-ipv6)"
test "X$USE_OPENSSL" = "X" || echo " OpenSSL cryptography/DNSSEC" test "X$USE_OPENSSL" = "X" || \
test "$OPENSSL_GOST" != "yes" || echo " GOST algorithm support" echo " OpenSSL cryptography/DNSSEC (--with-openssl)"
test "$OPENSSL_ECDSA" != "yes" || echo " ECDSA algorithm support" test "$OPENSSL_GOST" != "yes" || \
test "X$PYTHON" = "X" || echo " Python tools" echo " GOST algorithm support (--with-gost)"
test "X$libxml2_libs" = "X" || echo " XML statistics" test "$OPENSSL_ECDSA" != "yes" || \
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)"
fi fi
echo " Dynamically loadable zone (DLZ) drivers:" echo " Dynamically loadable zone (DLZ) drivers:"
...@@ -23363,15 +23366,17 @@ test "$want_backtrace" = "yes" || \ ...@@ -23363,15 +23366,17 @@ test "$want_backtrace" = "yes" || \
echo " Print backtrace on crash (--enable-backtrace)" echo " Print backtrace on crash (--enable-backtrace)"
test "$use_pkcs11" = "no" && echo " PKCS#11/Cryptoki support (--with-pks11)" test "$use_pkcs11" = "no" && echo " PKCS#11/Cryptoki support (--with-pks11)"
test "$enable_ipv6" = "no" -o "$found_ipv6" = "no" && echo " IPv6 support" test "$enable_ipv6" = "no" -o "$found_ipv6" = "no" && \
test "X$USE_OPENSSL" = "X" && echo " OpenSSL cryptography/DNSSEC" 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" && \ 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" && \ test "X$USE_OPENSSL" != "X" -a "$OPENSSL_ECDSA" != "yes" && \
echo " ECDSA algorithm support" echo " ECDSA algorithm support (--with-ecdsa)"
test "X$PYTHON" = "X" && echo " Python tools" test "X$PYTHON" = "X" && echo " Python tools (--with-python)"
test "X$libxml2_libs" = "X" && echo " XML statistics" test "X$libxml2_libs" = "X" && echo " XML statistics (--with-libxml2)"
test "X$libjson_libs" = "X" && echo " JSON statistics" test "X$have_libjson" = "X" && echo " JSON statistics (--with-libjson)"
echo "========================================================================" echo "========================================================================"
......
...@@ -1502,7 +1502,7 @@ AC_ARG_WITH(libjson, ...@@ -1502,7 +1502,7 @@ AC_ARG_WITH(libjson,
[ --with-libjson[=PATH] Build with libjson0 library [yes|no|path]], [ --with-libjson[=PATH] Build with libjson0 library [yes|no|path]],
use_libjson="$withval", use_libjson="auto") use_libjson="$withval", use_libjson="auto")
have_libjson= have_libjson=""
case "$use_libjson" in case "$use_libjson" in
no) no)
libjson_libs="" libjson_libs=""
...@@ -3930,13 +3930,16 @@ test "$use_pkcs11" = "no" || echo " PKCS#11/Cryptoki support (--with-pks11)" ...@@ -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 # these lines are only printed if run with --enable-full-report
if test "$enable_full_report" = "yes"; then if test "$enable_full_report" = "yes"; then
test "$enable_ipv6" = "no" -o "$found_ipv6" = "no" || \ test "$enable_ipv6" = "no" -o "$found_ipv6" = "no" || \
echo " IPv6 support" echo " IPv6 support (--enable-ipv6)"
test "X$USE_OPENSSL" = "X" || echo " OpenSSL cryptography/DNSSEC" test "X$USE_OPENSSL" = "X" || \
test "$OPENSSL_GOST" != "yes" || echo " GOST algorithm support" echo " OpenSSL cryptography/DNSSEC (--with-openssl)"
test "$OPENSSL_ECDSA" != "yes" || echo " ECDSA algorithm support" test "$OPENSSL_GOST" != "yes" || \
test "X$PYTHON" = "X" || echo " Python tools" echo " GOST algorithm support (--with-gost)"
test "X$libxml2_libs" = "X" || echo " XML statistics" test "$OPENSSL_ECDSA" != "yes" || \
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)"
fi fi
echo " Dynamically loadable zone (DLZ) drivers:" echo " Dynamically loadable zone (DLZ) drivers:"
...@@ -3970,15 +3973,17 @@ test "$want_backtrace" = "yes" || \ ...@@ -3970,15 +3973,17 @@ test "$want_backtrace" = "yes" || \
echo " Print backtrace on crash (--enable-backtrace)" echo " Print backtrace on crash (--enable-backtrace)"
test "$use_pkcs11" = "no" && echo " PKCS#11/Cryptoki support (--with-pks11)" test "$use_pkcs11" = "no" && echo " PKCS#11/Cryptoki support (--with-pks11)"
test "$enable_ipv6" = "no" -o "$found_ipv6" = "no" && echo " IPv6 support" test "$enable_ipv6" = "no" -o "$found_ipv6" = "no" && \
test "X$USE_OPENSSL" = "X" && echo " OpenSSL cryptography/DNSSEC" 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" && \ 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" && \ test "X$USE_OPENSSL" != "X" -a "$OPENSSL_ECDSA" != "yes" && \
echo " ECDSA algorithm support" echo " ECDSA algorithm support (--with-ecdsa)"
test "X$PYTHON" = "X" && echo " Python tools" test "X$PYTHON" = "X" && echo " Python tools (--with-python)"
test "X$libxml2_libs" = "X" && echo " XML statistics" test "X$libxml2_libs" = "X" && echo " XML statistics (--with-libxml2)"
test "X$libjson_libs" = "X" && echo " JSON statistics" test "X$have_libjson" = "X" && echo " JSON statistics (--with-libjson)"
echo "========================================================================" echo "========================================================================"
......
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