diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2008-09-16 17:20:16 +0200 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2008-09-16 17:20:16 +0200 |
| commit | c8bff39df639c70afc94b1795c94629ee8b7b482 (patch) | |
| tree | 6331eaa4d41b0b907b44d862697c9c5ea17eaaae /source3/configure.in | |
| parent | ec1c854f2175823bd1ad39c2e272d1b3fab80bf1 (diff) | |
| download | samba-c8bff39df639c70afc94b1795c94629ee8b7b482.tar.gz samba-c8bff39df639c70afc94b1795c94629ee8b7b482.tar.bz2 samba-c8bff39df639c70afc94b1795c94629ee8b7b482.zip | |
Use a single copy of popt in samba3 and samba4.
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 d9766e49d0..a1d3b3b618 100644 --- a/source3/configure.in +++ b/source3/configure.in @@ -54,7 +54,7 @@ SAMBA_CPPFLAGS="${SAMBA_CPPFLAGS} ${TDB_CFLAGS}" SAMBA_CPPFLAGS="${SAMBA_CPPFLAGS} -I${srcdir-.}/libaddns" SAMBA_CPPFLAGS="${SAMBA_CPPFLAGS} -I${srcdir-.}/librpc" -SAMBA_CONFIGURE_CPPFLAGS="${SAMBA_CPPFLAGS} -I${srcdir-.}/popt" +SAMBA_CONFIGURE_CPPFLAGS="${SAMBA_CPPFLAGS} -I${srcdir-.}/../popt" ## cleanup the $(srcdir) in the Makefile if we are outside of the tree if test "x${srcdir-.}" != "x."; then @@ -5872,7 +5872,7 @@ if test x"$INCLUDED_POPT" = x"yes"; then AC_MSG_RESULT(yes) BUILD_POPT='$(POPT_OBJ)' POPTLIBS='$(POPT_OBJ)' - FLAGS1="-I\$(srcdir)/popt" + FLAGS1="-I\$(srcdir)/../popt" else AC_MSG_RESULT(no) BUILD_POPT="" |