diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2008-09-16 14:36:41 +0200 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2008-09-16 14:36:41 +0200 |
| commit | 80a5da73e9a9ed148314be3fa071181c82fc7c64 (patch) | |
| tree | c561200c7b7ff8e9bf6e44be0ad9f093789a3b72 /source4/configure.ac | |
| parent | ec1c854f2175823bd1ad39c2e272d1b3fab80bf1 (diff) | |
| download | samba-80a5da73e9a9ed148314be3fa071181c82fc7c64.tar.gz samba-80a5da73e9a9ed148314be3fa071181c82fc7c64.tar.bz2 samba-80a5da73e9a9ed148314be3fa071181c82fc7c64.zip | |
Share talloc source code between Samba 3 and Samba 4.
Diffstat (limited to 'source4/configure.ac')
| -rw-r--r-- | source4/configure.ac | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/source4/configure.ac b/source4/configure.ac index d03092c6b6..c42458a5ff 100644 --- a/source4/configure.ac +++ b/source4/configure.ac @@ -41,8 +41,8 @@ AC_CONFIG_FILES(librpc/dcerpc_atsvc.pc) SMB_EXT_LIB_FROM_PKGCONFIG(LIBTALLOC, talloc >= 1.2.0, [], [ - m4_include(lib/talloc/libtalloc.m4) - SMB_INCLUDE_MK(lib/talloc/config.mk) + m4_include(../talloc/libtalloc.m4) + SMB_INCLUDE_MK(../talloc/config.mk) ] ) @@ -159,7 +159,7 @@ then builddir_headers="-I\$(builddir)/include -I\$(builddir) -I\$(builddir)/lib "; fi -CPPFLAGS="$builddir_headers-I\$(srcdir)/include -I\$(srcdir) -I\$(srcdir)/lib -I\$(srcdir)/lib/replace -I\$(srcdir)/lib/talloc -D_SAMBA_BUILD_=4 -DHAVE_CONFIG_H $CPPFLAGS" +CPPFLAGS="$builddir_headers-I\$(srcdir)/include -I\$(srcdir) -I\$(srcdir)/lib -I\$(srcdir)/lib/replace -I\$(srcdir)/../talloc -D_SAMBA_BUILD_=4 -DHAVE_CONFIG_H $CPPFLAGS" SMB_WRITE_PERLVARS(build/smb_build/config.pm) |