svn commit: samba r18202 - in branches/SAMBA_4_0/source/heimdal_build: .

tridge at samba.org tridge at samba.org
Thu Sep 7 04:24:54 GMT 2006


Author: tridge
Date: 2006-09-07 04:24:54 +0000 (Thu, 07 Sep 2006)
New Revision: 18202

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=18202

Log:

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

Modified:
   branches/SAMBA_4_0/source/heimdal_build/config.h
   branches/SAMBA_4_0/source/heimdal_build/roken.h


Changeset:
Modified: branches/SAMBA_4_0/source/heimdal_build/config.h
===================================================================
--- branches/SAMBA_4_0/source/heimdal_build/config.h	2006-09-07 04:17:23 UTC (rev 18201)
+++ branches/SAMBA_4_0/source/heimdal_build/config.h	2006-09-07 04:24:54 UTC (rev 18202)
@@ -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

Modified: branches/SAMBA_4_0/source/heimdal_build/roken.h
===================================================================
--- branches/SAMBA_4_0/source/heimdal_build/roken.h	2006-09-07 04:17:23 UTC (rev 18201)
+++ branches/SAMBA_4_0/source/heimdal_build/roken.h	2006-09-07 04:24:54 UTC (rev 18202)
@@ -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



More information about the samba-cvs mailing list