diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2011-05-09 10:59:15 +0200 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2011-05-09 11:21:09 +0200 |
| commit | 7e8f086798c36f64581ed7444df535e85fa0b5af (patch) | |
| tree | 511f0050a8c0e072e13c2b6c2de7bd641f34ca6c /source3/configure.in | |
| parent | 8aab926c2804230b633e0eb29655f4e32226aa4f (diff) | |
| download | samba-7e8f086798c36f64581ed7444df535e85fa0b5af.tar.gz samba-7e8f086798c36f64581ed7444df535e85fa0b5af.tar.bz2 samba-7e8f086798c36f64581ed7444df535e85fa0b5af.zip | |
s3-build: Move generated config.h and config.h.in to include/autoconf
This ensures that these are not found by the waf build, which causes
issues when the wrong config.h is used by the recursive smbtorture build
Andrew Bartlett
Diffstat (limited to 'source3/configure.in')
| -rw-r--r-- | source3/configure.in | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source3/configure.in b/source3/configure.in index 11dbc2872e..82cd664165 100644 --- a/source3/configure.in +++ b/source3/configure.in @@ -6,7 +6,7 @@ AC_PREREQ(2.54) AC_INIT([Samba],[3],[samba-technical@samba.org]) AC_CONFIG_SRCDIR([include/includes.h]) -AC_CONFIG_HEADER(include/config.h) +AC_CONFIG_HEADER(include/autoconf/config.h) AC_DEFINE(CONFIG_H_IS_FROM_SAMBA,1,[Marker for samba's config.h]) case "$PATH" in @@ -34,7 +34,7 @@ done AC_SUBST(LIBTEVENT_OBJ0) LIBS="${LIBS} ${TEVENT_LIBS}" -SAMBA_CPPFLAGS="-Iinclude -I${srcdir-.}/include -I. -I${srcdir-.}" +SAMBA_CPPFLAGS="-Iinclude/autoconf -Iinclude -I${srcdir-.}/include -I. -I${srcdir-.}" SAMBA_CPPFLAGS="${SAMBA_CPPFLAGS} -I${srcdir-.}/../lib/replace" SAMBA_CPPFLAGS="${SAMBA_CPPFLAGS} ${TEVENT_CFLAGS}" SAMBA_CPPFLAGS="${SAMBA_CPPFLAGS} -I${srcdir-.}/librpc" |