03/04: gnu: curl: Build against MIT Kerberos instead of GSS.

[guix-commits]

mbakke pushed a commit to branch core-updates
in repository guix.

commit 828d3765a71ce1b74d1ab122c84d5c16eabf98b9
Author: Marius Bakke <address@hidden>
Date:   Sat Feb 23 17:16:25 2019 +0100

    gnu: curl: Build against MIT Kerberos instead of GSS.
    
    * gnu/packages/curl.scm (curl)[inputs]: Change from GSS to MIT-KRB5.
    [arguments]: Adjust accordingly.
---
 gnu/packages/curl.scm | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/gnu/packages/curl.scm b/gnu/packages/curl.scm
index 32b1205..a83760a 100644
--- a/gnu/packages/curl.scm
+++ b/gnu/packages/curl.scm
@@ -37,8 +37,8 @@
   #:use-module (gnu packages compression)
   #:use-module (gnu packages golang)
   #:use-module (gnu packages groff)
-  #:use-module (gnu packages gsasl)
   #:use-module (gnu packages guile)
+  #:use-module (gnu packages kerberos)
   #:use-module (gnu packages libidn)
   #:use-module (gnu packages openldap)
   #:use-module (gnu packages perl)
@@ -63,7 +63,6 @@
    (outputs '("out"
               "doc"))                             ;1.2 MiB of man3 pages
    (inputs `(("gnutls" ,gnutls)
-             ("gss" ,gss)
              ("libidn" ,libidn)
              ;; TODO XXX <https://bugs.gnu.org/34927>
              ;; Curl doesn't actually use or refer to libssh2 because the build
@@ -71,6 +70,7 @@
              ;; a mass rebuild is appropriate (e.g. core-updates).
              ("libssh2" ,libssh2-1.8.0)
              ("openldap" ,openldap)
+             ("mit-krb5" ,mit-krb5)
              ("nghttp2" ,nghttp2 "lib")
              ("zlib" ,zlib)))
    (native-inputs
@@ -89,8 +89,10 @@
            (separator #f)                         ;single entry
            (files '("etc/ssl/certs/ca-certificates.crt")))))
    (arguments
-    `(#:configure-flags '("--with-gnutls" "--with-gssapi"
-                          "--disable-static")
+    `(#:configure-flags (list "--with-gnutls"
+                              (string-append "--with-gssapi="
+                                             (assoc-ref %build-inputs 
"mit-krb5"))
+                              "--disable-static")
       ;; Add a phase to patch '/bin/sh' occurances in tests/runtests.pl
       #:phases
       (modify-phases %standard-phases