svn commit: samba r20501 - in branches: SAMBA_3_0/source SAMBA_3_0/source/include SAMBA_3_0_24/source SAMBA_3_0_24/source/include

[vlendec at samba.org]

Author: vlendec
Date: 2007-01-03 08:55:22 +0000 (Wed, 03 Jan 2007)
New Revision: 20501

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

Log:
Check in config.h fix from Michael Adam <ma at sernet.de>
Modified:
   branches/SAMBA_3_0/source/configure.in
   branches/SAMBA_3_0/source/include/includes.h
   branches/SAMBA_3_0_24/source/configure.in
   branches/SAMBA_3_0_24/source/include/includes.h


Changeset:
Modified: branches/SAMBA_3_0/source/configure.in
===================================================================
--- branches/SAMBA_3_0/source/configure.in	2007-01-03 06:55:12 UTC (rev 20500)
+++ branches/SAMBA_3_0/source/configure.in	2007-01-03 08:55:22 UTC (rev 20501)
@@ -4,6 +4,7 @@
 AC_PREREQ(2.53)
 AC_INIT(include/includes.h)
 AC_CONFIG_HEADER(include/config.h)
+AC_DEFINE(CONFIG_H_IS_FROM_SAMBA,1,[Marker for samba's config.h])
 
 SMB_VERSION_STRING=`cat $srcdir/include/version.h | grep 'SAMBA_VERSION_OFFICIAL_STRING' | cut -d '"' -f2`
 echo "SAMBA VERSION: ${SMB_VERSION_STRING}"

Modified: branches/SAMBA_3_0/source/include/includes.h
===================================================================
--- branches/SAMBA_3_0/source/include/includes.h	2007-01-03 06:55:12 UTC (rev 20500)
+++ branches/SAMBA_3_0/source/include/includes.h	2007-01-03 08:55:22 UTC (rev 20501)
@@ -28,6 +28,14 @@
 
 #include "lib/replace/replace.h"
 
+/* make sure we have included the correct config.h */
+#ifndef NO_CONFIG_H /* for some tests */
+#ifndef CONFIG_H_IS_FROM_SAMBA
+#error "make sure you have removed all config.h files from standalone builds!"
+#error "the included config.h isn't from samba!"
+#endif
+#endif /* NO_CONFIG_H */
+
 /* only do the C++ reserved word check when we compile
    to include --with-developer since too many systems
    still have comflicts with their header files (e.g. IRIX 6.4) */

Modified: branches/SAMBA_3_0_24/source/configure.in
===================================================================
--- branches/SAMBA_3_0_24/source/configure.in	2007-01-03 06:55:12 UTC (rev 20500)
+++ branches/SAMBA_3_0_24/source/configure.in	2007-01-03 08:55:22 UTC (rev 20501)
@@ -4,6 +4,7 @@
 AC_PREREQ(2.53)
 AC_INIT(include/includes.h)
 AC_CONFIG_HEADER(include/config.h)
+AC_DEFINE(CONFIG_H_IS_FROM_SAMBA,1,[Marker for samba's config.h])
 
 SMB_VERSION_STRING=`cat $srcdir/include/version.h | grep 'SAMBA_VERSION_OFFICIAL_STRING' | cut -d '"' -f2`
 echo "SAMBA VERSION: ${SMB_VERSION_STRING}"

Modified: branches/SAMBA_3_0_24/source/include/includes.h
===================================================================
--- branches/SAMBA_3_0_24/source/include/includes.h	2007-01-03 06:55:12 UTC (rev 20500)
+++ branches/SAMBA_3_0_24/source/include/includes.h	2007-01-03 08:55:22 UTC (rev 20501)
@@ -28,6 +28,14 @@
 
 #include "lib/replace/replace.h"
 
+/* make sure we have included the correct config.h */
+#ifndef NO_CONFIG_H /* for some tests */
+#ifndef CONFIG_H_IS_FROM_SAMBA
+#error "make sure you have removed all config.h files from standalone builds!"
+#error "the included config.h isn't from samba!"
+#endif
+#endif /* NO_CONFIG_H */
+
 /* only do the C++ reserved word check when we compile
    to include --with-developer since too many systems
    still have comflicts with their header files (e.g. IRIX 6.4) */