summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Metzmacher <metze@samba.org>2007-10-18 16:46:16 +0200
committerStefan Metzmacher <metze@samba.org>2007-11-09 09:52:58 +0100
commit8322aa697738ed612cbbbce8976a048608aca9f9 (patch)
tree6cf15f6837355ac908d4d19c680f6fc78b93e6fc
parent7c43422e1be5161fd01c8dc206ec640e3752980b (diff)
downloadsamba-8322aa697738ed612cbbbce8976a048608aca9f9.tar.gz
samba-8322aa697738ed612cbbbce8976a048608aca9f9.tar.bz2
samba-8322aa697738ed612cbbbce8976a048608aca9f9.zip
use nss_wrapper code in samba3 when --enable-nss-wrapper is given
metze (This used to be commit 96827929626a528bb3e1ec8366aef58c174d67e1)
-rw-r--r--source3/Makefile.in3
-rwxr-xr-xsource3/configure.developer1
-rw-r--r--source3/configure.in1
3 files changed, 4 insertions, 1 deletions
diff --git a/source3/Makefile.in b/source3/Makefile.in
index ef3a0c97eb..664f75ddc5 100644
--- a/source3/Makefile.in
+++ b/source3/Makefile.in
@@ -273,11 +273,12 @@ RPC_PARSE_OBJ2 = rpc_parse/parse_rpc.o rpc_parse/parse_net.o rpc_parse/parse_srv
LIBREPLACE_OBJ = @LIBREPLACE_OBJS@
SOCKET_WRAPPER_OBJ = @SOCKET_WRAPPER_OBJS@
+NSS_WRAPPER_OBJ = @NSS_WRAPPER_OBJS@
TALLOC_OBJ = lib/talloc/talloc.o
-LIB_WITHOUT_PROTO_OBJ = $(LIBREPLACE_OBJ) $(SOCKET_WRAPPER_OBJ) $(TALLOC_OBJ) \
+LIB_WITHOUT_PROTO_OBJ = $(LIBREPLACE_OBJ) $(SOCKET_WRAPPER_OBJ) $(NSS_WRAPPER_OBJ) $(TALLOC_OBJ) \
lib/messages.o librpc/gen_ndr/ndr_messaging.o lib/messages_local.o \
lib/messages_ctdbd.o lib/packet.o lib/ctdbd_conn.o lib/talloc_stack.o \
lib/interfaces.o
diff --git a/source3/configure.developer b/source3/configure.developer
index b8cf6d68b1..5033670209 100755
--- a/source3/configure.developer
+++ b/source3/configure.developer
@@ -2,4 +2,5 @@
`dirname $0`/configure -C \
--enable-developer \
--enable-socket-wrapper \
+ --enable-nss-wrapper \
"$@"
diff --git a/source3/configure.in b/source3/configure.in
index 02ca8ac08b..be2b2628d9 100644
--- a/source3/configure.in
+++ b/source3/configure.in
@@ -370,6 +370,7 @@ CFLAGS="${CFLAGS} -D_SAMBA_BUILD_=3"
AC_LIBREPLACE_CC_CHECKS
m4_include(lib/socket_wrapper/config.m4)
+m4_include(lib/nss_wrapper/config.m4)
SWAT_SBIN_TARGETS='bin/swat$(EXEEXT)'
SWAT_INSTALL_TARGETS=installswat