summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRoland McGrath <roland@hack.frob.com>2012-08-17 10:48:10 -0700
committerRoland McGrath <roland@hack.frob.com>2012-08-17 10:48:10 -0700
commit73e70c30b00cceba63325e7808c3accdc359a7db (patch)
tree49752b97b7877aa2a025632b8bc719278992bb8c
parente66a42f57fd20d1c7bbdc5f7937831d13bcf709b (diff)
downloadglibc-73e70c30b00cceba63325e7808c3accdc359a7db.tar.gz
-rw-r--r--ChangeLog4
-rw-r--r--config.make.in1
-rw-r--r--configure.in7
3 files changed, 12 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index f050559d83..3df34fb7d3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
2012-08-17 Roland McGrath <roland@hack.frob.com>
+ * configure.in (build_nis): New substituted variable, set
+ by new --disable-nis option.
+ * config.make.in (build-nis): New variable, set from that.
+
* bits/param.h: New file.
* misc/sys/param.h: New file.
* include/sys/param.h: New file.
diff --git a/config.make.in b/config.make.in
index 65410abe1b..33013a8e1a 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-nis = @build_nis@
# Build tools.
CC = @CC@
diff --git a/configure.in b/configure.in
index 1219b9fb8a..cb05d76e5b 100644
--- a/configure.in
+++ b/configure.in
@@ -292,6 +292,13 @@ void foo (int i, void *p)
fi
fi
+AC_ARG_ENABLE([nis],
+ [AS_HELP_STRING([--disable-nis],
+ [do not build NIS and NIS+ support (nsswitch modules)])],
+ [build_nis=$enableval],
+ [build_nis=yes])
+AC_SUBST(build_nis)
+
# 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