Stefan Dösinger : configure: Try -lgnutls as gnutls default lib.

Alexandre Julliard julliard at winehq.org
Thu May 7 17:56:53 CDT 2020


Module: wine
Branch: master
Commit: 7e0e556726deff3c93b2172de15cc1c523571b59
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=7e0e556726deff3c93b2172de15cc1c523571b59

Author: Stefan Dösinger <stefan at codeweavers.com>
Date:   Thu May  7 18:22:02 2020 +0200

configure: Try -lgnutls as gnutls default lib.

This allows configure on MacOS to pick up a homebrew installed gnutls without
PKGCONFIG and manually added GNUTLS_LIBS var.

Signed-off-by: Stefan Dösinger <stefan at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>

---

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

diff --git a/configure b/configure
index 3c6c360a44..809abefdec 100755
--- a/configure
+++ b/configure
@@ -13565,7 +13565,7 @@ if ${GNUTLS_LIBS:+false} :; then :
 fi
 fi
 
-
+GNUTLS_LIBS=${GNUTLS_LIBS:-"-lgnutls"}
 $as_echo "$as_me:${as_lineno-$LINENO}: gnutls cflags: $GNUTLS_CFLAGS" >&5
 $as_echo "$as_me:${as_lineno-$LINENO}: gnutls libs: $GNUTLS_LIBS" >&5
 ac_save_CPPFLAGS=$CPPFLAGS
diff --git a/configure.ac b/configure.ac
index d4a92d3cbb..3e0511325c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1449,7 +1449,7 @@ fi
 dnl **** Check for libgnutls ****
 if test "x$with_gnutls" != "xno"
 then
-    WINE_PACKAGE_FLAGS(GNUTLS,[gnutls],,,,
+    WINE_PACKAGE_FLAGS(GNUTLS,[gnutls],[-lgnutls],,,
         [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;]])],




More information about the wine-cvs mailing list