From aaf6e38a98b3fdca6b604bbf0afe73acaa8cae82 Mon Sep 17 00:00:00 2001 From: Sebastian Lackner Date: Sun, 7 Sep 2014 19:19:26 +0200 Subject: [PATCH] configure-Detect_Gnutls: Still not the right library, check for linking against libgnutls-openssl.so. --- patches/Makefile | 4 ++-- ...01-configure-Fix-detection-of-gnutls-on-Ubuntu-14.10.patch | 2 +- patches/configure-Detect_Gnutls/definition | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/patches/Makefile b/patches/Makefile index 9335df05..663839f6 100644 --- a/patches/Makefile +++ b/patches/Makefile @@ -274,7 +274,7 @@ configure-Absolute_RPATH.ok: # Patchset configure-Detect_Gnutls # | # | Included patches: -# | * Fix detection of gnutls on Ubuntu 14.10. [rev 2, by Sebastian Lackner] +# | * Fix detection of gnutls on Ubuntu 14.10. [rev 3, by Sebastian Lackner] # | # | Modified files: # | * configure.ac @@ -283,7 +283,7 @@ configure-Absolute_RPATH.ok: configure-Detect_Gnutls.ok: $(call APPLY_FILE,configure-Detect_Gnutls/0001-configure-Fix-detection-of-gnutls-on-Ubuntu-14.10.patch) @( \ - echo '+ { "configure-Detect_Gnutls", "Sebastian Lackner", "Fix detection of gnutls on Ubuntu 14.10. [rev 2]" },'; \ + echo '+ { "configure-Detect_Gnutls", "Sebastian Lackner", "Fix detection of gnutls on Ubuntu 14.10. [rev 3]" },'; \ ) > configure-Detect_Gnutls.ok # Patchset dsound-Fast_Mixer diff --git a/patches/configure-Detect_Gnutls/0001-configure-Fix-detection-of-gnutls-on-Ubuntu-14.10.patch b/patches/configure-Detect_Gnutls/0001-configure-Fix-detection-of-gnutls-on-Ubuntu-14.10.patch index fc459ea2..a4fd28b9 100644 --- a/patches/configure-Detect_Gnutls/0001-configure-Fix-detection-of-gnutls-on-Ubuntu-14.10.patch +++ b/patches/configure-Detect_Gnutls/0001-configure-Fix-detection-of-gnutls-on-Ubuntu-14.10.patch @@ -16,7 +16,7 @@ index 2bc0008..c22b119 100644 [AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include #include ]], [[static typeof(gnutls_mac_get_key_size) *func; if (func) return 0;]])], - [WINE_CHECK_SONAME(gnutls,gnutls_global_init,,[GNUTLS_CFLAGS=""],[$GNUTLS_LIBS])])], -+ [WINE_CHECK_SONAME(gnutls,gnutls_global_init,,[GNUTLS_CFLAGS=""],[$GNUTLS_LIBS],[[libgnutls\\(-openssl\\)\\{0,1\\}]])])], ++ [WINE_CHECK_SONAME(gnutls,gnutls_global_init,,[GNUTLS_CFLAGS=""],[$GNUTLS_LIBS],[[libgnutls\\(-deb0\\)\\{0,1\\}]])])], [GNUTLS_CFLAGS=""])]) fi WINE_WARNING_WITH(gnutls,[test "x$ac_cv_lib_soname_gnutls" = "x"], diff --git a/patches/configure-Detect_Gnutls/definition b/patches/configure-Detect_Gnutls/definition index 4dd889ad..2620bc9d 100644 --- a/patches/configure-Detect_Gnutls/definition +++ b/patches/configure-Detect_Gnutls/definition @@ -1,3 +1,3 @@ Author: Sebastian Lackner Subject: Fix detection of gnutls on Ubuntu 14.10. -Revision: 2 +Revision: 3