sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-08-31 22:02:58 +03:00
Code Activity

Fix merged build.

Browse Source
This commit is contained in:
Jelmer Vernooij
2008-09-16 17:22:03 +02:00
parent 9ef623beda
commit cda87628bc
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
source3/samba4.m4
View File

@ -31,7 +31,7 @@ AC_CONFIG_FILES(../source4/librpc/dcerpc_atsvc.pc)
SMB_EXT_LIB_FROM_PKGCONFIG(LIBTALLOC, talloc >= 1.2.0, SMB_EXT_LIB_FROM_PKGCONFIG(LIBTALLOC, talloc >= 1.2.0,
[], [],
[ [
SMB_INCLUDE_MK(lib/talloc/config.mk) SMB_INCLUDE_MK(../talloc/config.mk)
] ]
) )

10
source3/samba4.mk
View File

@ -81,8 +81,8 @@ libmessagingsrcdir := $(samba4srcdir)/lib/messaging
libeventssrcdir := $(samba4srcdir)/lib/events libeventssrcdir := $(samba4srcdir)/lib/events
libcmdlinesrcdir := $(samba4srcdir)/lib/cmdline libcmdlinesrcdir := $(samba4srcdir)/lib/cmdline
poptsrcdir := $(samba4srcdir)/../popt poptsrcdir := $(samba4srcdir)/../popt
socketwrappersrcdir := $(samba4srcdir)/lib/socket_wrapper socketwrappersrcdir := $(samba4srcdir)/../socket_wrapper
nsswrappersrcdir := $(samba4srcdir)/lib/nss_wrapper nsswrappersrcdir := $(samba4srcdir)/../nss_wrapper
appwebsrcdir := $(samba4srcdir)/lib/appweb appwebsrcdir := $(samba4srcdir)/lib/appweb
libstreamsrcdir := $(samba4srcdir)/lib/stream libstreamsrcdir := $(samba4srcdir)/lib/stream
libutilsrcdir := $(samba4srcdir)/lib/util libutilsrcdir := $(samba4srcdir)/lib/util
@ -113,9 +113,9 @@ pyscriptsrcdir := $(samba4srcdir)/scripting/python
kdcsrcdir := $(samba4srcdir)/kdc kdcsrcdir := $(samba4srcdir)/kdc
smbreadlinesrcdir := $(samba4srcdir)/lib/smbreadline smbreadlinesrcdir := $(samba4srcdir)/lib/smbreadline
ntp_signdsrcdir := $(samba4srcdir)/ntp_signd ntp_signdsrcdir := $(samba4srcdir)/ntp_signd
tdbsrcdir := $(samba4srcdir)/lib/tdb tdbsrcdir := $(samba4srcdir)/../tdb
ldbsrcdir := $(samba4srcdir)/lib/ldb ldbsrcdir := $(samba4srcdir)/../ldb
tallocsrcdir := $(samba4srcdir)/lib/talloc tallocsrcdir := $(samba4srcdir)/../talloc
override ASN1C = bin/asn1_compile4 override ASN1C = bin/asn1_compile4
override ET_COMPILER = bin/compile_et4 override ET_COMPILER = bin/compile_et4
include samba4-data.mk include samba4-data.mk