Merge branch 'master' of ssh://git.samba.org/data/git/samba into noejs

[sfrench/samba-autobuild/.git] / source4 / heimdal_build / config.h

diff --git a/source4/heimdal_build/config.h b/source4/heimdal_build/config.h
index 375239c459422fc4c6530a2e439c27ee1286370e..e15c6effa8207e3a7192eaf7472149469e2236f5 100644 (file)
--- a/source4/heimdal_build/config.h
+++ b/source4/heimdal_build/config.h
@@ -3,36 +3,24 @@
   Samba source tree
 */
 
-/* bring in the samba4 config.h */
+#ifndef HAVE_HEIMDAL_CONFIG_H
+#define HAVE_HEIMDAL_CONFIG_H
+
 #include "include/config.h"
+#include "../replace/replace.h"
 
-#define RCSID(msg) \
-static /**/const char *const rcsid[] = { (const char *)rcsid, "\100(#)" msg }
+#define RCSID(msg) struct __rcsid { int __rcsdi; }
+#define KRB5
 
+/* This needs to be defined for roken too */
 #ifdef VOID_RETSIGTYPE
 #define SIGRETURN(x) return
 #else
 #define SIGRETURN(x) return (RETSIGTYPE)(x)
 #endif
 
-#ifndef MAXPATHLEN
-#define MAXPATHLEN (1024+4)
-#endif
-
-/* path to sysconf - should we force this to samba LIBDIR ? */
-#define SYSCONFDIR "/etc"
-
-#define KRB5
+#define HDB_DB_DIR ""
 
-/* Maximum values on all known systems */
-#define MaxHostNameLen (64+4)
-#define MaxPathLen (1024+4)
+#undef HAVE_KRB5_ENCRYPT_BLOCK
 
-#define HAVE_H_ERRNO
-
-#define HAVE_LONG_LONG 1
-
-#define VERSIONLIST {"Lorikeet-Heimdal, Modified for Samba4 0.7rc1"}
-
-
-#undef HAVE_DLOPEN
+#endif