From 4262be2e45a6d8c52fec909daa4efc18551206fc Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Thu, 7 Sep 2006 04:24:54 +0000 Subject: r18202: moved the overrides for HAVE_xxx from heimdal_build/config.h to heimdal_build/roken.h 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 dc2580f0fd67687cbe4b590a7fed9fde0db4a4a0) --- source4/heimdal_build/roken.h | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) (limited to 'source4/heimdal_build/roken.h') diff --git a/source4/heimdal_build/roken.h b/source4/heimdal_build/roken.h index 1b9c2f0663..2af82b9e1b 100644 --- a/source4/heimdal_build/roken.h +++ b/source4/heimdal_build/roken.h @@ -4,5 +4,31 @@ #ifndef _ROKEN_H_ #define _ROKEN_H_ #include "heimdal_build/config.h" + +/* even if we do have dlopen, we don't want heimdal using it */ +#undef HAVE_DLOPEN + +/* we need to tell roken about the functions that Samba replaces in lib/replace */ +#ifndef HAVE_SETEUID +#define HAVE_SETEUID 1 +#endif + +#ifndef HAVE_SOCKLEN_T +#define HAVE_SOCKLEN_T +#endif + +#ifndef HAVE_STRNDUP +#define HAVE_STRNDUP +#endif +#ifndef HAVE_SOCKLEN_T +#define HAVE_SOCKLEN_T +#endif + +#ifndef HAVE_SSIZE_T +#define HAVE_SSIZE_T +#endif + + + #include "heimdal/lib/roken/roken.h" #endif -- cgit