wine/wine-staging
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-staging.git synced 2024-11-21 16:46:54 -08:00
Code Issues Packages Projects Releases Wiki Activity

configure-Detect_Gnutls: Try 2, maybe Ubuntu 14.10 links against libgnutls-openssl.so?

Browse Source
This commit is contained in:
Sebastian Lackner 2014-09-07 17:11:44 +02:00
parent f5abff47fb
commit b33ea6c233
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
patches/Makefile
View File

@ -274,7 +274,7 @@ configure-Absolute_RPATH.ok:
# Patchset configure-Detect_Gnutls
# |
# | Included patches:
# | * Fix detection of gnutls on Ubuntu 14.10. [by Sebastian Lackner]
# | * Fix detection of gnutls on Ubuntu 14.10. [rev 2, 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." },'; \
echo '+ { "configure-Detect_Gnutls", "Sebastian Lackner", "Fix detection of gnutls on Ubuntu 14.10. [rev 2]" },'; \
) > configure-Detect_Gnutls.ok
# Patchset dsound-Fast_Mixer

2
patches/configure-Detect_Gnutls/0001-configure-Fix-detection-of-gnutls-on-Ubuntu-14.10.patch
View File

@ -16,7 +16,7 @@ index 2bc0008..c22b119 100644
[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])])],
+ [WINE_CHECK_SONAME(gnutls,gnutls_global_init,,[GNUTLS_CFLAGS=""],[$GNUTLS_LIBS],[[libgnutls\\(xx\\)\\{0,1\\}]])])],
+ [WINE_CHECK_SONAME(gnutls,gnutls_global_init,,[GNUTLS_CFLAGS=""],[$GNUTLS_LIBS],[[libgnutls\\(-openssl\\)\\{0,1\\}]])])],
[GNUTLS_CFLAGS=""])])
fi
WINE_WARNING_WITH(gnutls,[test "x$ac_cv_lib_soname_gnutls" = "x"],

2
patches/configure-Detect_Gnutls/definition
View File

@ -1,3 +1,3 @@
Author: Sebastian Lackner
Subject: Fix detection of gnutls on Ubuntu 14.10.
Revision: 1
Revision: 2