ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

secur32: Check that the GnuTLS header is recent enough for schannel.

This commit is contained in:
Francois Gouget 2008-10-24 11:24:58 +02:00 committed by Alexandre Julliard
parent fc967b45e8
commit 3aae9546a4
2 changed files with 43 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
configure vendored
View File

@ -12881,6 +12881,38 @@ echo "${ECHO_T}$ac_cv_header_gnutls_gnutls_h" >&6; }
fi fi
if test $ac_cv_header_gnutls_gnutls_h = yes; then 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 "$as_me:$LINENO: checking for -lgnutls" >&5
echo $ECHO_N "checking for -lgnutls... $ECHO_C" >&6; } echo $ECHO_N "checking for -lgnutls... $ECHO_C" >&6; }
if test "${ac_cv_lib_soname_gnutls+set}" = set; then if test "${ac_cv_lib_soname_gnutls+set}" = set; then
@ -12960,6 +12992,14 @@ _ACEOF
fi 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 fi

5
configure.ac
View File

@ -922,8 +922,9 @@ then
ac_gnutls_cflags="`$PKG_CONFIG --cflags gnutls 2>/dev/null`" ac_gnutls_cflags="`$PKG_CONFIG --cflags gnutls 2>/dev/null`"
CPPFLAGS="$CPPFLAGS $ac_gnutls_cflags" CPPFLAGS="$CPPFLAGS $ac_gnutls_cflags"
AC_CHECK_HEADER(gnutls/gnutls.h, AC_CHECK_HEADER(gnutls/gnutls.h,
[WINE_CHECK_SONAME(gnutls,gnutls_global_init, [AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <gnutls/gnutls.h>]], [[typeof(gnutls_transport_set_errno) *pfunc;]])],
[AC_SUBST(GNUTLSINCL,"$ac_gnutls_cflags")],,[$ac_gnutls_libs])]) [WINE_CHECK_SONAME(gnutls,gnutls_global_init,
[AC_SUBST(GNUTLSINCL,"$ac_gnutls_cflags")],,[$ac_gnutls_libs])])])
CPPFLAGS="$ac_save_CPPFLAGS" CPPFLAGS="$ac_save_CPPFLAGS"
fi fi
WINE_NOTICE_WITH(gnutls,[test "x$ac_cv_lib_soname_gnutls" = "x"], WINE_NOTICE_WITH(gnutls,[test "x$ac_cv_lib_soname_gnutls" = "x"],