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 c4ee86b3b9c2a29b4bed34387c691d3f9efc7350..a2c8b3472d6a29ed3236cff8af42c967dec65dea 100644 (file)
--- 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 8943c7d637434a5776e3935d6c0d39ff8edfab0a..7a79f335e2790dda2c238ba7d125e625c94fd1bb 100644 (file)
--- 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>