summaryrefslogtreecommitdiff
path: root/source3
diff options
context:
space:
mode:
Diffstat (limited to 'source3')
-rw-r--r--source3/Makefile.in1
-rw-r--r--source3/configure.in2
-rw-r--r--source3/wscript3
-rwxr-xr-xsource3/wscript_build1
4 files changed, 6 insertions, 1 deletions
diff --git a/source3/Makefile.in b/source3/Makefile.in
index 3df9ab47f6..9dd0a45c42 100644
--- a/source3/Makefile.in
+++ b/source3/Makefile.in
@@ -472,6 +472,7 @@ LIB_OBJ = $(LIBSAMBAUTIL_OBJ) $(UTIL_OBJ) $(CRYPTO_OBJ) \
lib/conn_tdb.o lib/adt_tree.o lib/gencache.o \
lib/sessionid_tdb.o \
lib/module.o lib/events.o @LIBTEVENT_OBJ0@ \
+ @CCAN_OBJ@ \
lib/server_contexts.o \
lib/ldap_escape.o @CHARSET_STATIC@ \
../libcli/security/secdesc.o ../libcli/security/access_check.o \
diff --git a/source3/configure.in b/source3/configure.in
index 324ada4c54..2d248cc4a5 100644
--- a/source3/configure.in
+++ b/source3/configure.in
@@ -26,6 +26,7 @@ AC_LIBREPLACE_CC_CHECKS
AC_LIBREPLACE_RUNTIME_LIB_PATH_VAR
m4_include(../lib/tevent/libtevent.m4)
+m4_include(../lib/ccan/libccan.m4)
LIBTEVENT_OBJ0=""
for obj in ${TEVENT_OBJ}; do
@@ -37,6 +38,7 @@ LIBS="${LIBS} ${TEVENT_LIBS}"
SAMBA_CPPFLAGS="-Iinclude/autoconf -Iinclude -I${srcdir-.}/include -I. -I${srcdir-.}"
SAMBA_CPPFLAGS="${SAMBA_CPPFLAGS} -I${srcdir-.}/../lib/replace"
SAMBA_CPPFLAGS="${SAMBA_CPPFLAGS} ${TEVENT_CFLAGS}"
+SAMBA_CPPFLAGS="${SAMBA_CPPFLAGS} ${CCAN_CFLAGS}"
SAMBA_CPPFLAGS="${SAMBA_CPPFLAGS} -I${srcdir-.}/librpc"
SAMBA_CPPFLAGS="${SAMBA_CPPFLAGS} -I${srcdir-.}/.."
diff --git a/source3/wscript b/source3/wscript
index 83b0a0ef04..4b5d98bbc3 100644
--- a/source3/wscript
+++ b/source3/wscript
@@ -92,6 +92,7 @@ def configure(conf):
if not conf.env.toplevel_build:
conf.RECURSE('../lib/replace')
conf.RECURSE('build')
+ conf.RECURSE('../lib/ccan')
conf.RECURSE('../lib/tdb')
conf.RECURSE('../lib/talloc')
conf.RECURSE('../lib/tevent')
@@ -102,7 +103,7 @@ def configure(conf):
conf.RECURSE('../libcli/smbreadline')
conf.RECURSE('../lib/util')
- conf.ADD_EXTRA_INCLUDES('''#source3 #source3/include #lib/replace''')
+ conf.ADD_EXTRA_INCLUDES('''#source3 #source3/include #lib/replace #lib''')
if not conf.env.USING_SYSTEM_TDB:
conf.ADD_EXTRA_INCLUDES('#lib/tdb/include')
if not conf.env.USING_SYSTEM_TEVENT:
diff --git a/source3/wscript_build b/source3/wscript_build
index e3160e6913..df38e4c9db 100755
--- a/source3/wscript_build
+++ b/source3/wscript_build
@@ -1425,6 +1425,7 @@ bld.RECURSE('../auth')
bld.RECURSE('../auth/kerberos')
bld.RECURSE('../lib/addns')
bld.RECURSE('../lib/async_req')
+bld.RECURSE('../lib/ccan')
bld.RECURSE('../lib/socket')
bld.RECURSE('../libcli/auth')
bld.RECURSE('../libcli/drsuapi')