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)

diff --git a/source4/heimdal_build/config.h b/source4/heimdal_build/config.h
index f7adedd2d45614b7f1a90808d4f859a75ece5fb4..35f7d3e017d89264405a227e3db49ff97addcf4e 100644 (file)
--- a/source4/heimdal_build/config.h
+++ b/source4/heimdal_build/config.h
@@ -29,9 +29,6 @@
 
 #define VERSIONLIST {"Lorikeet-Heimdal, Modified for Samba4 0.7rc1"}
 
-/* even if we do have dlopen, we don't want heimdal using it */
-#undef HAVE_DLOPEN
-
 #define VERSION "Samba"
 
 #define ROKEN_LIB_FUNCTION
@@ -39,29 +36,9 @@
 /* these should be done with configure tests */
 #define KRB5
 
-/* we need to tell roken about the functions that Samba replaces in lib/replace */
-#ifndef HAVE_SETEUID
-#define HAVE_SETEUID 1
-#endif
-
 #define GETHOSTBYADDR_PROTO_COMPATIBLE
 #define GETSERVBYNAME_PROTO_COMPATIBLE
 #define OPENLOG_PROTO_COMPATIBLE
 #define GETSOCKNAME_PROTO_COMPATIBLE
 
-#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
-
 #endif

diff --git a/source4/heimdal_build/roken.h b/source4/heimdal_build/roken.h
index 1b9c2f0663b512565b24cf08496ca6ee7c5852a5..2af82b9e1b57a76ff0c410576db3a15050f55140 100644 (file)
--- 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