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

diff --git a/CHANGES b/CHANGES
index db7fc4103e84554bbb518c689d7d011cde877142..a2d812e2ca91620969964143f1ea61e2679f7ec3 100644 (file)
--- 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 d2289a16ef541ce323096892b3bc463c397dc960..19a8fb9ea528a9f2ecb41522a6f03dd9713161e0 100644 (file)
--- 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 5a754f2e65d39b1a3d33ca696b5625c110eea2fa..f071069be3208d623196b1f52c775ba21f15a417 100644 (file)
--- 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@ \