962. [bug] libbind: bad "#undef", don't attempt to install

                        non-existant nlist.h.  [RT #1640]

diff --git a/CHANGES b/CHANGES
index 4fd1483eefe5ffa835c2ab63f8983d5541d093c5..3841bd20d3dd6ac9ebe2828b731868aef69534bf 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,6 @@
+ 962.  [bug]           libbind: bad "#undef", don't attempt to install
+                       non-existant nlist.h.  [RT #1640]
+
  961.  [bug]           Tried to use a IPV6 feature when ISC_PLATFORM_HAVEIPV6
                        was not defined.  [RT #1482]
 

diff --git a/lib/bind/configure.in b/lib/bind/configure.in
index e20a2434335e7fe5e9bed1e213c653fb9d7f899f..fa29304cc0f6c61d2f096a9d42e9f62063c338cb 100644 (file)
--- a/lib/bind/configure.in
+++ b/lib/bind/configure.in
@@ -18,7 +18,7 @@ AC_DIVERT_PUSH(AC_DIVERSION_NOTICE)dnl
 esyscmd([sed "s/^/# /" COPYRIGHT])dnl
 AC_DIVERT_POP()dnl
 
-AC_REVISION($Revision: 1.81 $)
+AC_REVISION($Revision: 1.82 $)
 
 AC_INIT(resolv/herror.c)
 AC_PREREQ(2.13)
@@ -1722,7 +1722,7 @@ HOST_R_SET_RETURN="#define HOST_R_SET_RETURN void"],
 )
 )
 ,
-HOST_R_SET_RESULT="#undef HOST_R_SET_RESULT/"
+HOST_R_SET_RESULT="#undef HOST_R_SET_RESULT"
 HOST_R_SET_RETURN="#define HOST_R_SET_RETURN void"
 )
 AC_SUBST(HOST_R_SET_RESULT)

diff --git a/lib/bind/port/linux/include/Makefile.in b/lib/bind/port/linux/include/Makefile.in
index 7031b2c8f18f55469a33458295d1e5b37ab7aa84..e309cd64596d1c120b98da402440d3675f016412 100644 (file)
--- a/lib/bind/port/linux/include/Makefile.in
+++ b/lib/bind/port/linux/include/Makefile.in
@@ -13,13 +13,12 @@
 # NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
 # WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: Makefile.in,v 1.1 2001/06/29 15:25:21 marka Exp $
+# $Id: Makefile.in,v 1.2 2001/08/20 07:44:49 marka Exp $
 
 srcdir =        @srcdir@
 VPATH =         @srcdir@
 top_srcdir =    @top_srcdir@
 
-HEADERS= nlist.h
 NHEADERS= net/route.h
 SHEADERS= sys/mbuf.h
 
@@ -32,9 +31,6 @@ installdirs:
        ${DESTDIR}${includedir}/sys 
 
 install:: installdirs
-       for i in ${HEADERS}; do \
-               ${INSTALL_DATA} ${srcdir}/$$i ${DESTDIR}${includedir}; \
-       done
        for i in ${NHEADERS}; do \
                ${INSTALL_DATA} ${srcdir}/$$i ${DESTDIR}${includedir}/net; \
        done

diff --git a/lib/bind/port/linux/include/nlist.h b/lib/bind/port/linux/include/nlist.h
deleted file mode 100644 (file)
index 1d97b17..0000000
--- a/lib/bind/port/linux/include/nlist.h
+++ /dev/null
@@ -1,3 +0,0 @@
-#if __GLIBC__ < 2
-#  include_next <nlist.h>
-#endif

diff --git a/lib/bind/port/mpe/include/Makefile.in b/lib/bind/port/mpe/include/Makefile.in
index c5ed33c3dfe9552e50b4281c3411fdabb3d69443..a9fa2ba788cd1d048820cb4a582faf88ec1da59b 100644 (file)
--- a/lib/bind/port/mpe/include/Makefile.in
+++ b/lib/bind/port/mpe/include/Makefile.in
@@ -13,13 +13,13 @@
 # NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
 # WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: Makefile.in,v 1.1 2001/06/29 15:25:21 marka Exp $
+# $Id: Makefile.in,v 1.2 2001/08/20 07:44:52 marka Exp $
 
 srcdir =        @srcdir@
 VPATH =         @srcdir@
 top_srcdir =    @top_srcdir@
 
-HEADERS= nlist.h paths.h utmp.h
+HEADERS= paths.h utmp.h
 NHEADERS= net/route.h
 SHEADERS= sys/bitypes.h sys/cdefs.h sys/file.h sys/mbuf.h sys/param.h \
          sys/time.h

diff --git a/lib/bind/port/qnx/include/Makefile.in b/lib/bind/port/qnx/include/Makefile.in
index feec2a633ac8f36c3414cc7742e4d56affb98613..e9ea80abd813b7068d16613906c4f4cfd8673c75 100644 (file)
--- a/lib/bind/port/qnx/include/Makefile.in
+++ b/lib/bind/port/qnx/include/Makefile.in
@@ -13,13 +13,13 @@
 # NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
 # WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: Makefile.in,v 1.1 2001/06/29 15:25:22 marka Exp $
+# $Id: Makefile.in,v 1.2 2001/08/20 07:44:53 marka Exp $
 
 srcdir =        @srcdir@
 VPATH =         @srcdir@
 top_srcdir =    @top_srcdir@
 
-HEADERS= db.h nlist.h paths.h
+HEADERS= db.h paths.h
 SHEADERS= sys/bitypes.h sys/cdefs.h sys/ioctl.h sys/mbuf.h sys/resource.h
 
 all: