diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2008-09-16 16:45:10 +0200 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2008-09-16 16:45:10 +0200 |
| commit | bf21371c098684ccad427a54ac76766c0021bc88 (patch) | |
| tree | ed1d0dce7dda8d41c6dcefdfe23eea35df1ced0c /source3/configure.in | |
| parent | f957aeaee64745148b815393b1fc1338104ed2e1 (diff) | |
| parent | 0888ffa2b7382a1c4781ae54bad53eac3b229365 (diff) | |
| download | samba-bf21371c098684ccad427a54ac76766c0021bc88.tar.gz samba-bf21371c098684ccad427a54ac76766c0021bc88.tar.bz2 samba-bf21371c098684ccad427a54ac76766c0021bc88.zip | |
Merge branch 'singlereplace' into single
Conflicts:
source4/configure.ac
source4/torture/local/config.mk
Diffstat (limited to 'source3/configure.in')
| -rw-r--r-- | source3/configure.in | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source3/configure.in b/source3/configure.in index 446b833f06..2801125b11 100644 --- a/source3/configure.in +++ b/source3/configure.in @@ -48,7 +48,7 @@ done AC_SUBST(LIBTDB_OBJ0) SAMBA_CPPFLAGS="-Iinclude -I${srcdir-.}/include -I. -I${srcdir-.}" -SAMBA_CPPFLAGS="${SAMBA_CPPFLAGS} -I${srcdir-.}/lib/replace" +SAMBA_CPPFLAGS="${SAMBA_CPPFLAGS} -I${srcdir-.}/../replace" SAMBA_CPPFLAGS="${SAMBA_CPPFLAGS} ${TALLOC_CFLAGS}" SAMBA_CPPFLAGS="${SAMBA_CPPFLAGS} ${TDB_CFLAGS}" SAMBA_CPPFLAGS="${SAMBA_CPPFLAGS} -I${srcdir-.}/libaddns" |