[PATCH] configure: Don't check for gssapi-krb5 if krb5 is missing
Andrew Eikum
aeikum at codeweavers.com
Thu Dec 19 09:35:03 CST 2019
This works around a broken krb5 package in CentOS which is missing a
dependency. configure would find gssapi-krb5, but not krb5, which would
cause a build failure later in <dlls/kerberos>.
Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48314
Signed-off-by: Andrew Eikum <aeikum at codeweavers.com>
---
configure.ac | 29 ++++++++++++++++-------------
1 file changed, 16 insertions(+), 13 deletions(-)
diff --git a/configure.ac b/configure.ac
index 8a121bce016..c8399de6ebf 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1825,21 +1825,24 @@ 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.])
dnl **** Check for gssapi ****
-if test "x$with_gssapi" != "xno"
+if test "x$ac_cv_lib_soname_krb5" != "x" -o "x$with_gssapi" = "xyes"
then
- WINE_PACKAGE_FLAGS(GSSAPI,[krb5-gssapi],,
- [`${KRB5_CONFIG:-krb5-config} --cflags gssapi 2>/dev/null`],
- [`${KRB5_CONFIG:-krb5-config} --libs gssapi 2>/dev/null`],
- [AC_CHECK_HEADERS([gssapi/gssapi.h gssapi/gssapi_ext.h])
- if test "$ac_cv_header_gssapi_gssapi_h" = "yes" -a "$ac_cv_header_gssapi_gssapi_ext_h" = "yes"
- then
- WINE_CHECK_SONAME(gssapi_krb5, gss_init_sec_context,,[GSSAPI_CFLAGS=""],[$GSSAPI_LIBS])
- else
- GSSAPI_CFLAGS=""
- fi])
+ if test "x$with_gssapi" != "xno"
+ then
+ WINE_PACKAGE_FLAGS(GSSAPI,[krb5-gssapi],,
+ [`${KRB5_CONFIG:-krb5-config} --cflags gssapi 2>/dev/null`],
+ [`${KRB5_CONFIG:-krb5-config} --libs gssapi 2>/dev/null`],
+ [AC_CHECK_HEADERS([gssapi/gssapi.h gssapi/gssapi_ext.h])
+ if test "$ac_cv_header_gssapi_gssapi_h" = "yes" -a "$ac_cv_header_gssapi_gssapi_ext_h" = "yes"
+ then
+ WINE_CHECK_SONAME(gssapi_krb5, gss_init_sec_context,,[GSSAPI_CFLAGS=""],[$GSSAPI_LIBS])
+ else
+ GSSAPI_CFLAGS=""
+ fi])
+ fi
+ WINE_NOTICE_WITH(gssapi,[test "x$ac_cv_lib_soname_gssapi_krb5" = "x"],
+ [libgssapi_krb5 ${notice_platform}development files not found (or too old), no Kerberos SSP support.])
fi
-WINE_NOTICE_WITH(gssapi,[test "x$ac_cv_lib_soname_gssapi_krb5" = "x"],
- [libgssapi_krb5 ${notice_platform}development files not found (or too old), no Kerberos SSP support.])
dnl **** Check for libjpeg ****
if test "x$with_jpeg" != "xno"
--
2.24.1
More information about the wine-devel
mailing list