Merge branch '2177-make-native-pkcs11-require-dlopen-support' into 'v9_16'

Make native PKCS#11 require dlopen() support

See merge request isc-projects/bind9!4177
This commit is contained in:
Michał Kępień
2020-09-28 07:23:12 +00:00
2 changed files with 9 additions and 2 deletions

4
configure vendored
View File

@@ -22660,6 +22660,10 @@ fi
fi
if test "$with_dlopen" = "no" -a "$enable_native_pkcs11" = "yes"; then :
as_fn_error $? "PKCS11 requires dlopen() support" "$LINENO" 5
fi
CFLAGS="$CFLAGS $SO_CFLAGS"

View File

@@ -904,7 +904,7 @@ PKCS11_MANS=
#
# was --enable-native-pkcs11 specified?
#
# [pairwise: --enable-native-pkcs11, --disable-native-pkcs11]
# [pairwise: --enable-native-pkcs11 --with-dlopen, --disable-native-pkcs11 --with-dlopen, --disable-native-pkcs11 --without-dlopen]
AC_ARG_ENABLE(native-pkcs11,
AS_HELP_STRING([--enable-native-pkcs11],
[use native PKCS11 for public-key crypto [default=no]]),
@@ -2451,7 +2451,7 @@ SO_LD=""
SO_TARGETS=""
SO_STRIP="cat"
# [pairwise: --with-dlopen, --without-dlopen]
# [pairwise: skip]
AC_ARG_WITH([dlopen],
AS_HELP_STRING([--with-dlopen=ARG],
[support dynamically loadable DLZ and DYNDB drivers]),
@@ -2542,6 +2542,9 @@ AS_IF([test "$with_dlopen" = "yes"],
])
])
AS_IF([test "$with_dlopen" = "no" -a "$enable_native_pkcs11" = "yes"],
[AC_MSG_ERROR([PKCS11 requires dlopen() support])])
CFLAGS="$CFLAGS $SO_CFLAGS"
AC_SUBST(SO)