diff options
author | Jeremy Allison <jra@samba.org> | 2003-01-16 02:58:14 +0000 |
---|---|---|
committer | Jeremy Allison <jra@samba.org> | 2003-01-16 02:58:14 +0000 |
commit | cdc6c1662d4c150c69cd93991b211abb58b89859 (patch) | |
tree | b7c644b64f2299d4a8cf3b3342560e36ccc3aa5c | |
parent | 7dd7d3a96a9f23f1a7474625957fe3452222809a (diff) | |
download | samba-cdc6c1662d4c150c69cd93991b211abb58b89859.tar.gz samba-cdc6c1662d4c150c69cd93991b211abb58b89859.tar.bz2 samba-cdc6c1662d4c150c69cd93991b211abb58b89859.zip |
More Heimdal changes. Still not compiling with Heimdal yet...
Jeremy.
(This used to be commit 4333be5732de07786254382a4aa41333783d81b5)
-rwxr-xr-x | source3/configure | 2 | ||||
-rw-r--r-- | source3/configure.in | 2 | ||||
-rw-r--r-- | source3/include/config.h.in | 3 | ||||
-rw-r--r-- | source3/include/includes.h | 4 |
4 files changed, 9 insertions, 2 deletions
diff --git a/source3/configure b/source3/configure index 6029d93aee..b1771e1430 100755 --- a/source3/configure +++ b/source3/configure @@ -12299,7 +12299,7 @@ done # now check for gssapi headers. This is also done here to allow for # different kerberos include paths - for ac_hdr in gssapi.h gssapi/gssapi_generic.h gssapi/gssapi.h + for ac_hdr in gssapi.h gssapi/gssapi_generic.h gssapi/gssapi.h com_err.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 diff --git a/source3/configure.in b/source3/configure.in index 650cfe58a4..bf83ff85d6 100644 --- a/source3/configure.in +++ b/source3/configure.in @@ -2032,7 +2032,7 @@ fi # now check for gssapi headers. This is also done here to allow for # different kerberos include paths - AC_CHECK_HEADERS(gssapi.h gssapi/gssapi_generic.h gssapi/gssapi.h) + AC_CHECK_HEADERS(gssapi.h gssapi/gssapi_generic.h gssapi/gssapi.h com_err.h) ################################################################## # we might need the k5crypto and com_err libraries on some systems diff --git a/source3/include/config.h.in b/source3/include/config.h.in index 5dd453c4d2..0f90604ebc 100644 --- a/source3/include/config.h.in +++ b/source3/include/config.h.in @@ -875,6 +875,9 @@ /* Define if you have the <arpa/inet.h> header file. */ #undef HAVE_ARPA_INET_H +/* Define if you have the <com_err.h> header file. */ +#undef HAVE_COM_ERR_H + /* Define if you have the <compat.h> header file. */ #undef HAVE_COMPAT_H diff --git a/source3/include/includes.h b/source3/include/includes.h index d5153a196c..a02713e36f 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -424,6 +424,10 @@ #include <gssapi/gssapi_generic.h> #endif +#if HAVE_COM_ERR_H +#include <com_err.h> +#endif + /* we support ADS if we want it and have krb5 and ldap libs */ #if defined(WITH_ADS) && defined(HAVE_KRB5) && defined(HAVE_LDAP) #define HAVE_ADS |