[PATCH roland/build-nscd] add --disable-build-nscd configure option

[Roland McGrath <roland at hack dot frob dot com>]

This adds a configure option to stop building/installing the nscd daemon.
I am going to start looking into an option to disable all the code to use
nscd too, but this was a very easy place to start.

Unless there are objections, I'll merge this in a day or two.


Thanks,
Roland


	* configure.in (build_nscd): New substituted variable, set
	by --disable-build-nscd.
	* configure: Regenerated.
	* config.make.in (build-nscd): New substituted variable.
	* nscd/Makefile (others, others-pie, install-sbin, extra-objs):
	Change conditional to require [$(build-nscd) = yes] as well.

diff --git a/config.make.in b/config.make.in
index 65410ab..6455e85 100644
--- a/config.make.in
+++ b/config.make.in
@@ -99,6 +99,7 @@ sysdeps-add-ons = @sysdeps_add_ons@
 cross-compiling = @cross_compiling@
 force-install = @force_install@
 link-obsolete-rpc = @link_obsolete_rpc@
+build-nscd = @build_nscd@
 
 # Build tools.
 CC = @CC@
diff --git a/configure b/configure
index facb6a5..c0d4eb7 100755
--- a/configure
+++ b/configure
@@ -654,6 +654,7 @@ multi_arch
 base_machine
 add_on_subdirs
 add_ons
+build_nscd
 link_obsolete_rpc
 libc_cv_nss_crypt
 all_warnings
@@ -749,6 +750,7 @@ enable_multi_arch
 enable_nss_crypt
 enable_obsolete_rpc
 enable_systemtap
+enable_build_nscd
 with_cpu
 '
       ac_precious_vars='build_alias
@@ -1407,6 +1409,7 @@ Optional Features:
   --enable-obsolete-rpc   build and install the obsolete RPC code for
                           link-time usage
   --enable-systemtap      enable systemtap static probe points [default=no]
+  --disable-build-nscd    disable building and installing the nscd daemon
 
 Optional Packages:
   --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
@@ -3751,6 +3754,16 @@ See \`config.log' for more details" "$LINENO" 5; }
   fi
 fi
 
+# Check whether --enable-build-nscd was given.
+if test "${enable_build_nscd+set}" = set; then :
+  enableval=$enable_build_nscd; build_nscd=$enableval
+else
+  build_nscd=yes
+fi
+
+
+
+
 # The way shlib-versions is used to generate soversions.mk uses a
 # fairly simplistic model for name recognition that can't distinguish
 # i486-pc-linux-gnu fully from i486-pc-gnu.  So we mutate a $host_os
diff --git a/configure.in b/configure.in
index 1219b9f..68971e1 100644
--- a/configure.in
+++ b/configure.in
@@ -292,6 +292,14 @@ void foo (int i, void *p)
   fi
 fi
 
+AC_ARG_ENABLE([build-nscd],
+	      [AS_HELP_STRING([--disable-build-nscd],
+	       [disable building and installing the nscd daemon])],
+	      [build_nscd=$enableval],
+	      [build_nscd=yes])
+AC_SUBST(build_nscd)
+
+
 # The way shlib-versions is used to generate soversions.mk uses a
 # fairly simplistic model for name recognition that can't distinguish
 # i486-pc-linux-gnu fully from i486-pc-gnu.  So we mutate a $host_os
diff --git a/nscd/Makefile b/nscd/Makefile
index ba052eb..08efd6e 100644
--- a/nscd/Makefile
+++ b/nscd/Makefile
@@ -36,7 +36,7 @@ nscd-modules := nscd connections pwdcache getpwnam_r getpwuid_r grpcache \
 		xmalloc xstrdup aicache initgrcache gai res_hconf \
 		netgroupcache
 
-ifeq ($(have-thread-library),yes)
+ifeq ($(build-nscd)$(have-thread-library),yesyes)
 
 others += nscd
 others-pie += nscd