summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2006-08-21 09:27:43 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 14:16:21 -0500
commitcbbaa36fbfbe8403eacaded4e5122c9f62b6b5e5 (patch)
treeec0e3969ce8be018cf2f86d9c05112b630c849eb
parent691e5e5fdcd273ae5d25ba0d129c6b2192249e81 (diff)
downloadsamba-cbbaa36fbfbe8403eacaded4e5122c9f62b6b5e5.tar.gz
samba-cbbaa36fbfbe8403eacaded4e5122c9f62b6b5e5.tar.bz2
samba-cbbaa36fbfbe8403eacaded4e5122c9f62b6b5e5.zip
r17659: cope with systems without the x509 gnutls functions
(This used to be commit 8148534d9c9e566c4ecd9b29857fa96916cd9e3f)
-rw-r--r--source4/lib/tls/config.m47
1 files changed, 6 insertions, 1 deletions
diff --git a/source4/lib/tls/config.m4 b/source4/lib/tls/config.m4
index 1e4d61f6fe..b1e4d2cb29 100644
--- a/source4/lib/tls/config.m4
+++ b/source4/lib/tls/config.m4
@@ -6,7 +6,12 @@ SMB_EXT_LIB_FROM_PKGCONFIG(GNUTLS, gnutls)
if test x$SMB_ENABLE_GNUTLS = xNO; then
AC_CHECK_HEADERS(gnutls/gnutls.h)
AC_CHECK_LIB_EXT(gnutls, GNUTLS_LIBS, gnutls_global_init)
- if test x"$ac_cv_header_gnutls_gnutls_h" = x"yes" -a x"$ac_cv_lib_ext_gnutls_gnutls_global_init" = x"yes";then
+ AC_CHECK_DECL(gnutls_x509_crt_set_version,
+ [AC_DEFINE(HAVE_GNUTLS_X509_CRT_SET_VERSION,1,gnutls set_version)], [], [
+ #include <gnutls/gnutls.h>
+ #include <gnutls/x509.h>
+ ])
+ if test x"$ac_cv_header_gnutls_gnutls_h" = x"yes" -a x"$ac_cv_lib_ext_gnutls_gnutls_global_init" = x"yes" -a x"$ac_cv_have_gnutls_x509_crt_set_version_decl" = x"yes";then
SMB_ENABLE(GNUTLS,YES)
AC_CHECK_DECL(gnutls_x509_crt_set_subject_key_id,
[AC_DEFINE(HAVE_GNUTLS_X509_CRT_SET_SUBJECT_KEY_ID,1,gnutls subject_key)], [], [