From a10ae596379471b0dc76ebd8025d91bf2b90bafc Mon Sep 17 00:00:00 2001
From: Mark Andrews <marka@isc.org>
Date: Mon, 6 Dec 2004 21:56:57 +0000
Subject: [PATCH] 1775.   [bug]           Only compile getnetent_r.c when
 threaded. [RT #13205]

---
 CHANGES                  | 2 ++
 lib/bind/configure.in    | 5 ++++-
 lib/bind/irs/Makefile.in | 8 +++++---
 3 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/CHANGES b/CHANGES
index db7fc4103e..a2d812e2ca 100644
--- a/CHANGES
+++ b/CHANGES
@@ -28,6 +28,8 @@
 1776.   [port]   	Solaris 2.9: fix broken IN6ADDR_ANY_INIT and
                         IN6ADDR_LOOPBACK_INIT macros.
 
+1775.	[bug]		Only compile getnetent_r.c when threaded. [RT #13205]
+
 1774.	[port]		Aix: Silence compiler warnings / build failures.
 			[RT #13154]
 
diff --git a/lib/bind/configure.in b/lib/bind/configure.in
index d2289a16ef..19a8fb9ea5 100644
--- a/lib/bind/configure.in
+++ b/lib/bind/configure.in
@@ -13,7 +13,7 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 
-AC_REVISION($Revision: 1.98 $)
+AC_REVISION($Revision: 1.99 $)
 
 AC_INIT(resolv/herror.c)
 AC_PREREQ(2.13)
@@ -508,6 +508,7 @@ then
 	WANT_IRS_THREADSGR_OBJS="\${WANT_IRS_THREADSGR_OBJS}"
 	WANT_IRS_THREADSPW_OBJS="\${WANT_IRS_THREADSPW_OBJS}"
 	WANT_IRS_THREADS_OBJS="\${WANT_IRS_THREADS_OBJS}"
+	WANT_THREADS_OBJS="\${WANT_THREADS_OBJS}"
 	thread_dir=pthreads
 else
 	ALWAYS_DEFINES=""
@@ -515,6 +516,7 @@ else
 	WANT_IRS_THREADSGR_OBJS=""
 	WANT_IRS_THREADSPW_OBJS=""
 	WANT_IRS_THREADS_OBJS=""
+	WANT_THREADS_OBJS=""
 	thread_dir=nothreads
 fi
 
@@ -525,6 +527,7 @@ AC_SUBST(DO_PTHREADS)
 AC_SUBST(WANT_IRS_THREADSGR_OBJS)
 AC_SUBST(WANT_IRS_THREADSPW_OBJS)
 AC_SUBST(WANT_IRS_THREADS_OBJS)
+AC_SUBST(WANT_THREADS_OBJS)
 
 AC_CHECK_FUNC(if_nametoindex,
 	[USE_IFNAMELINKID="#define USE_IFNAMELINKID 1"],
diff --git a/lib/bind/irs/Makefile.in b/lib/bind/irs/Makefile.in
index 5a754f2e65..f071069be3 100644
--- a/lib/bind/irs/Makefile.in
+++ b/lib/bind/irs/Makefile.in
@@ -13,7 +13,7 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: Makefile.in,v 1.8 2004/03/05 05:05:36 marka Exp $
+# $Id: Makefile.in,v 1.9 2004/12/06 21:56:57 marka Exp $
 
 srcdir=		@srcdir@
 VPATH =         @srcdir@
@@ -34,13 +34,15 @@ WANT_IRS_PW_OBJS= dns_pw.@O@ gen_pw.@O@ getpwent.@O@ \
 WANT_IRS_NIS_OBJS= \
 	nis_ho.@O@ nis_ng.@O@ nis_nw.@O@ nis_pr.@O@ nis_sv.@O@
 
+WANT_THREADS_OBJS=getnetent_r.@O@
+
 OBJS=	@WANT_IRS_GR_OBJS@ @WANT_IRS_NIS_OBJS@ @WANT_IRS_THREADS_OBJS@ \
-	@WANT_IRS_PW_OBJS@ \
+	@WANT_IRS_PW_OBJS@ @WANT_THREADS_OBJS@ \
 	dns.@O@ dns_ho.@O@ dns_nw.@O@ dns_pr.@O@ \
 	dns_sv.@O@ gai_strerror.@O@ gen.@O@ gen_ho.@O@ \
 	gen_ng.@O@ gen_nw.@O@ gen_pr.@O@ gen_sv.@O@ \
 	getaddrinfo.@O@ gethostent.@O@ \
-	getnameinfo.@O@ getnetent.@O@ getnetent_r.@O@ \
+	getnameinfo.@O@ getnetent.@O@ \
 	getnetgrent.@O@ getprotoent.@O@ getservent.@O@ \
 	hesiod.@O@ irp.@O@ irp_ho.@O@ irp_ng.@O@ irp_nw.@O@ \
 	irp_pr.@O@ irp_sv.@O@ irpmarshall.@O@ irs_data.@O@ \