Author: baggins Date: Mon Oct 4 09:54:37 2010 GMT Module: packages Tag: HEAD ---- Log message: - GSS_C_NT_HOSTBASED_SERVICE and GSS_C_NT_USER_NAME are defines in heimdal 1.4, and so cpp preprocesses them out. We have to check for them in a fail-safe way
---- Files affected: packages/cyrus-sasl: cyrus-sasl-gssapi-detect.patch (NONE -> 1.1) (NEW) ---- Diffs: ================================================================ Index: packages/cyrus-sasl/cyrus-sasl-gssapi-detect.patch diff -u /dev/null packages/cyrus-sasl/cyrus-sasl-gssapi-detect.patch:1.1 --- /dev/null Mon Oct 4 11:54:37 2010 +++ packages/cyrus-sasl/cyrus-sasl-gssapi-detect.patch Mon Oct 4 11:54:32 2010 @@ -0,0 +1,47 @@ +--- cyrus-sasl-2.1.23/cmulocal/sasl2.m4.orig 2010-10-04 01:53:48.000000000 +0200 ++++ cyrus-sasl-2.1.23/cmulocal/sasl2.m4 2010-10-04 02:05:55.252144435 +0200 +@@ -217,11 +217,19 @@ + [AC_WARN([Cybersafe define not found])]) + + elif test "$ac_cv_header_gssapi_h" = "yes"; then +- AC_EGREP_HEADER(GSS_C_NT_HOSTBASED_SERVICE, gssapi.h, +- [AC_DEFINE(HAVE_GSS_C_NT_HOSTBASED_SERVICE,, ++ AC_EGREP_CPP(hostbased_service_gss_nt_yes, ++ [#include <gssapi.h> ++ #ifdef GSS_C_NT_HOSTBASED_SERVICE ++ hostbased_service_gss_nt_yes ++ #endif], ++ [AC_DEFINE(HAVE_GSS_C_NT_HOSTBASED_SERVICE,, + [Define if your GSSAPI implimentation defines GSS_C_NT_HOSTBASED_SERVICE])]) + elif test "$ac_cv_header_gssapi_gssapi_h"; then +- AC_EGREP_HEADER(GSS_C_NT_HOSTBASED_SERVICE, gssapi/gssapi.h, ++ AC_EGREP_CPP(hostbased_service_gss_nt_yes, ++ [#include <gssapi/gssapi.h> ++ #ifdef GSS_C_NT_HOSTBASED_SERVICE ++ hostbased_service_gss_nt_yes ++ #endif], + [AC_DEFINE(HAVE_GSS_C_NT_HOSTBASED_SERVICE,, + [Define if your GSSAPI implimentation defines GSS_C_NT_HOSTBASED_SERVICE])]) + fi +@@ -236,11 +244,19 @@ + [Define if your GSSAPI implimentation defines GSS_C_NT_USER_NAME])], + [AC_WARN([Cybersafe define not found])]) + elif test "$ac_cv_header_gssapi_h" = "yes"; then +- AC_EGREP_HEADER(GSS_C_NT_USER_NAME, gssapi.h, ++ AC_EGREP_CPP(user_name_yes_gss_nt, ++ [#include <gssapi.h> ++ #ifdef GSS_C_NT_USER_NAME ++ user_name_yes_gss_nt ++ #endif], + [AC_DEFINE(HAVE_GSS_C_NT_USER_NAME,, + [Define if your GSSAPI implimentation defines GSS_C_NT_USER_NAME])]) + elif test "$ac_cv_header_gssapi_gssapi_h"; then +- AC_EGREP_HEADER(GSS_C_NT_USER_NAME, gssapi/gssapi.h, ++ AC_EGREP_CPP(user_name_yes_gss_nt, ++ [#include <gssapi/gssapi.h> ++ #ifdef GSS_C_NT_USER_NAME ++ user_name_yes_gss_nt ++ #endif], + [AC_DEFINE(HAVE_GSS_C_NT_USER_NAME,, + [Define if your GSSAPI implimentation defines GSS_C_NT_USER_NAME])]) + fi ================================================================ _______________________________________________ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
