From 48ee5df79e2892888c0dd57322b7656df9d4970f Mon Sep 17 00:00:00 2001 From: Stefan Becker Date: Fri, 18 Oct 2013 21:50:14 +0300 Subject: [PATCH] configure: rewrite check for GSSAPI headers & libs Check for the headers & functions we are actually using in the code. --- configure.ac | 28 ++++++++++++++++++---------- 1 file changed, 18 insertions(+), 10 deletions(-) diff --git a/configure.ac b/configure.ac index c3ed91a8..112e6541 100644 --- a/configure.ac +++ b/configure.ac @@ -157,21 +157,29 @@ AS_IF([test "x$with_krb5" = xno], [], dnl disabled by user KRB5_LDFLAGS="" dnl same as AC_CHECK_LIB() - LIBS="$LIBS `krb5-config --libs gssapi 2>/dev/null`" - AC_DEFINE(HAVE_LIBKRB5, 1, [Define to 1 if you have the `krb5' library (-lkrb5)])], + LIBS="$LIBS `krb5-config --libs gssapi 2>/dev/null`"], [AC_MSG_RESULT(no) with_krb5=no])], [ dnl path specified by user KRB5_CFLAGS="-I${with_krb5}/include" KRB5_LDFLAGS="-L${with_krb5}/lib" - ac_save_LDFLAGS="$LDLAGS" - LDFLAGS="$LDFLAGS $KRB5_LDFLAGS" - AC_CHECK_LIB(krb5, krb5_rd_req, [], - [AC_CHECK_LIB(krb5, krb5_rd_req, [], - [AC_ERROR(Kerberos 5 libraries not found)])]) - AC_CHECK_LIB(gssapi_krb5, gss_krb5_export_lucid_sec_context, [], - [AC_ERROR(GSSAPI Kerberos 5 libraries not found)]) - LDFLAGS="$ac_save_LDFLAGS"]) + ]) +AS_IF([test "x$with_krb5" != xno], + [ac_save_CFLAGS="$CFLAGS" + ac_save_LDFLAGS="$LDLAGS" + CFLAGS="$CFLAGS $KRB5_CFLAGS" + LDFLAGS="$LDFLAGS $KRB5_LDFLAGS" + AC_CHECK_HEADERS([gssapi/gssapi.h gssapi/gssapi_ext.h gssapi/gssapi_krb5.h], + , + [AC_ERROR([GSSAPI headers not found])]) + AC_CHECK_FUNC([gss_acquire_cred_with_password], + , + [AC_ERROR([GSSAPI libraries not found])]) + CFLAGS="$ac_save_CFLAGS" + LDFLAGS="$ac_save_LDFLAGS" + AC_DEFINE(HAVE_LIBKRB5, 1, [Define to 1 ifyou have the `krb5' library (-lkrb5)]) + ]) + AM_CONDITIONAL(SIP_SEC_KRB5, [test "x$with_krb5" != xno]) AC_SUBST(KRB5_CFLAGS) AC_SUBST(KRB5_LDFLAGS) -- 2.11.4.GIT