redo

1775.   [bug]           Only compile getnetent_r.c when threaded. [RT #13205]

diff --git a/lib/bind/Makefile.in b/lib/bind/Makefile.in
index 9396bfeb6c66d71c27c4afdf9bf52dc2b1363f2a..c52df6fe34c9193a63500e53d7625ede00e391c5 100644 (file)
--- a/lib/bind/Makefile.in
+++ b/lib/bind/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.23 2004/07/20 07:13:40 marka Exp $
+# $Id: Makefile.in,v 1.24 2004/12/07 00:36:27 marka Exp $
 
 srcdir =        @srcdir@
 VPATH =         @srcdir@
@@ -40,8 +40,8 @@ INETOBJS= inet/inet_addr.@O@ inet/inet_cidr_ntop.@O@ inet/inet_cidr_pton.@O@ \
        inet/inet_netof.@O@ inet/inet_network.@O@ inet/inet_ntoa.@O@ \
        inet/inet_ntop.@O@ inet/inet_pton.@O@ inet/nsap_addr.@O@
 
-WANT_IRS_THREADS_OBJS= irs/gethostent_r.@O@ irs/getnetgrent_r.@O@ \
-       irs/getprotoent_r.@O@ irs/getservent_r.@O@
+WANT_IRS_THREADS_OBJS= irs/gethostent_r.@O@ irs/getnetent_r.@O@ \
+       irs/getnetgrent_r.@O@ irs/getprotoent_r.@O@ irs/getservent_r.@O@
 
 WANT_IRS_NISGR_OBJS= irs/nis_gr.@O@ 
 WANT_IRS_GR_OBJS= irs/dns_gr.@O@ irs/irp_gr.@O@ irs/lcl_gr.@O@ irs/gen_gr.@O@ \
@@ -62,7 +62,7 @@ IRSOBJS= @WANT_IRS_GR_OBJS@ @WANT_IRS_NIS_OBJS@ @WANT_IRS_THREADS_OBJS@ \
        irs/dns_sv.@O@ irs/gai_strerror.@O@ irs/gen.@O@ irs/gen_ho.@O@ \
        irs/gen_ng.@O@ irs/gen_nw.@O@ irs/gen_pr.@O@ irs/gen_sv.@O@ \
        irs/getaddrinfo.@O@ irs/gethostent.@O@  irs/getnameinfo.@O@ \
-       irs/getnetent.@O@ irs/getnetent_r.@O@ irs/getnetgrent.@O@ \
+       irs/getnetent.@O@ irs/getnetgrent.@O@ \
        irs/getprotoent.@O@ irs/getservent.@O@ irs/hesiod.@O@ \
        irs/irp.@O@ irs/irp_ho.@O@ irs/irp_ng.@O@ irs/irp_nw.@O@ \
        irs/irp_pr.@O@ irs/irp_sv.@O@ irs/irpmarshall.@O@ irs/irs_data.@O@ \

diff --git a/lib/bind/irs/Makefile.in b/lib/bind/irs/Makefile.in
index f071069be3208d623196b1f52c775ba21f15a417..f0ba80213ea5b3b7d879e96dadc9d89308a6901a 100644 (file)
--- a/lib/bind/irs/Makefile.in
+++ b/lib/bind/irs/Makefile.in
@@ -13,12 +13,12 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: Makefile.in,v 1.9 2004/12/06 21:56:57 marka Exp $
+# $Id: Makefile.in,v 1.10 2004/12/07 00:36:27 marka Exp $
 
 srcdir=                @srcdir@
 VPATH =         @srcdir@
 
-WANT_IRS_THREADS_OBJS= gethostent_r.@O@ getnetgrent_r.@O@ \
+WANT_IRS_THREADS_OBJS= gethostent_r.@O@ getnetent_r.@O@ getnetgrent_r.@O@ \
        getprotoent_r.@O@ getservent_r.@O@
 
 WANT_IRS_NISGR_OBJS= nis_gr.@O@ 
@@ -34,10 +34,8 @@ 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_THREADS_OBJS@ \
+       @WANT_IRS_PW_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@ \