domain.c: include <arpa/nameser_compat.h> if present

configure.ac: check for <arpa/nameser_compat.h>

diff --git a/citadel/ChangeLog b/citadel/ChangeLog
index 82f8478148bf6dadaf491b6eb046dcee8658b006..a27f0f57a5ee63c29d42937dcdd8a225b20a6c3d 100644 (file)
--- a/citadel/ChangeLog
+++ b/citadel/ChangeLog
@@ -1,4 +1,8 @@
  $Log$
+ Revision 612.11  2003/12/11 03:44:18  nbryant
+ domain.c: include <arpa/nameser_compat.h> if present
+ configure.ac: check for <arpa/nameser_compat.h>
+
  Revision 612.10  2003/12/10 03:58:26  ajc
  * Completed a more accurate implementation of the ENVELOPE fetch in IMAP.
 
@@ -5142,4 +5146,3 @@ Sat Jul 11 00:20:48 EDT 1998 Nathan Bryant <bryant@cs.usm.maine.edu>
 
 Fri Jul 10 1998 Art Cancro <ajc@uncensored.citadel.org>
        * Initial CVS import
-

diff --git a/citadel/configure.ac b/citadel/configure.ac
index c0aa5336c3361cb6313ea93ee4e1d59492fbca4f..c990f4b235dad05386f61d4d80aaec92399f7f26 100644 (file)
--- a/citadel/configure.ac
+++ b/citadel/configure.ac
@@ -421,7 +421,7 @@ dnl
 dnl TODO: for the DB header checks, we should check whether the headers
 dnl define db_env_create, somehow
 dnl
-AC_CHECK_HEADERS(curses.h dl.h fcntl.h limits.h malloc.h termios.h sys/ioctl.h sys/select.h sys/time.h syslog.h unistd.h utmp.h utmpx.h paths.h db.h db4/db.h pthread.h netinet/in.h arpa/nameser.h)
+AC_CHECK_HEADERS(curses.h dl.h fcntl.h limits.h malloc.h termios.h sys/ioctl.h sys/select.h sys/time.h syslog.h unistd.h utmp.h utmpx.h paths.h db.h db4/db.h pthread.h netinet/in.h arpa/nameser.h arpa/nameser_compat.h)
 
 dnl
 dnl need to check if this is actually compilable, sometimes there are

diff --git a/citadel/domain.c b/citadel/domain.c
index 6e098708936cafce5d217badad11094722769cf2..94d93d40711faed64f4fc0cd1f7b04a41bced017 100644 (file)
--- a/citadel/domain.c
+++ b/citadel/domain.c
@@ -14,6 +14,9 @@
 
 #ifdef HAVE_RESOLV_H
 #include <arpa/nameser.h>
+#ifdef HAVE_ARPA_NAMESER_COMPAT_H
+#include <arpa/nameser_compat.h>
+#endif
 #include <resolv.h>
 #endif