Module: wine Branch: master Commit: 382df5d14db2d101e89b36574bf343bef32750c4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=382df5d14db2d101e89b36574...
Author: Alexandre Julliard julliard@winehq.org Date: Thu Dec 19 15:24:01 2019 +0100
configure: Disable gssapi also when linking with kerberos doesn't work.
Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48314 Signed-off-by: Alexandre Julliard julliard@winehq.org
---
configure | 3 +-- configure.ac | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/configure b/configure index 61327c673d..f8e2f69801 100755 --- a/configure +++ b/configure @@ -15747,8 +15747,6 @@ CPPFLAGS=$ac_save_CPPFLAGS test -z "$KRB5_CFLAGS" || KRB5_CFLAGS=`echo " $KRB5_CFLAGS" | sed 's/ -I([^/])/ -I$(top_builddir)/\1/g'` test -z "$KRB5_LIBS" || KRB5_LIBS=`echo " $KRB5_LIBS" | sed 's/ -L([^/])/ -L$(top_builddir)/\1/g'`
-else - with_gssapi=${with_gssapi:-no} fi if test "x$ac_cv_lib_soname_krb5" = "x"; then : case "x$with_krb5" in @@ -15759,6 +15757,7 @@ This is an error since --with-krb5 was requested." "$LINENO" 5 ;; esac
fi +test "x$ac_cv_lib_soname_krb5" != "x" || with_gssapi=${with_gssapi:-no}
if test "x$with_gssapi" != "xno" then diff --git a/configure.ac b/configure.ac index 8a121bce01..e347738961 100644 --- a/configure.ac +++ b/configure.ac @@ -1818,11 +1818,10 @@ then else KRB5_CFLAGS="" fi]) -else - with_gssapi=${with_gssapi:-no} fi WINE_NOTICE_WITH(krb5,[test "x$ac_cv_lib_soname_krb5" = "x"], [libkrb5 ${notice_platform}development files not found (or too old), Kerberos won't be supported.]) +test "x$ac_cv_lib_soname_krb5" != "x" || with_gssapi=${with_gssapi:-no}
dnl **** Check for gssapi **** if test "x$with_gssapi" != "xno"