aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog8
-rw-r--r--NEWS2
-rw-r--r--config.make.in1
-rwxr-xr-xconfigure15
-rw-r--r--configure.in10
-rw-r--r--nscd/Makefile2
6 files changed, 37 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 291a57b..d0fa3b0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,13 @@
2012-08-22 Roland McGrath <roland@hack.frob.com>
+ * configure.in (build_nscd): New substituted variable, set
+ by --disable-build-nscd and defaults to $use_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.
+ * NEWS: Mention --disable-build-nscd in the --disable-nscd item.
+
[BZ# 13696]
* configure.in (use_nscd): New substituted variable, set by
--disable-nscd. If enabled, define USE_NSCD.
diff --git a/NEWS b/NEWS
index 6376839..e16618f 100644
--- a/NEWS
+++ b/NEWS
@@ -36,6 +36,8 @@ Version 2.17
* New configure option --disable-nscd builds the C library such that it
never attempts to contact the Name Service Caching Daemon (nscd).
+ New configure option --disable-build-nscd avoids building nscd itself;
+ this is the default if --disable-nscd is used.
Version 2.16
diff --git a/config.make.in b/config.make.in
index bbb5cac..d84fe38 100644
--- a/config.make.in
+++ b/config.make.in
@@ -100,6 +100,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@
use-nscd = @use_nscd@
# Build tools.
diff --git a/configure b/configure
index 6301a1b..e240576 100755
--- a/configure
+++ b/configure
@@ -655,6 +655,7 @@ multi_arch
base_machine
add_on_subdirs
add_ons
+build_nscd
link_obsolete_rpc
libc_cv_nss_crypt
all_warnings
@@ -751,6 +752,7 @@ enable_multi_arch
enable_nss_crypt
enable_obsolete_rpc
enable_systemtap
+enable_build_nscd
enable_nscd
with_cpu
'
@@ -1410,6 +1412,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
--disable-nscd library functions will not contact the nscd daemon
Optional Packages:
@@ -3756,6 +3759,15 @@ 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=default
+fi
+
+
+
# Note the use of $use_nscd is near the bottom of the file.
# Check whether --enable-nscd was given.
if test "${enable_nscd+set}" = set; then :
@@ -7423,6 +7435,9 @@ if test "x$use_nscd" != xno; then
$as_echo "#define USE_NSCD 1" >>confdefs.h
fi
+if test "x$build_nscd" = xdefault; then
+ build_nscd=$use_nscd
+fi
# Test for old glibc 2.0.x headers so that they can be removed properly
# Search only in includedir.
diff --git a/configure.in b/configure.in
index a5ce139..a5d9dea 100644
--- a/configure.in
+++ b/configure.in
@@ -293,6 +293,13 @@ 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=default])
+AC_SUBST(build_nscd)
+
# Note the use of $use_nscd is near the bottom of the file.
AC_ARG_ENABLE([nscd],
[AS_HELP_STRING([--disable-nscd],
@@ -2112,6 +2119,9 @@ AC_SUBST(use_nscd)
if test "x$use_nscd" != xno; then
AC_DEFINE([USE_NSCD])
fi
+if test "x$build_nscd" = xdefault; then
+ build_nscd=$use_nscd
+fi
# Test for old glibc 2.0.x headers so that they can be removed properly
# Search only in includedir.
diff --git a/nscd/Makefile b/nscd/Makefile
index de26f06..c26ddb1 100644
--- a/nscd/Makefile
+++ b/nscd/Makefile
@@ -38,7 +38,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