summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2008-09-17 14:25:25 +0200
committerJelmer Vernooij <jelmer@samba.org>2008-09-17 14:25:25 +0200
commit7106cd9fd5f80bc7d73b061bba51904219400829 (patch)
tree2647b951ec0b87a1b8ca4b6878ca624a7477a5d1
parentd6983b2e4598137bbd050ca879b34272e3b952c6 (diff)
downloadsamba-7106cd9fd5f80bc7d73b061bba51904219400829.tar.gz
samba-7106cd9fd5f80bc7d73b061bba51904219400829.tar.bz2
samba-7106cd9fd5f80bc7d73b061bba51904219400829.zip
Fix merged build.
-rw-r--r--lib/replace/getaddrinfo.h2
-rw-r--r--source3/samba4.mk16
2 files changed, 10 insertions, 8 deletions
diff --git a/lib/replace/getaddrinfo.h b/lib/replace/getaddrinfo.h
index dddd699b62..cf040da2db 100644
--- a/lib/replace/getaddrinfo.h
+++ b/lib/replace/getaddrinfo.h
@@ -75,7 +75,9 @@ in lib/replace we use rep_xxx()
#undef getnameinfo
#endif
#define getnameinfo rep_getnameinfo
+#ifndef HAVE_GETNAMEINFO
#define HAVE_GETNAMEINFO
+#endif
extern int rep_getaddrinfo(const char *node, const char *service,
const struct addrinfo * hints, struct addrinfo ** res);
diff --git a/source3/samba4.mk b/source3/samba4.mk
index d8cf457004..b145f4ca4b 100644
--- a/source3/samba4.mk
+++ b/source3/samba4.mk
@@ -12,7 +12,7 @@ samba4srcdir = $(call abspath,$(srcdir)/../source4)
# Flags used for the samba 4 files
# $(srcdir)/include is required for config.h
SAMBA4_CFLAGS = -I$(samba4srcdir) -I$(samba4srcdir)/include \
- -I$(samba4srcdir)/lib/replace -I$(samba4srcdir)/lib \
+ -I$(samba4srcdir)/../lib/replace -I$(samba4srcdir)/lib \
-I$(heimdalsrcdir)/lib/hcrypto -I$(tallocdir) \
-I$(srcdir)/include -D_SAMBA_BUILD_=4 -DHAVE_CONFIG_H
@@ -80,9 +80,9 @@ libregistrysrcdir := $(samba4srcdir)/lib/registry
libmessagingsrcdir := $(samba4srcdir)/lib/messaging
libeventssrcdir := $(samba4srcdir)/lib/events
libcmdlinesrcdir := $(samba4srcdir)/lib/cmdline
-poptsrcdir := $(samba4srcdir)/../popt
-socketwrappersrcdir := $(samba4srcdir)/../socket_wrapper
-nsswrappersrcdir := $(samba4srcdir)/../nss_wrapper
+poptsrcdir := $(samba4srcdir)/../lib/popt
+socketwrappersrcdir := $(samba4srcdir)/../lib/socket_wrapper
+nsswrappersrcdir := $(samba4srcdir)/../lib/nss_wrapper
appwebsrcdir := $(samba4srcdir)/lib/appweb
libstreamsrcdir := $(samba4srcdir)/lib/stream
libutilsrcdir := $(samba4srcdir)/lib/util
@@ -90,7 +90,7 @@ libtdrsrcdir := $(samba4srcdir)/lib/tdr
libdbwrapsrcdir := $(samba4srcdir)/lib/dbwrap
libcryptosrcdir := $(samba4srcdir)/lib/crypto
libtorturesrcdir := $(samba4srcdir)/lib/torture
-libcompressionsrcdir := $(samba4srcdir)/lib/compression
+libcompressionsrcdir := $(samba4srcdir)/../lib/compression
libgencachesrcdir := $(samba4srcdir)/lib
paramsrcdir := $(samba4srcdir)/param
smb_serversrcdir := $(samba4srcdir)/smb_server
@@ -113,9 +113,9 @@ pyscriptsrcdir := $(samba4srcdir)/scripting/python
kdcsrcdir := $(samba4srcdir)/kdc
smbreadlinesrcdir := $(samba4srcdir)/lib/smbreadline
ntp_signdsrcdir := $(samba4srcdir)/ntp_signd
-tdbsrcdir := $(samba4srcdir)/../tdb
-ldbsrcdir := $(samba4srcdir)/../ldb
-tallocsrcdir := $(samba4srcdir)/../talloc
+tdbsrcdir := $(samba4srcdir)/../lib/tdb
+ldbsrcdir := $(samba4srcdir)/lib/ldb
+tallocsrcdir := $(samba4srcdir)/../lib/talloc
override ASN1C = bin/asn1_compile4
override ET_COMPILER = bin/compile_et4
include samba4-data.mk