From: Stefan Metzmacher <metze@samba.org>
Date: Wed, 11 Oct 2006 11:52:49 +0000 (+0000)
Subject: r19242: merge from samba3:
X-Git-Tag: samba-4.0.0alpha6~801^3~4524
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b6582987fe25ef3d54034f2f27a052664a298f3e;p=thirdparty%2Fsamba.git

r19242: merge from samba3:

handle NO_CONFIG_H in libreplace

metze
(This used to be commit 909d736a4bf5a7adfcd64eecf6bb2a92211c6f96)
---

diff --git a/source4/include/includes.h b/source4/include/includes.h
index c4ee86b3b9c..a2c8b3472d6 100644
--- a/source4/include/includes.h
+++ b/source4/include/includes.h
@@ -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__
diff --git a/source4/lib/replace/replace.h b/source4/lib/replace/replace.h
index 8943c7d6374..7a79f335e27 100644
--- a/source4/lib/replace/replace.h
+++ b/source4/lib/replace/replace.h
@@ -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>