summaryrefslogtreecommitdiff
path: root/source3
diff options
context:
space:
mode:
authorStefan Metzmacher <metze@samba.org>2012-06-18 09:14:55 +0200
committerStefan Metzmacher <metze@samba.org>2012-06-18 15:26:45 +0200
commit333cee7484c0c597824b44c9b6726046fbb89c2a (patch)
treef970d9f9e37685760dee118751caddbb02dffbc7 /source3
parenta146f0708e9eb784c376bfa49a0e3435409bf98d (diff)
downloadsamba-333cee7484c0c597824b44c9b6726046fbb89c2a.tar.gz
samba-333cee7484c0c597824b44c9b6726046fbb89c2a.tar.bz2
samba-333cee7484c0c597824b44c9b6726046fbb89c2a.zip
s3:autoconf: add -Iautoconf -Iautoconf/source3 at configure stage
There're some configure tests which require this. metze
Diffstat (limited to 'source3')
-rw-r--r--source3/Makefile.in2
-rw-r--r--source3/configure.in3
2 files changed, 2 insertions, 3 deletions
diff --git a/source3/Makefile.in b/source3/Makefile.in
index 50680c48c3..e4c2f7122b 100644
--- a/source3/Makefile.in
+++ b/source3/Makefile.in
@@ -170,8 +170,6 @@ FLAGS = -I. \
$(ISA) \
-I$(srcdir)/lib \
-I.. \
- -Iautoconf \
- -Iautoconf/source3 \
-I./../lib/ldb/include \
-D_SAMBA_BUILD_=3
diff --git a/source3/configure.in b/source3/configure.in
index e6b1a73783..6705a2716b 100644
--- a/source3/configure.in
+++ b/source3/configure.in
@@ -35,7 +35,8 @@ done
AC_SUBST(LIBTEVENT_OBJ0)
LIBS="${LIBS} ${TEVENT_LIBS}"
-SAMBA_CPPFLAGS="-Iinclude/autoconf -Iinclude -I${srcdir-.}/include -I. -I${srcdir-.}"
+SAMBA_CPPFLAGS="-Iinclude/autoconf -Iautoconf -Iautoconf/source3"
+SAMBA_CPPFLAGS="${SAMBA_CPPFLAGS} -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} ${CCAN_CFLAGS}"