Francois Gouget : secur32: Check that the GnuTLS header is recent enough for schannel.
Alexandre Julliard
julliard at winehq.org
Fri Oct 24 08:12:49 CDT 2008
Module: wine
Branch: master
Commit: 3aae9546a4b004441a8c9ed31b837edcd9432d19
URL: http://source.winehq.org/git/wine.git/?a=commit;h=3aae9546a4b004441a8c9ed31b837edcd9432d19
Author: Francois Gouget <fgouget at free.fr>
Date: Fri Oct 24 11:24:58 2008 +0200
secur32: Check that the GnuTLS header is recent enough for schannel.
---
configure | 40 ++++++++++++++++++++++++++++++++++++++++
configure.ac | 5 +++--
2 files changed, 43 insertions(+), 2 deletions(-)
diff --git a/configure b/configure
index 18f36df..c7ad362 100755
--- a/configure
+++ b/configure
@@ -12881,6 +12881,38 @@ echo "${ECHO_T}$ac_cv_header_gnutls_gnutls_h" >&6; }
fi
if test $ac_cv_header_gnutls_gnutls_h = yes; then
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+#include <gnutls/gnutls.h>
+int
+main ()
+{
+typeof(gnutls_transport_set_errno) *pfunc;
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
{ echo "$as_me:$LINENO: checking for -lgnutls" >&5
echo $ECHO_N "checking for -lgnutls... $ECHO_C" >&6; }
if test "${ac_cv_lib_soname_gnutls+set}" = set; then
@@ -12960,6 +12992,14 @@ _ACEOF
fi
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
diff --git a/configure.ac b/configure.ac
index 85f9f83..baeff8e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -922,8 +922,9 @@ then
ac_gnutls_cflags="`$PKG_CONFIG --cflags gnutls 2>/dev/null`"
CPPFLAGS="$CPPFLAGS $ac_gnutls_cflags"
AC_CHECK_HEADER(gnutls/gnutls.h,
- [WINE_CHECK_SONAME(gnutls,gnutls_global_init,
- [AC_SUBST(GNUTLSINCL,"$ac_gnutls_cflags")],,[$ac_gnutls_libs])])
+ [AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <gnutls/gnutls.h>]], [[typeof(gnutls_transport_set_errno) *pfunc;]])],
+ [WINE_CHECK_SONAME(gnutls,gnutls_global_init,
+ [AC_SUBST(GNUTLSINCL,"$ac_gnutls_cflags")],,[$ac_gnutls_libs])])])
CPPFLAGS="$ac_save_CPPFLAGS"
fi
WINE_NOTICE_WITH(gnutls,[test "x$ac_cv_lib_soname_gnutls" = "x"],
More information about the wine-cvs
mailing list