From 7e461bbf27b928cb16666affcd489adf38344154 Mon Sep 17 00:00:00 2001 From: Henri Verbeet Date: Tue, 21 Oct 2008 18:56:39 +0200 Subject: configure: Require at least version 1.6 of gnutls. --- configure.ac | 21 ++++++++++++--------- 1 files changed, 12 insertions(+), 9 deletions(-) diff --git a/configure.ac b/configure.ac index 0bbe496..3e87cdd 100644 --- a/configure.ac +++ b/configure.ac @@ -916,17 +916,20 @@ WINE_NOTICE_WITH(hal,[test "x$ac_cv_lib_soname_hal" = "x"], dnl **** Check for libgnutls **** if test "x$with_gnutls" != "xno" -a "$PKG_CONFIG" != "false" then - ac_save_CPPFLAGS="$CPPFLAGS" - ac_gnutls_libs="`$PKG_CONFIG --libs gnutls 2>/dev/null`" - 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])]) - CPPFLAGS="$ac_save_CPPFLAGS" + if $PKG_CONFIG --atleast-version=1.6 gnutls + then + ac_save_CPPFLAGS="$CPPFLAGS" + ac_gnutls_libs="`$PKG_CONFIG --libs gnutls 2>/dev/null`" + 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])]) + CPPFLAGS="$ac_save_CPPFLAGS" + fi fi WINE_NOTICE_WITH(gnutls,[test "x$ac_cv_lib_soname_gnutls" = "x"], - [libgnutls development files not found, no schannel support.]) + [libgnutls >= 1.6 development files not found, no schannel support.]) dnl **** Check which curses lib to use *** CURSESLIBS="" -- 1.5.6.4