Alexandre Julliard : configure: Don' t check for gnutls_hash if gnutls is missing entirely.

[Alexandre Julliard]

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

Author: Alexandre Julliard <julliard(a)winehq.org>
Date:   Thu Jan 21 15:53:14 2016 +0900

configure: Don't check for gnutls_hash if gnutls is missing entirely.

Signed-off-by: Alexandre Julliard <julliard(a)winehq.org>

---

 configure    | 24 ++++++++++++------------
 configure.ac |  6 +++---
 2 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/configure b/configure
index a17ad55..d0a7266 100755
--- a/configure
+++ b/configure
@@ -11585,18 +11585,7 @@ _ACEOF
 
 
 fi
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-else
-  GNUTLS_CFLAGS=""
-fi
-
-
-CPPFLAGS=$ac_save_CPPFLAGS
-test -z "$GNUTLS_CFLAGS" || GNUTLS_CFLAGS=`echo " $GNUTLS_CFLAGS" | sed 's/ -I\([^/]\)/ -I\$(top_builddir)\/\1/g'`
-test -z "$GNUTLS_LIBS" || GNUTLS_LIBS=`echo " $GNUTLS_LIBS" | sed 's/ -L\([^/]\)/ -L\$(top_builddir)\/\1/g'`
-
-    ac_wine_check_funcs_save_LIBS="$LIBS"
+                 ac_wine_check_funcs_save_LIBS="$LIBS"
 LIBS="$LIBS $GNUTLS_LIBS"
 for ac_func in gnutls_hash
 do :
@@ -11613,6 +11602,17 @@ done
 
 LIBS="$ac_wine_check_funcs_save_LIBS"
 fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+else
+  GNUTLS_CFLAGS=""
+fi
+
+
+CPPFLAGS=$ac_save_CPPFLAGS
+test -z "$GNUTLS_CFLAGS" || GNUTLS_CFLAGS=`echo " $GNUTLS_CFLAGS" | sed 's/ -I\([^/]\)/ -I\$(top_builddir)\/\1/g'`
+test -z "$GNUTLS_LIBS" || GNUTLS_LIBS=`echo " $GNUTLS_LIBS" | sed 's/ -L\([^/]\)/ -L\$(top_builddir)\/\1/g'`
+
+fi
 if test "x$ac_cv_lib_soname_gnutls" = "x"; then :
   case "x$with_gnutls" in
   x)   as_fn_append wine_warnings "|libgnutls ${notice_platform}development files not found, no schannel support." ;;
diff --git a/configure.ac b/configure.ac
index 23fee7b..d20791a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1268,10 +1268,10 @@ then
         [AC_CHECK_HEADER(gnutls/gnutls.h,
             [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],[[libgnutls\\(-deb0\\)\\{0,1\\}]])])],
+                [WINE_CHECK_SONAME(gnutls,gnutls_global_init,,[GNUTLS_CFLAGS=""],[$GNUTLS_LIBS],[[libgnutls\\(-deb0\\)\\{0,1\\}]])
+                 WINE_CHECK_LIB_FUNCS(gnutls_hash,[$GNUTLS_LIBS],,
+                                      [WINE_NOTICE([libgnutls ${notice_platform}development files too old, no bcrypt hash support.])])])],
             [GNUTLS_CFLAGS=""])])
-    WINE_CHECK_LIB_FUNCS(gnutls_hash,[$GNUTLS_LIBS],,
-                         [WINE_NOTICE([libgnutls ${notice_platform}development files too old, no bcrypt hash support.])])
 fi
 WINE_WARNING_WITH(gnutls,[test "x$ac_cv_lib_soname_gnutls" = "x"],
                  [libgnutls ${notice_platform}development files not found, no schannel support.])