mir/bind
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/bind9 synced 2025-08-31 06:25:31 +00:00
Code Issues Releases Wiki Activity

Print the libuv, liburcu and OpenSSL versions from configure script

Browse Source 
The configure summary now prints versions of the mandatory libraries
found when configuring.
This commit is contained in:
Ondřej Surý
2023-06-01 13:38:42 +02:00
parent 8169a0ee31
commit 920dddb729
2 changed files with 18 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
configure.ac
View File

@@ -623,6 +623,8 @@ PKG_CHECK_MODULES([LIBUV], [libuv >= 1.37.0], [],
[PKG_CHECK_MODULES([LIBUV], [libuv >= 1.34.0 libuv < 1.35.0], [],
[AC_MSG_ERROR([libuv >= 1.34.0 (except 1.35.0 and 1.36.0) not found])])])
PKG_CHECK_VERSION([LIBUV_VERSION], [libuv])
AX_SAVE_FLAGS([libuv])
CFLAGS="$CFLAGS $LIBUV_CFLAGS"
LIBS="$LIBS $LIBUV_LIBS"
@@ -697,8 +699,8 @@ CRYPTO=OpenSSL
#
# OpenSSL/LibreSSL is mandatory
#
PKG_CHECK_MODULES([OPENSSL], [libssl libcrypto], [],
[AX_CHECK_OPENSSL([:],[AC_MSG_FAILURE([OpenSSL/LibreSSL not found])])])
PKG_CHECK_MODULES([OPENSSL], [libssl libcrypto], [PKG_CHECK_VERSION([OPENSSL_VERSION], [openssl])],
[AX_CHECK_OPENSSL([:], [AC_MSG_FAILURE([OpenSSL/LibreSSL not found])])])
AX_SAVE_FLAGS([openssl])
@@ -1688,7 +1690,7 @@ report() {
test "yes" = "$enable_fixed_rrset" && \
echo " Allow 'fixed' rrset-order (--enable-fixed-rrset)"
test "yes" = "$enable_fips_mode" && \
echo " FIPS mode in OpenSSL (--enable-fips-mode)"
echo " FIPS mode in OpenSSL (--enable-fips-mode)"
test "yes" = "$enable_querytrace" && \
echo " Very verbose query trace logging (--enable-querytrace)"
@@ -1698,6 +1700,11 @@ report() {
test "auto" = "$validation_default" && echo " DNSSEC validation active by default (--enable-auto-validation)"
echo "-------------------------------------------------------------------------------"
echo " Library versions:"
echo " OpenSSL: $OPENSSL_VERSION"
echo " libuv: $LIBUV_VERSION"
echo " Userspace-RCU: $RCU_VERSION"
echo "-------------------------------------------------------------------------------"
echo "Features disabled or unavailable on this platform:"
@@ -1731,7 +1738,7 @@ report() {
test "yes" = "$validation_default" && echo " DNSSEC validation requires configuration (--enable-auto-validation)"
test "yes" = "$enable_fips_mode" || \
echo " FIPS mode in OpenSSL (--enable-fips-mode)"
echo " FIPS mode in OpenSSL (--enable-fips-mode)"
test "yes" = "$enable_querytrace" || \
echo " Very verbose query trace logging (--enable-querytrace)"

7
m4/ax_check_openssl.m4
View File

@@ -39,6 +39,7 @@
AU_ALIAS([CHECK_SSL], [AX_CHECK_OPENSSL])
AC_DEFUN([AX_CHECK_OPENSSL], [
found=false
AC_PROG_SED
AC_ARG_WITH([openssl],
[AS_HELP_STRING([--with-openssl=DIR],
[root of the OpenSSL directory])],
@@ -59,6 +60,7 @@ AC_DEFUN([AX_CHECK_OPENSSL], [
if test $? = 0; then
OPENSSL_LIBS=`$PKG_CONFIG openssl --libs-only-l 2>/dev/null`
OPENSSL_CFLAGS=`$PKG_CONFIG openssl --cflags-only-I 2>/dev/null`
OPENSSL_VERSION=`$PKG_CONFIG openssl --modversion 2>/dev/null`
found=true
fi
fi
@@ -82,6 +84,10 @@ AC_DEFUN([AX_CHECK_OPENSSL], [
OPENSSL_CFLAGS="-I$ssldir/include"
OPENSSL_LDFLAGS="-L$ssldir/lib"
OPENSSL_LIBS="-lssl -lcrypto"
OPENSSL_VERSION=`$SED -ne 's/.*OPENSSL_VERSION_STR[^"]*"\([^"]*\)".*/\1/p;' $ssldir/include/openssl/opensslv.h`
if test -z "$OPENSSL_VERSION"; then
OPENSSL_VERSION=`$SED -ne 's/.*OPENSSL_VERSION_TEXT[^"]*"\([^"]*\)".*/\1/p;' $ssldir/include/openssl/opensslv.h`
fi
found=true
AC_MSG_RESULT([yes])
break
@@ -123,4 +129,5 @@ AC_DEFUN([AX_CHECK_OPENSSL], [
AC_SUBST([OPENSSL_CFLAGS])
AC_SUBST([OPENSSL_LIBS])
AC_SUBST([OPENSSL_LDFLAGS])
AC_SUBST([OPENSSL_VERSION])
])