From 820492ba79aba44ab35dd7af7c0e8cafab61f114 Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Thu, 7 Sep 2006 04:52:06 +0000 Subject: r18203: rearranged the overrides in heimdal_build/*.h to avoid the use of heimdal_build/config.h from interfering with libreplace This is a workaround for the fact that with the current CFLAGS and dependencies system, -Iheimdal_build is put at the front of the includes list, which means it overrides the normal config.h (This used to be commit 84335903ceaf2242e43a0c5464e33408daec44b4) --- source4/heimdal_build/roken.h | 26 ++++++++++++++++++++++---- 1 file changed, 22 insertions(+), 4 deletions(-) (limited to 'source4/heimdal_build/roken.h') diff --git a/source4/heimdal_build/roken.h b/source4/heimdal_build/roken.h index 2af82b9e1b..00632c7835 100644 --- a/source4/heimdal_build/roken.h +++ b/source4/heimdal_build/roken.h @@ -1,9 +1,29 @@ /* - a wrapper to avoid double inclusion of the real roken.h + a wrapper to override some of the defines that the heimdal roken system looks at */ #ifndef _ROKEN_H_ #define _ROKEN_H_ -#include "heimdal_build/config.h" + +/* path to sysconf - should we force this to samba LIBDIR ? */ +#define SYSCONFDIR "/etc" + +/* HDB module dir - set to Samba LIBDIR/hdb ? */ +#define HDBDIR "/usr/heimdal/lib" + +/* Maximum values on all known systems */ +#define MaxHostNameLen (64+4) +#define MaxPathLen (1024+4) + +#define VERSIONLIST {"Lorikeet-Heimdal, Modified for Samba4 0.7rc1"} + +#define VERSION "Samba" + +#define ROKEN_LIB_FUNCTION + +#define GETHOSTBYADDR_PROTO_COMPATIBLE +#define GETSERVBYNAME_PROTO_COMPATIBLE +#define OPENLOG_PROTO_COMPATIBLE +#define GETSOCKNAME_PROTO_COMPATIBLE /* even if we do have dlopen, we don't want heimdal using it */ #undef HAVE_DLOPEN @@ -28,7 +48,5 @@ #define HAVE_SSIZE_T #endif - - #include "heimdal/lib/roken/roken.h" #endif -- cgit