This is the mail archive of the
glibc-cvs@sourceware.org
mailing list for the glibc project.
GNU C Library master sources branch roland/build-nscd created. glibc-2.16-ports-merge-252-gfd903c0
- From: roland at sourceware dot org
- To: glibc-cvs at sourceware dot org
- Date: 22 Aug 2012 20:19:02 -0000
- Subject: GNU C Library master sources branch roland/build-nscd created. glibc-2.16-ports-merge-252-gfd903c0
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU C Library master sources".
The branch, roland/build-nscd has been created
at fd903c002b27094e8abfd8f802250bad477d6329 (commit)
- Log -----------------------------------------------------------------
http://sources.redhat.com/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=fd903c002b27094e8abfd8f802250bad477d6329
commit fd903c002b27094e8abfd8f802250bad477d6329
Author: Roland McGrath <roland@hack.frob.com>
Date: Wed Aug 22 13:18:08 2012 -0700
Add --disable-build-nscd configure option.
diff --git a/ChangeLog b/ChangeLog
index 8e64d80..abaf82d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2012-08-22 Roland McGrath <roland@hack.frob.com>
+
+ * 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.
+
2012-08-22 Dmitry V. Levin <ldv@altlinux.org>
* configure.in (SED): Update AC_CHECK_PROG_VER's version extract regexp
diff --git a/config.make.in b/config.make.in
index c511554..d70b698 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@
# Build tools.
CC = @CC@
diff --git a/configure b/configure
index a573bfe..e71a3d6 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
@@ -750,6 +751,7 @@ enable_multi_arch
enable_nss_crypt
enable_obsolete_rpc
enable_systemtap
+enable_build_nscd
with_cpu
'
ac_precious_vars='build_alias
@@ -1408,6 +1410,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]
@@ -3753,6 +3756,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 1b05c87..d09ea8b 100644
--- a/configure.in
+++ b/configure.in
@@ -293,6 +293,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
-----------------------------------------------------------------------
hooks/post-receive
--
GNU C Library master sources