From: Stefan Metzmacher Date: Mon, 18 Jun 2012 07:14:55 +0000 (+0200) Subject: s3:autoconf: add -Iautoconf -Iautoconf/source3 at configure stage X-Git-Url: http://git.samba.org/?a=commitdiff_plain;h=333cee7484c0c597824b44c9b6726046fbb89c2a;p=metze%2Fsamba%2Fwip.git s3:autoconf: add -Iautoconf -Iautoconf/source3 at configure stage There're some configure tests which require this. metze --- diff --git a/source3/Makefile.in b/source3/Makefile.in index 50680c48c3ad..e4c2f7122b76 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 e6b1a7378313..6705a2716b55 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}"