From a57133c56e9ba5553b6183691e8087a03adb461a Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Wed, 13 Sep 2006 09:23:05 +0000 Subject: [PATCH] r18447: make sure we bail out if the config.h is not generated by samba's configure. this could happen when you have done a standalone build in lib/replace/, lib/talloc, ... metze (This used to be commit d8e88386748d3952c6a82726c9d36cad870992fd) --- source4/configure.ac | 1 + source4/include/includes.h | 7 +++++++ 2 files changed, 8 insertions(+) diff --git a/source4/configure.ac b/source4/configure.ac index 813a333c144..1a00c97049f 100644 --- a/source4/configure.ac +++ b/source4/configure.ac @@ -8,6 +8,7 @@ AC_INIT([samba],[],[samba-technical@samba.org]) AC_CONFIG_SRCDIR([include/includes.h]) AC_CONFIG_HEADER(include/config_tmp.h) +AC_DEFINE(CONFIG_H_IS_FROM_SAMBA,1,[Marker for samba's config.h]) # Configuration rules. m4_include(lib/replace/libreplace.m4) diff --git a/source4/include/includes.h b/source4/include/includes.h index dc7db5d3bb1..5850103145c 100644 --- a/source4/include/includes.h +++ b/source4/include/includes.h @@ -23,8 +23,15 @@ #ifndef NO_CONFIG_H /* for some tests */ #include "lib/replace/replace.h" + +/* make sure we have included the correct config.h */ +#ifndef CONFIG_H_IS_FROM_SAMBA +#warn "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__ -- 2.34.1