Alexandre Rostovtsev : configure: In gnutls-3.2, gnutls_mac_get_key_size() moved to crypto.h.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: fee9cd3b243ed4eeb111417a472831bb364fc2fc
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=fee9cd3b243ed4eeb111417a47...

Author: Alexandre Rostovtsev <tetromino(a)gentoo.org>
Date:   Tue Jun 11 01:01:56 2013 -0400

configure: In gnutls-3.2, gnutls_mac_get_key_size() moved to crypto.h.

Based on a patch by Ben Kohler <bkohler(a)gmail.com>.

---

 configure                      |    1 +
 configure.ac                   |    3 ++-
 dlls/secur32/schannel_gnutls.c |    1 +
 3 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/configure b/configure
index 3006070..86eab07 100755
--- a/configure
+++ b/configure
@@ -10200,6 +10200,7 @@ if test "x$ac_cv_header_gnutls_gnutls_h" = xyes; then :
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <gnutls/gnutls.h>
+#include <gnutls/crypto.h>
 int
 main ()
 {
diff --git a/configure.ac b/configure.ac
index 680432c..a01b44c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1344,7 +1344,8 @@ then
     ac_save_CPPFLAGS="$CPPFLAGS"
     WINE_PACKAGE_FLAGS(GNUTLS,[gnutls])
     AC_CHECK_HEADER(gnutls/gnutls.h,
-        [AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <gnutls/gnutls.h>]], [[static typeof(gnutls_mac_get_key_size) *func; if (func) return 0;]])],
+        [AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <gnutls/gnutls.h>
+#include <gnutls/crypto.h>]], [[static typeof(gnutls_mac_get_key_size) *func; if (func) return 0;]])],
             [WINE_CHECK_SONAME(gnutls,gnutls_global_init,,[GNUTLS_CFLAGS=""],[$GNUTLS_LIBS])])],
         [GNUTLS_CFLAGS=""])
     CPPFLAGS="$ac_save_CPPFLAGS"
diff --git a/dlls/secur32/schannel_gnutls.c b/dlls/secur32/schannel_gnutls.c
index 70b8276..cbe64e8 100644
--- a/dlls/secur32/schannel_gnutls.c
+++ b/dlls/secur32/schannel_gnutls.c
@@ -25,6 +25,7 @@
 #include <stdarg.h>
 #ifdef SONAME_LIBGNUTLS
 #include <gnutls/gnutls.h>
+#include <gnutls/crypto.h>
 #endif
 
 #include "windef.h"