From 3cc3ef96d6c060e9d45b43f5482dc4e03945b30e Mon Sep 17 00:00:00 2001
From: Roland McGrath <roland@hack.frob.com>
Date: Wed, 22 Aug 2012 13:31:12 -0700
Subject: BZ#13696: Add --disable-nscd configure option.

---
 nscd/Makefile | 6 ++++--
 nscd/nscd.c   | 2 ++
 2 files changed, 6 insertions(+), 2 deletions(-)

(limited to 'nscd')

diff --git a/nscd/Makefile b/nscd/Makefile
index ba052eb9de..de26f06c05 100644
--- a/nscd/Makefile
+++ b/nscd/Makefile
@@ -20,11 +20,13 @@
 #
 subdir	:= nscd
 
+include ../Makeconfig
+
+ifneq ($(use-nscd),no)
 routines := nscd_getpw_r nscd_getgr_r nscd_gethst_r nscd_getai \
 	    nscd_initgroups nscd_getserv_r nscd_netgroup
 aux	:= nscd_helper
-
-include ../Makeconfig
+endif
 
 # To find xmalloc.c
 vpath %.c ../locale/programs
diff --git a/nscd/nscd.c b/nscd/nscd.c
index 79fb32f327..bee9ed49ff 100644
--- a/nscd/nscd.c
+++ b/nscd/nscd.c
@@ -305,8 +305,10 @@ main (int argc, char **argv)
 # endif
 #endif
 
+#ifdef USE_NSCD
   /* Make sure we do not get recursive calls.  */
   __nss_disable_nscd (register_traced_file);
+#endif
 
   /* Init databases.  */
   nscd_init ();
-- 
cgit 1.4.1