heimdal_build: Use consistent name for heimbase.

[kai/samba.git] / source4 / heimdal_build / config.h

diff --git a/source4/heimdal_build/config.h b/source4/heimdal_build/config.h
index 6bbe94715556e8bb74a2c9f4ca5d0bfd9dea047f..0fdb292c9655963d307790cde0e64a23a7a918fc 100644 (file)
--- a/source4/heimdal_build/config.h
+++ b/source4/heimdal_build/config.h
@@ -4,46 +4,46 @@
 */
 
 #ifndef HAVE_HEIMDAL_CONFIG_H
-#define HAVE_HEIMDAL_CONFIG_H 1
+#define HAVE_HEIMDAL_CONFIG_H
 
-/* bring in the samba4 config.h */
 #include "include/config.h"
+#include "../replace/replace.h"
+#include "../lib/util/attr.h"
+#define HEIMDAL_NORETURN_ATTRIBUTE _NORETURN_
+#define HEIMDAL_PRINTF_ATTRIBUTE(x) FORMAT_ATTRIBUTE(x)
+#define VERSIONLIST {"Lorikeet-Heimdal, Modified for Samba4"}
 
-#ifdef HAVE_KRB5
+#define VERSION "Samba"
+
+#define PACKAGE VERSION
+#define PACKAGE_BUGREPORT "https://bugzilla.samba.org/"
+#define PACKAGE_VERSION VERSION
 
-#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
 
-/* path to sysconf - should we force this to samba LIBDIR ? */
-#define SYSCONFDIR "/etc"
-
-
-/* Maximum values on all known systems */
-#define MaxHostNameLen (64+4)
-#define MaxPathLen (1024+4)
-
-#define VERSIONLIST {"Lorikeet-Heimdal, Modified for Samba4 0.7rc1"}
+#define HDB_DB_DIR ""
 
-/* even if we do have dlopen, we don't want heimdal using it */
-#undef HAVE_DLOPEN
+#undef HAVE_KRB5_ENCRYPT_BLOCK
 
-#define VERSION "Samba"
-
-#define ROKEN_LIB_FUNCTION
-
-/* these should be done with configure tests */
-#define KRB5
-#define HAVE_LONG_LONG
+/* Because it can't be defined in roken.h */
+#ifndef USE_HCRYPTO_IMATH
+#define USE_HCRYPTO_IMATH
+#endif
 
-#include <sys/types.h>
-#include <stdarg.h>
-#include "lib/replace/replace.h"
+/*Workaround for heimdal define vs samba define*/
+#ifdef HAVE_LIBINTL_H
+#define LIBINTL
 #endif
 
+/* heimdal now wants some atomic ops - ask for the non-atomic ones for Samba */
+#define HEIM_BASE_NON_ATOMIC 1
+
 #endif