From: Mark Andrews <marka@isc.org>
Date: Thu, 16 Aug 2001 06:39:33 +0000 (+0000)
Subject:  960.   [port]          liblwres failed to build on systems with support for
X-Git-Tag: v9.2.2rc1~33
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2449f41e75d3b3f1c0ec3f05b1603fd8f80d8ae0;p=thirdparty%2Fbind9.git

 960.   [port]          liblwres failed to build on systems with support for
                        getrrsetbyname() in the OS.  [RT #1592]
---

diff --git a/CHANGES b/CHANGES
index 833142a5fa1..615e090033f 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,6 @@
+ 960.	[port]		liblwres failed to build on systems with support for
+			getrrsetbyname() in the OS.  [RT #1592]
+
  959.	[port]		freebsd: ncpus via sysctlbyname().  [RT #1584]
 
  958.	[port]		ssize_t is not available on all platforms.  [RT #1607]
diff --git a/configure.in b/configure.in
index 9b2c1b55e5a..a6bfdc62773 100644
--- a/configure.in
+++ b/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.290 $)
+AC_REVISION($Revision: 1.291 $)
 
 AC_INIT(lib/dns/name.c)
 AC_PREREQ(2.13)
@@ -1210,6 +1210,20 @@ AC_TRY_COMPILE([
 	ISC_LWRES_NEEDADDRINFO="#define ISC_LWRES_NEEDADDRINFO 1"])
 AC_SUBST(ISC_LWRES_NEEDADDRINFO)
 
+#
+# Check for rrsetinfo
+#
+AC_MSG_CHECKING(for struct rrsetinfo)
+AC_TRY_COMPILE([
+#include <netdb.h>],
+[struct rrsetinfo r; return (0);],
+	[AC_MSG_RESULT(yes)
+	ISC_LWRES_NEEDRRSETINFO="#undef ISC_LWRES_NEEDRRSETINFO"
+	AC_DEFINE(HAVE_RRSETINFO)],
+	[AC_MSG_RESULT(no)
+	ISC_LWRES_NEEDRRSETINFO="#define ISC_LWRES_NEEDRRSETINFO 1"])
+AC_SUBST(ISC_LWRES_NEEDRRSETINFO)
+
 AC_MSG_CHECKING(for int sethostent)
 AC_TRY_COMPILE([
 #include <netdb.h>],
diff --git a/lib/lwres/include/lwres/netdb.h.in b/lib/lwres/include/lwres/netdb.h.in
index f6f2a92c45f..065fc1ba91f 100644
--- a/lib/lwres/include/lwres/netdb.h.in
+++ b/lib/lwres/include/lwres/netdb.h.in
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: netdb.h.in,v 1.33 2001/07/02 21:28:55 gson Exp $ */
+/* $Id: netdb.h.in,v 1.34 2001/08/16 06:39:33 marka Exp $ */
 
 #ifndef LWRES_NETDB_H
 #define LWRES_NETDB_H 1
@@ -153,6 +153,12 @@ struct addrinfo {
 #define	NI_DGRAM	0x00000010
 #define	NI_NUMERICSCOPE	0x00000020	/*2553bis-00*/
 
+/*
+ * Define if <netdb.h> does not declare struct rrsetinfo.
+ */
+@ISC_LWRES_NEEDRRSETINFO@
+
+#ifdef ISC_LWRES_NEEDRRSETINFO
 /*
  * Structures for getrrsetbyname()
  */
@@ -188,6 +194,7 @@ struct rrsetinfo {
 #define ERRSET_INVAL		3
 #define	ERRSET_NONAME	 	4
 #define	ERRSET_NODATA	 	5
+#endif
 
 /*
  * Define to map into lwres_ namespace.