r8312: fixed some heimdal header checks from watching the build farm failures

when we added heimdal we dropped from 10 passing builds to 1, but hopefully
that will go up with a bit of effort
(This used to be commit 753d7ab715701a162689ffe9cdff7c56fcf7f2a2)

diff --git a/source4/heimdal_build/config.m4 b/source4/heimdal_build/config.m4
index 365f4061e52bd4e5b4cf5e60e9eea547f2cb496a..b41fde236bf70ea2ebf9bd0cb9852c20d160c4fa 100644 (file)
--- a/source4/heimdal_build/config.m4
+++ b/source4/heimdal_build/config.m4
@@ -1,5 +1,5 @@
-AC_CHECK_HEADERS(sys/file.h signal.h errno.h crypt.h curses.h sys/bittypes.h)
-AC_CHECK_HEADERS(sys/stropts.h sys/timeb.h sys/times.h sys/uio.h sys/un.h)
+AC_CHECK_HEADERS(sys/file.h signal.h errno.h crypt.h curses.h sys/bitypes.h)
+AC_CHECK_HEADERS(sys/stropts.h sys/timeb.h sys/times.h sys/uio.h sys/un.h inttypes.h)
 AC_CHECK_HEADERS(sys/utsname.h termcap.h term.h timezone.h time.h ttyname.h netdb.h)
 
 AC_CHECK_FUNCS(setitimer uname umask unsetenv socket sendmsg putenv atexit strsep)

diff --git a/source4/heimdal_build/krb5-types.h b/source4/heimdal_build/krb5-types.h
index 68a8bc0da4973b1cacd335004931d859932f8009..fc366545fc204d5400b7fa5d552da8c639b2ebb6 100644 (file)
--- a/source4/heimdal_build/krb5-types.h
+++ b/source4/heimdal_build/krb5-types.h
@@ -4,9 +4,15 @@
 #ifndef __krb5_types_h__
 #define __krb5_types_h__
 
+#if HAVE_INTTYPES_H
 #include <inttypes.h>
+#endif
+#if HAVE_SYS_TYPES_H
 #include <sys/types.h>
+#endif
+#if HAVE_SYS_BITYPES_H
 #include <sys/bitypes.h>
+#endif
 #include <sys/socket.h>