diff options
author | Britney Fransen <brfransen@gmail.com> | 2014-10-27 20:28:27 (GMT) |
---|---|---|
committer | Britney Fransen <brfransen@gmail.com> | 2014-10-27 20:28:27 (GMT) |
commit | f7b823f55a80b1498c30e9f3a47692a2329c4f09 (patch) | |
tree | 6de557714e6336282fbc0ab16c6578386dfc6654 /abs/extra/cups/cups-no-gcrypt.patch | |
parent | 4c2a2e3504f472628285a989c7c9a76be6855f54 (diff) | |
parent | 01c1a60f3b7f93b3ed7404196c2cf798c4d8c674 (diff) | |
download | linhes_pkgbuild-f7b823f55a80b1498c30e9f3a47692a2329c4f09.zip linhes_pkgbuild-f7b823f55a80b1498c30e9f3a47692a2329c4f09.tar.gz linhes_pkgbuild-f7b823f55a80b1498c30e9f3a47692a2329c4f09.tar.bz2 |
Merge branch 'testing'
Diffstat (limited to 'abs/extra/cups/cups-no-gcrypt.patch')
-rw-r--r-- | abs/extra/cups/cups-no-gcrypt.patch | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/abs/extra/cups/cups-no-gcrypt.patch b/abs/extra/cups/cups-no-gcrypt.patch index 42f71d0..4eaff67 100644 --- a/abs/extra/cups/cups-no-gcrypt.patch +++ b/abs/extra/cups/cups-no-gcrypt.patch @@ -9,12 +9,14 @@ diff -ruN cups-1.4.7.orig//config-scripts/cups-ssl.m4 cups-1.4.7/config-scripts/ if $PKGCONFIG --exists gnutls; then have_ssl=1 SSLLIBS=`$PKGCONFIG --libs gnutls` -@@ -110,16 +109,6 @@ - AC_DEFINE(HAVE_SSL) +@@ -108,18 +107,6 @@ AC_DEFINE(HAVE_GNUTLS) fi -- + - if test $have_ssl = 1; then +- CUPS_SERVERCERT="ssl/server.crt" +- CUPS_SERVERKEY="ssl/server.key" +- - if $PKGCONFIG --exists gcrypt; then - SSLLIBS="$SSLLIBS `$PKGCONFIG --libs gcrypt`" - SSLFLAGS="$SSLFLAGS `$PKGCONFIG --cflags gcrypt`" |