summaryrefslogtreecommitdiff
path: root/source4
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2006-09-07 04:24:54 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 14:17:48 -0500
commit4262be2e45a6d8c52fec909daa4efc18551206fc (patch)
tree65634ca7b1802ffc347f5a68a4748f8481581f3f /source4
parent9ca2814c3f90210a05ce367ccfe56a77cbd18a68 (diff)
downloadsamba-4262be2e45a6d8c52fec909daa4efc18551206fc.tar.gz
samba-4262be2e45a6d8c52fec909daa4efc18551206fc.tar.bz2
samba-4262be2e45a6d8c52fec909daa4efc18551206fc.zip
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)
Diffstat (limited to 'source4')
-rw-r--r--source4/heimdal_build/config.h23
-rw-r--r--source4/heimdal_build/roken.h26
2 files changed, 26 insertions, 23 deletions
diff --git a/source4/heimdal_build/config.h b/source4/heimdal_build/config.h
index f7adedd2d4..35f7d3e017 100644
--- 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 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