summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeremy Allison <jra@samba.org>2003-01-16 02:58:25 +0000
committerJeremy Allison <jra@samba.org>2003-01-16 02:58:25 +0000
commite4af5eaca6f0fc681733f618562d58c26745978f (patch)
treede24ecf5efc917c89d53d0ef96dcb141d9b8ef36
parent4375fe73ba32db2682cedf9c7b68a269e3c17f6e (diff)
downloadsamba-e4af5eaca6f0fc681733f618562d58c26745978f.tar.gz
samba-e4af5eaca6f0fc681733f618562d58c26745978f.tar.bz2
samba-e4af5eaca6f0fc681733f618562d58c26745978f.zip
More Heimdal changes. Still not compiling with Heimdal yet...
Jeremy. (This used to be commit c3544c119e4cafb817479b4c5dfae178c3de000b)
-rwxr-xr-xsource3/configure2
-rw-r--r--source3/configure.in2
-rw-r--r--source3/include/config.h.in3
-rw-r--r--source3/include/includes.h4
4 files changed, 9 insertions, 2 deletions
diff --git a/source3/configure b/source3/configure
index 016604526b..86d4f6d28e 100755
--- a/source3/configure
+++ b/source3/configure
@@ -12301,7 +12301,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 ad778bf88d..ee94c89b40 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 6d1890b0bd..f684522366 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 add8ba91d8..eb89d6f2af 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