This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "GNU gsasl".
http://git.savannah.gnu.org/cgit/gsasl.git/commit/?id=7678bbbc9e53cecb845beb2e2bfdc21e57501355 The branch, master has been updated via 7678bbbc9e53cecb845beb2e2bfdc21e57501355 (commit) from 7e704ee685a77469b542ae16d6b76586df8bd44f (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 7678bbbc9e53cecb845beb2e2bfdc21e57501355 Author: Simon Josefsson <[email protected]> Date: Wed Mar 10 13:01:41 2010 +0100 Improve GSSAPI library detection code. Some systems (e.g., Mac OS X) still doesn't have gssapi.h, only gssapi/gssapi.h. ----------------------------------------------------------------------- Summary of changes: lib/configure.ac | 20 ++++++++++++++++++-- lib/gs2/client.c | 4 +++- lib/gs2/gs2helper.c | 4 +++- lib/gs2/server.c | 4 +++- lib/gssapi/client.c | 4 +++- lib/gssapi/server.c | 4 +++- 6 files changed, 33 insertions(+), 7 deletions(-) diff --git a/lib/configure.ac b/lib/configure.ac index 89181c7..6d240d8 100644 --- a/lib/configure.ac +++ b/lib/configure.ac @@ -191,6 +191,10 @@ if test "$gs2" = no && test "$gssapi" = no; then else AC_MSG_NOTICE([checking for GSS implementation ($gssapi_impl)]) fi + +save_CPPFLAGS="$CPPFLAGS" +save_LIBS="$LIBS" + if test "$gssapi_impl" = "gss"; then AC_MSG_NOTICE([trying GSS]) AC_LIB_HAVE_LINKFLAGS(gss,, [#include <gss.h>], [gss_check_version (0);]) @@ -218,9 +222,9 @@ elif test "$gssapi_impl" = "heimdal"; then AC_MSG_WARN([Heimdal krb5-config not found, disabling GSSAPI]) gssapi_impl=no fi -elif test "$gssapi_impl" != "no" ; then +elif test "$gssapi_impl" != "no"; then AC_MSG_NOTICE([auto-detecing GSS/MIT/Heimdal]) - AC_MSG_NOTICE([use --with-gssapi-impl=IMPL to override]) + AC_MSG_NOTICE([use --with-gssapi-impl=IMPL to hard code]) AC_MSG_NOTICE([where IMPL is `gss', `mit', or `heimdal']) AC_LIB_HAVE_LINKFLAGS(gss,, [#include <gss.h>], [gss_check_version (0);]) if test "$ac_cv_libgss" = yes; then @@ -245,6 +249,18 @@ elif test "$gssapi_impl" != "no" ; then fi fi +if test "$gssapi_impl" = "mit" -o \ + "$gssapi_impl" = "heimdal" -o \ + "$gssapi_impl" = "mitheimdal"; then + AC_CHECK_HEADERS([gssapi.h gssapi/gssapi.h]) + if test "$ac_cv_header_gssapi_h$ac_cv_header_gssapi_gssapi_h" = "nono"; then + gssapi_impl=no + AC_MSG_WARN([Cannot find gssapi.h or gssapi/gssapi.h, disabling GSSAPI]) + CPPFLAGS="$save_CPPFLAGS" + LIBS="$save_LIBS" + fi +fi + # Disable GSSAPI/GS2 if we can't find GSS-API implementation if test "$gssapi_impl" = "no"; then gs2=no diff --git a/lib/gs2/client.c b/lib/gs2/client.c index c0f2740..19705fb 100644 --- a/lib/gs2/client.c +++ b/lib/gs2/client.c @@ -35,8 +35,10 @@ #ifdef HAVE_LIBGSS # include <gss.h> -#else +#elif HAVE_GSSAPI_H # include <gssapi.h> +#elif HAVE_GSSAPI_GSSAPI_H +# include <gssapi/gssapi.h> #endif #include "gs2helper.h" diff --git a/lib/gs2/gs2helper.c b/lib/gs2/gs2helper.c index 2e370f4..b235772 100644 --- a/lib/gs2/gs2helper.c +++ b/lib/gs2/gs2helper.c @@ -29,8 +29,10 @@ #ifdef HAVE_LIBGSS # include <gss.h> -#else +#elif HAVE_GSSAPI_H # include <gssapi.h> +#elif HAVE_GSSAPI_GSSAPI_H +# include <gssapi/gssapi.h> #endif /* Get specification. */ diff --git a/lib/gs2/server.c b/lib/gs2/server.c index 6727096..0b0bd74 100644 --- a/lib/gs2/server.c +++ b/lib/gs2/server.c @@ -35,8 +35,10 @@ #ifdef HAVE_LIBGSS # include <gss.h> -#else +#elif HAVE_GSSAPI_H # include <gssapi.h> +#elif HAVE_GSSAPI_GSSAPI_H +# include <gssapi/gssapi.h> #endif struct _Gsasl_gs2_server_state diff --git a/lib/gssapi/client.c b/lib/gssapi/client.c index 59c8f52..a060baa 100644 --- a/lib/gssapi/client.c +++ b/lib/gssapi/client.c @@ -35,8 +35,10 @@ #ifdef HAVE_LIBGSS # include <gss.h> -#else +#elif HAVE_GSSAPI_H # include <gssapi.h> +#elif HAVE_GSSAPI_GSSAPI_H +# include <gssapi/gssapi.h> #endif struct _Gsasl_gssapi_client_state diff --git a/lib/gssapi/server.c b/lib/gssapi/server.c index aafc8aa..ae5f737 100644 --- a/lib/gssapi/server.c +++ b/lib/gssapi/server.c @@ -35,8 +35,10 @@ #ifdef HAVE_LIBGSS # include <gss.h> -#else +#elif HAVE_GSSAPI_H # include <gssapi.h> +#elif HAVE_GSSAPI_GSSAPI_H +# include <gssapi/gssapi.h> #endif struct _Gsasl_gssapi_server_state hooks/post-receive -- GNU gsasl _______________________________________________ Gsasl-commit mailing list [email protected] http://lists.gnu.org/mailman/listinfo/gsasl-commit
