- (djm) Only build getrrsetbyname replacement when using --with-dns

diff --git a/ChangeLog b/ChangeLog
index 469c41b802a780c09e5419493a19f488bc4623e2..8b58b1455623f5595de43b408a9ffb667d45a2ce 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -48,7 +48,7 @@
  - (djm) Adapt README.dns for portable
  - (djm) Avoid uuencode.c warnings
  - (djm) Enable UsePAM when built --with-pam
-
+ - (djm) Only build getrrsetbyname replacement when using --with-dns
 20030514
  - (djm) Bug #117: Don't lie to PAM about username
  - (djm) RCSID sync w/ OpenBSD

diff --git a/openbsd-compat/getrrsetbyname.c b/openbsd-compat/getrrsetbyname.c
index 03637c9ef693c884469ef3d210f5aea9118018de..1a4d9c14b297c4c2b084b5bb50685a4db5a17504 100644 (file)
--- a/openbsd-compat/getrrsetbyname.c
+++ b/openbsd-compat/getrrsetbyname.c
@@ -45,7 +45,7 @@
 
 #include "includes.h"
 
-#ifndef HAVE_GETRRSETBYNAME
+#if defined(DNS) && !defined(HAVE_GETRRSETBYNAME)
 
 #include "getrrsetbyname.h"
 
@@ -564,4 +564,4 @@ count_dns_rr(struct dns_rr *p, u_int16_t class, u_int16_t type)
        return (n);
 }
 
-#endif /* HAVE_GETRRSETBYNAME */
+#endif /* defined(DNS) && !defined(HAVE_GETRRSETBYNAME) */

diff --git a/openbsd-compat/getrrsetbyname.h b/openbsd-compat/getrrsetbyname.h
index 0482801920cbba946e22015c4a9c31758b6a17a5..9edaf0ae2e19a1e825d822e83f9ecc854637b06f 100644 (file)
--- a/openbsd-compat/getrrsetbyname.h
+++ b/openbsd-compat/getrrsetbyname.h
@@ -18,7 +18,7 @@
  * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
  * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
  * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT 
  * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
@@ -48,7 +48,7 @@
 
 #include "config.h"
 
-#ifndef HAVE_GETRRSETBYNAME
+#if defined(DNS) && !defined(HAVE_GETRRSETBYNAME)
 
 #include <sys/types.h>
 #include <netinet/in.h>
@@ -95,5 +95,6 @@ struct rrsetinfo {
 int            getrrsetbyname(const char *, unsigned int, unsigned int, unsigned int, struct rrsetinfo **);
 void           freerrset(struct rrsetinfo *);
 
-#endif /* HAVE_GETRRSETBYNAME */
+#endif /* defined(DNS) && !defined(HAVE_GETRRSETBYNAME) */
+
 #endif /* _GETRRSETBYNAME_H */