2368d50570
Refresh the krb patch due to conflicts. There was one case where it added libs to GSSAPI_INCS which seems weird, so I dropped it from the refresh.
44 lines
2.0 KiB
Diff
44 lines
2.0 KiB
Diff
--- curl-8.10.0/configure.ac.orig 2024-09-11 10:12:56.742850600 +0200
|
|
+++ curl-8.10.0/configure.ac 2024-09-11 10:24:56.074187600 +0200
|
|
@@ -1846,15 +1846,15 @@
|
|
AC_MSG_RESULT(yes)
|
|
|
|
if test $GSSAPI_ROOT != "/usr"; then
|
|
- CURL_CHECK_PKGCONFIG(mit-krb5-gssapi, $GSSAPI_ROOT/lib/pkgconfig)
|
|
+ CURL_CHECK_PKGCONFIG(krb5-gssapi, $GSSAPI_ROOT/lib/pkgconfig)
|
|
else
|
|
- CURL_CHECK_PKGCONFIG(mit-krb5-gssapi)
|
|
+ CURL_CHECK_PKGCONFIG(krb5-gssapi)
|
|
fi
|
|
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 "$PKGCONFIG" != "no"; then
|
|
- GSSAPI_INCS=`$PKGCONFIG --cflags mit-krb5-gssapi`
|
|
+ GSSAPI_INCS=`$PKGCONFIG --cflags krb5-gssapi`
|
|
elif test -f "$KRB5CONFIG"; then
|
|
GSSAPI_INCS=`$KRB5CONFIG --cflags gssapi`
|
|
elif test "$GSSAPI_ROOT" != "yes"; then
|
|
@@ -1938,17 +1938,17 @@
|
|
;;
|
|
*)
|
|
if test $GSSAPI_ROOT != "/usr"; then
|
|
- CURL_CHECK_PKGCONFIG(mit-krb5-gssapi, $GSSAPI_ROOT/lib/pkgconfig)
|
|
+ CURL_CHECK_PKGCONFIG(krb5-gssapi, $GSSAPI_ROOT/lib/pkgconfig)
|
|
else
|
|
- CURL_CHECK_PKGCONFIG(mit-krb5-gssapi)
|
|
+ CURL_CHECK_PKGCONFIG(krb5-gssapi)
|
|
fi
|
|
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/$host_alias-krb5-config --libs gssapi`
|
|
+ gss_libs=`$GSSAPI_ROOT/bin/$host_alias-krb5-config --deps --libs gssapi`
|
|
LIBS="$gss_libs $LIBS"
|
|
elif test "$PKGCONFIG" != "no"; then
|
|
- gss_libs=`$PKGCONFIG --libs mit-krb5-gssapi`
|
|
+ gss_libs=`$PKGCONFIG --static --libs krb5-gssapi`
|
|
LIBS="$gss_libs $LIBS"
|
|
elif test -f "$KRB5CONFIG"; then
|
|
dnl krb5-config doesn't have --libs-only-L or similar, put everything
|