/[gentoo-x86]/net-misc/curl/files/curl-fix-gnutls-nettle.patch
Gentoo

Contents of /net-misc/curl/files/curl-fix-gnutls-nettle.patch

Parent Directory Parent Directory | Revision Log Revision Log


Revision 1.1 - (show annotations) (download)
Sun Apr 15 17:51:41 2012 UTC (2 years, 3 months ago) by blueness
Branch: MAIN
Add missing patch

(Portage version: 2.1.10.49/cvs/Linux x86_64)

1 diff -Naur curl-7.25.0.orig//configure.ac curl-7.25.0/configure.ac
2 --- curl-7.25.0.orig//configure.ac 2012-04-04 17:24:48.000000000 -0400
3 +++ curl-7.25.0/configure.ac 2012-04-04 17:23:07.000000000 -0400
4 @@ -1823,20 +1823,9 @@
5
6 if test "$GNUTLS_ENABLED" = "1"; then
7 USE_GNUTLS_NETTLE=
8 - # First check if we can detect either crypto library via transitive linking
9 - AC_CHECK_LIB(gnutls, nettle_MD5Init, [ USE_GNUTLS_NETTLE=1 ])
10 - if test "$USE_GNUTLS_NETTLE" = ""; then
11 - AC_CHECK_LIB(gnutls, gcry_control, [ USE_GNUTLS_NETTLE=0 ])
12 - fi
13 - # If not, try linking directly to both of them to see if they are available
14 - if test "$USE_GNUTLS_NETTLE" = ""; then
15 - AC_CHECK_LIB(nettle, nettle_MD5Init, [ USE_GNUTLS_NETTLE=1 ])
16 - fi
17 - if test "$USE_GNUTLS_NETTLE" = ""; then
18 - AC_CHECK_LIB(gcrypt, gcry_control, [ USE_GNUTLS_NETTLE=0 ])
19 - fi
20 - if test "$USE_GNUTLS_NETTLE" = ""; then
21 - AC_MSG_ERROR([GnuTLS found, but neither gcrypt nor nettle found])
22 + AC_ARG_WITH(nettle)
23 + if test "x$withval" = "xyes"; then
24 + USE_GNUTLS_NETTLE=1
25 fi
26 if test "$USE_GNUTLS_NETTLE" = "1"; then
27 AC_DEFINE(USE_GNUTLS_NETTLE, 1, [if GnuTLS uses nettle as crypto backend])

  ViewVC Help
Powered by ViewVC 1.1.20