svn commit: samba r19242 - in branches/SAMBA_4_0/source: include lib/replace

[metze at samba.org]

Author: metze
Date: 2006-10-11 11:52:49 +0000 (Wed, 11 Oct 2006)
New Revision: 19242

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

Log:
merge from samba3:

handle NO_CONFIG_H in libreplace

metze
Modified:
   branches/SAMBA_4_0/source/include/includes.h
   branches/SAMBA_4_0/source/lib/replace/replace.h


Changeset:
Modified: branches/SAMBA_4_0/source/include/includes.h
===================================================================
--- branches/SAMBA_4_0/source/include/includes.h	2006-10-11 11:41:39 UTC (rev 19241)
+++ branches/SAMBA_4_0/source/include/includes.h	2006-10-11 11:52:49 UTC (rev 19242)
@@ -21,17 +21,16 @@
    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 */
 
-#ifndef NO_CONFIG_H /* for some tests */
 #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 */
- 
+
 #include "local.h"
 
 #ifdef __GNUC__

Modified: branches/SAMBA_4_0/source/lib/replace/replace.h
===================================================================
--- branches/SAMBA_4_0/source/lib/replace/replace.h	2006-10-11 11:41:39 UTC (rev 19241)
+++ branches/SAMBA_4_0/source/lib/replace/replace.h	2006-10-11 11:52:49 UTC (rev 19242)
@@ -28,7 +28,9 @@
 #ifndef _LIBREPLACE_REPLACE_H
 #define _LIBREPLACE_REPLACE_H
 
+#ifndef NO_CONFIG_H
 #include "config.h"
+#endif
 
 #ifdef HAVE_STANDARDS_H
 #include <standards.h>