up to 7.80.0

[packages/curl.git] / curl-krb5flags.patch

diff --git a/curl-krb5flags.patch b/curl-krb5flags.patch
index b8a56e901de1f2b961f7c10ffb09626cc6e869bf..f399d15741db46b0d8b684899a8e4dac8843e24c 100644 (file)
--- a/curl-krb5flags.patch
+++ b/curl-krb5flags.patch
@@ -1,20 +1,20 @@
---- curl-7.37.1/configure.ac.orig      2014-07-19 10:27:07.972697344 +0200
-+++ curl-7.37.1/configure.ac   2014-07-19 10:28:38.279360218 +0200
-@@ -1212,7 +1212,7 @@
+--- curl-7.43.0/configure.ac.orig      2015-06-24 21:11:53.330168712 +0200
++++ curl-7.43.0/configure.ac   2015-06-24 21:19:26.686816353 +0200
+@@ -1193,7 +1193,7 @@
+   CURL_CHECK_PKGCONFIG(mit-krb5-gssapi)
+   if test -z "$GSSAPI_INCS"; then
       if test -n "$host_alias" -a -f "$GSSAPI_ROOT/bin/$host_alias-krb5-config"; then
-         GSSAPI_INCS=`$GSSAPI_ROOT/bin/$host_alias-krb5-config --cflags gssapi`
-      elif test -f "$GSSAPI_ROOT/bin/krb5-config"; then
--        GSSAPI_INCS=`$GSSAPI_ROOT/bin/krb5-config --cflags gssapi`
-+        GSSAPI_INCS=`CFLAGS= $GSSAPI_ROOT/bin/krb5-config --cflags gssapi`
+-        GSSAPI_INCS=`$GSSAPI_ROOT/bin/$host_alias-krb5-config --cflags gssapi`
++        GSSAPI_INCS=`CFLAGS= $GSSAPI_ROOT/bin/$host_alias-krb5-config --cflags gssapi`
+      elif test "$PKGCONFIG" != "no" ; then
+         GSSAPI_INCS=`$PKGCONFIG --cflags mit-krb5-gssapi`
       elif test "$GSSAPI_ROOT" != "yes"; then
-         GSSAPI_INCS="-I$GSSAPI_ROOT/include"
-      fi
-@@ -1311,7 +1311,7 @@
-         elif test -f "$GSSAPI_ROOT/bin/krb5-config"; then
+@@ -1288,7 +1288,7 @@
+         if test -n "$host_alias" -a -f "$GSSAPI_ROOT/bin/$host_alias-krb5-config"; then
             dnl krb5-config doesn't have --libs-only-L or similar, put everything
             dnl into LIBS
--           gss_libs=`$GSSAPI_ROOT/bin/krb5-config --libs gssapi`
-+           gss_libs=`CFLAGS= $GSSAPI_ROOT/bin/krb5-config --libs gssapi`
+-           gss_libs=`$GSSAPI_ROOT/bin/$host_alias-krb5-config --libs gssapi`
++           gss_libs=`CFLAGS= $GSSAPI_ROOT/bin/$host_alias-krb5-config --libs gssapi`
             LIBS="$gss_libs $LIBS"
-         elif test "$GSSAPI_ROOT" != "yes"; then
-            LDFLAGS="$LDFLAGS -L$GSSAPI_ROOT/lib$libsuff"
+         elif test "$PKGCONFIG" != "no" ; then
+            gss_libs=`$PKGCONFIG --libs mit-krb5-gssapi`