diff options
| author | Mark H Weaver <mhw@netris.org> | 2015-04-17 22:06:05 -0400 |
|---|---|---|
| committer | Mark H Weaver <mhw@netris.org> | 2015-04-17 22:06:05 -0400 |
| commit | 334345d9db53326fa062298e2372d6c33123949a (patch) | |
| tree | 50774c171f1a348bd7de8e9a447bad2a14a9dffb /gnu/packages/patches/curl-support-capath-on-gnutls-conf.patch | |
| parent | 8d7dc5d9dbf009009d33e21598f92c4685965cd5 (diff) | |
| parent | 09dd019490e4a269b0a2d9512a07688f8ee657d3 (diff) | |
| download | guix-334345d9db53326fa062298e2372d6c33123949a.tar.gz | |
Merge branch 'core-updates'
Diffstat (limited to 'gnu/packages/patches/curl-support-capath-on-gnutls-conf.patch')
| -rw-r--r-- | gnu/packages/patches/curl-support-capath-on-gnutls-conf.patch | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/gnu/packages/patches/curl-support-capath-on-gnutls-conf.patch b/gnu/packages/patches/curl-support-capath-on-gnutls-conf.patch new file mode 100644 index 0000000000..d2391d461d --- /dev/null +++ b/gnu/packages/patches/curl-support-capath-on-gnutls-conf.patch @@ -0,0 +1,16 @@ +This patch updates 'configure' as autoreconf would have done after +applying curl-support-capath-on-gnutls.patch. + +--- a/configure 2015-03-22 01:11:23.178743705 +0100 ++++ b/configure 2015-02-25 00:05:37.000000000 +0100 +@@ -23952,8 +24432,8 @@ + ca="$want_ca" + capath="no" + elif test "x$want_capath" != "xno" -a "x$want_capath" != "xunset"; then +- if test "x$OPENSSL_ENABLED" != "x1" -a "x$POLARSSL_ENABLED" != "x1"; then +- as_fn_error $? "--with-ca-path only works with openSSL or PolarSSL" "$LINENO" 5 ++ if test "x$OPENSSL_ENABLED" != "x1" -a "x$GNUTLS_ENABLED" != "x1" -a "x$POLARSSL_ENABLED" != "x1"; then ++ as_fn_error $? "--with-ca-path only works with OpenSSL, GnuTLS or PolarSSL" "$LINENO" 5 + fi + capath="$want_capath" + ca="no" |