]>
Commit | Line | Data |
---|---|---|
94e6777d JB |
1 | --- cyrus-sasl-2.1.25/cmulocal/sasl2.m4.orig 2011-09-17 07:31:51.000000000 +0200 |
2 | +++ cyrus-sasl-2.1.25/cmulocal/sasl2.m4 2011-09-17 08:24:54.480760162 +0200 | |
3 | @@ -221,11 +221,25 @@ | |
fd5b1a7b | 4 | elif test "$ac_cv_header_gssapi_h" = "yes"; then |
b74777fd JR |
5 | AC_EGREP_HEADER(GSS_C_NT_HOSTBASED_SERVICE, gssapi.h, |
6 | [AC_DEFINE(HAVE_GSS_C_NT_HOSTBASED_SERVICE,, | |
94e6777d JB |
7 | - [Define if your GSSAPI implementation defines GSS_C_NT_HOSTBASED_SERVICE])]) |
8 | + [Define if your GSSAPI implementation defines GSS_C_NT_HOSTBASED_SERVICE])], | |
b74777fd JR |
9 | + [AC_EGREP_CPP(hostbased_service_gss_nt_yes, |
10 | + [#include <gssapi.h> | |
11 | + #ifdef GSS_C_NT_HOSTBASED_SERVICE | |
12 | + hostbased_service_gss_nt_yes | |
13 | + #endif], | |
14 | + [AC_DEFINE(HAVE_GSS_C_NT_HOSTBASED_SERVICE,, | |
94e6777d | 15 | + [Define if your GSSAPI implementation defines GSS_C_NT_HOSTBASED_SERVICE])])]) |
fd5b1a7b | 16 | elif test "$ac_cv_header_gssapi_gssapi_h"; then |
b74777fd | 17 | AC_EGREP_HEADER(GSS_C_NT_HOSTBASED_SERVICE, gssapi/gssapi.h, |
fd5b1a7b | 18 | [AC_DEFINE(HAVE_GSS_C_NT_HOSTBASED_SERVICE,, |
94e6777d JB |
19 | - [Define if your GSSAPI implementation defines GSS_C_NT_HOSTBASED_SERVICE])]) |
20 | + [Define if your GSSAPI implementation defines GSS_C_NT_HOSTBASED_SERVICE])], | |
b74777fd JR |
21 | + [AC_EGREP_CPP(hostbased_service_gss_nt_yes, |
22 | + [#include <gssapi/gssapi.h> | |
23 | + #ifdef GSS_C_NT_HOSTBASED_SERVICE | |
24 | + hostbased_service_gss_nt_yes | |
25 | + #endif], | |
26 | + [AC_DEFINE(HAVE_GSS_C_NT_HOSTBASED_SERVICE,, | |
94e6777d | 27 | + [Define if your GSSAPI implementation defines GSS_C_NT_HOSTBASED_SERVICE])])]) |
fd5b1a7b | 28 | fi |
b74777fd JR |
29 | |
30 | if test "$gss_impl" = "cybersafe" -o "$gss_impl" = "cybersafe03"; then | |
94e6777d | 31 | @@ -240,13 +254,27 @@ |
fd5b1a7b | 32 | elif test "$ac_cv_header_gssapi_h" = "yes"; then |
b74777fd | 33 | AC_EGREP_HEADER(GSS_C_NT_USER_NAME, gssapi.h, |
fd5b1a7b | 34 | [AC_DEFINE(HAVE_GSS_C_NT_USER_NAME,, |
94e6777d JB |
35 | - [Define if your GSSAPI implementation defines GSS_C_NT_USER_NAME])]) |
36 | + [Define if your GSSAPI implementation defines GSS_C_NT_USER_NAME])], | |
b74777fd JR |
37 | + [AC_EGREP_CPP(user_name_yes_gss_nt, |
38 | + [#include <gssapi.h> | |
39 | + #ifdef GSS_C_NT_USER_NAME | |
40 | + user_name_yes_gss_nt | |
41 | + #endif], | |
42 | + [AC_DEFINE(HAVE_GSS_C_NT_USER_NAME,, | |
94e6777d JB |
43 | + [Define if your GSSAPI implementation defines GSS_C_NT_USER_NAME])])]) |
44 | AC_EGREP_HEADER(gss_inquire_attrs_for_mech, gssapi.h, rfc5587=yes) | |
45 | AC_EGREP_HEADER(gss_inquire_mech_for_saslname, gssapi.h, rfc5801=yes) | |
fd5b1a7b | 46 | elif test "$ac_cv_header_gssapi_gssapi_h"; then |
b74777fd | 47 | AC_EGREP_HEADER(GSS_C_NT_USER_NAME, gssapi/gssapi.h, |
fd5b1a7b | 48 | [AC_DEFINE(HAVE_GSS_C_NT_USER_NAME,, |
94e6777d JB |
49 | - [Define if your GSSAPI implementation defines GSS_C_NT_USER_NAME])]) |
50 | + [Define if your GSSAPI implementation defines GSS_C_NT_USER_NAME])], | |
b74777fd JR |
51 | + [AC_EGREP_CPP(user_name_yes_gss_nt, |
52 | + [#include <gssapi/gssapi.h> | |
53 | + #ifdef GSS_C_NT_USER_NAME | |
54 | + user_name_yes_gss_nt | |
55 | + #endif], | |
56 | + [AC_DEFINE(HAVE_GSS_C_NT_USER_NAME,, | |
94e6777d JB |
57 | + [Define if your GSSAPI implementation defines GSS_C_NT_USER_NAME])])]) |
58 | AC_EGREP_HEADER(gss_inquire_attrs_for_mech, gssapi/gssapi.h, rfc5587=yes) | |
59 | AC_EGREP_HEADER(gss_inquire_mech_for_saslname, gssapi.h, rfc5801=yes) | |
fd5b1a7b | 60 | fi |