diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2008-09-18 20:29:05 +0200 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2008-09-18 20:29:05 +0200 |
| commit | 729ffbae086309992d7433a296fca64f6800f8fa (patch) | |
| tree | 6c133d2b91ab9313da11bf8bad15f497e1b5c61f /source4/configure.ac | |
| parent | 88ad1a936ccd2451d6dbf542a0a746ad71a3e968 (diff) | |
| parent | fc7050e54c69919d754ca0adf3f2f741a501fec4 (diff) | |
| download | samba-729ffbae086309992d7433a296fca64f6800f8fa.tar.gz | |
Merge branch 'master' of ssh://git.samba.org/data/git/samba into noejs
Conflicts:
source4/main.mk
Diffstat (limited to 'source4/configure.ac')
| -rw-r--r-- | source4/configure.ac | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/source4/configure.ac b/source4/configure.ac index cfae02bb6c1..fa2d8d99506 100644 --- a/source4/configure.ac +++ b/source4/configure.ac @@ -11,7 +11,7 @@ AC_DEFINE(CONFIG_H_IS_FROM_SAMBA,1,[Marker for samba's config.h]) # Configuration rules. m4_include(build/m4/env.m4) -m4_include(lib/replace/samba.m4) +m4_include(../lib/replace/samba.m4) m4_include(lib/smbreadline/readline.m4) m4_include(heimdal_build/config.m4) m4_include(lib/util/fault.m4) @@ -21,12 +21,12 @@ m4_include(lib/util/fsusage.m4) m4_include(lib/util/xattr.m4) m4_include(lib/util/capability.m4) m4_include(lib/util/time.m4) -m4_include(lib/popt/samba.m4) +m4_include(../lib/popt/samba.m4) m4_include(lib/charset/config.m4) m4_include(lib/socket/config.m4) m4_include(lib/zlib.m4) m4_include(nsswitch/nsstest.m4) -m4_include(pidl/config.m4) +m4_include(../pidl/config.m4) AC_CONFIG_FILES(lib/registry/registry.pc) AC_CONFIG_FILES(lib/events/events.pc) @@ -41,20 +41,20 @@ 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(../lib/talloc/libtalloc.m4) + SMB_INCLUDE_MK(../lib/talloc/config.mk) ] ) SMB_EXT_LIB_FROM_PKGCONFIG(LIBTDB, tdb >= 1.1.0, [], [ - m4_include(lib/tdb/libtdb.m4) - SMB_INCLUDE_MK(lib/tdb/config.mk) + m4_include(../lib/tdb/libtdb.m4) + SMB_INCLUDE_MK(../lib/tdb/config.mk) ] ) -SMB_INCLUDE_MK(lib/tdb/python.mk) +SMB_INCLUDE_MK(../lib/tdb/python.mk) SMB_EXT_LIB_FROM_PKGCONFIG(LIBLDB, ldb >= 0.9.1, [ @@ -99,8 +99,8 @@ m4_include(auth/gensec/config.m4) m4_include(smbd/process_model.m4) m4_include(ntvfs/posix/config.m4) m4_include(ntvfs/unixuid/config.m4) -m4_include(lib/socket_wrapper/config.m4) -m4_include(lib/nss_wrapper/config.m4) +m4_include(../lib/socket_wrapper/config.m4) +m4_include(../lib/nss_wrapper/config.m4) m4_include(auth/config.m4) m4_include(kdc/config.m4) m4_include(ntvfs/sysdep/config.m4) @@ -158,7 +158,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)/../lib/talloc -D_SAMBA_BUILD_=4 -DHAVE_CONFIG_H $CPPFLAGS" SMB_WRITE_PERLVARS(build/smb_build/config.pm) |