From db73bf24d93411271725e26dd9c5223e8fb79f2e Mon Sep 17 00:00:00 2001
From: Philipp Storz <philipp.storz@bareos.com>
Date: Wed, 26 Nov 2014 15:54:21 +0100
Subject: [PATCH] recreated configure

---
 autoconf/config.h.in |  6 ++++++
 configure            | 37 +++++++++++++++++++++++++++++++++++++
 2 files changed, 43 insertions(+)

diff --git a/autoconf/config.h.in b/autoconf/config.h.in
index c3967699a39..86cde2d8185 100644
--- a/autoconf/config.h.in
+++ b/autoconf/config.h.in
@@ -384,9 +384,15 @@
 /* Define to 1 if GNUTLS library is available */
 #undef HAVE_GNUTLS
 
+/* Define to 1 if you have the `gnutls_cipher_init' function. */
+#undef HAVE_GNUTLS_CIPHER_INIT
+
 /* Define to 1 if you have the <gnutls/gnutls.h> header file. */
 #undef HAVE_GNUTLS_GNUTLS_H
 
+/* Define to 1 if you have the `gnutls_transport_set_int' function. */
+#undef HAVE_GNUTLS_TRANSPORT_SET_INT
+
 /* Define to 1 if you have the <grp.h> header file. */
 #undef HAVE_GRP_H
 
diff --git a/configure b/configure
index 63a1ea96953..edc0a7091ff 100755
--- a/configure
+++ b/configure
@@ -23787,9 +23787,46 @@ fi
       fi
 
       if test "$have_gnutls" = "yes"; then
+         # do an additional check to see if required functions are available,
+         # otherwise disable gnutls
+         for ac_func in gnutls_cipher_init
+do :
+  ac_fn_c_check_func "$LINENO" "gnutls_cipher_init" "ac_cv_func_gnutls_cipher_init"
+if test "x$ac_cv_func_gnutls_cipher_init" = xyes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_GNUTLS_CIPHER_INIT 1
+_ACEOF
+
+	        have_gnutls="yes"
+
+else
+
+	        have_gnutls="no"
+
+
+fi
+done
+
+      fi
+
+      if test "$have_gnutls" = "yes"; then
 
 $as_echo "#define HAVE_GNUTLS 1" >>confdefs.h
 
+         # gnutls_transport_set_ptr may cause problems on some platforms,
+         # therefore the replacement gnutls_transport_set_int is used
+         # when available (since GnuTLS >= 3.1.9)
+         for ac_func in gnutls_transport_set_int
+do :
+  ac_fn_c_check_func "$LINENO" "gnutls_transport_set_int" "ac_cv_func_gnutls_transport_set_int"
+if test "x$ac_cv_func_gnutls_transport_set_int" = xyes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_GNUTLS_TRANSPORT_SET_INT 1
+_ACEOF
+
+fi
+done
+
       fi
 
       if test "$support_tls" != "no" -a "$have_gnutls" = "yes"; then