- (tim) [configure.ac] Some platforms need sys/types.h for arpa/nameser.h.

   Take AC_CHECK_HEADERS test out of ultrix section. It caused other platforms
   to skip builtin standard includes tests. (first AC_CHECK_HEADERS test
   must be run on all platforms) Add missing ;; to case statement. OK dtucker@

2 files changed, 12 insertions, 4 deletions

diff --git a/ChangeLog b/ChangeLog
index 67d44780c..a24199236 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+20050602
+ - (tim) [configure.ac] Some platforms need sys/types.h for arpa/nameser.h.
+   Take AC_CHECK_HEADERS test out of ultrix section. It caused other platforms
+   to skip builtin standard includes tests. (first AC_CHECK_HEADERS test
+   must be run on all platforms) Add missing ;; to case statement. OK dtucker@
+
 20050601
  - (dtucker) [configure.ac] Look for _getshort and _getlong in
    arpa/nameser.h.
@@ -2667,4 +2673,4 @@
    - (djm) Trim deprecated options from INSTALL. Mention UsePAM
    - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
 
-$Id: ChangeLog,v 1.3809 2005/06/02 03:09:28 tim Exp $
+$Id: ChangeLog,v 1.3810 2005/06/03 03:28:29 tim Exp $
diff --git a/configure.ac b/configure.ac
index 61132acd0..bca35a633 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-# $Id: configure.ac,v 1.271 2005/06/02 03:09:28 tim Exp $
+# $Id: configure.ac,v 1.272 2005/06/03 03:28:29 tim Exp $
 #
 # Copyright (c) 1999-2004 Damien Miller
 #
@@ -479,7 +479,8 @@ mips-sony-bsd|mips-sony-newsos4)
         AC_DEFINE(BROKEN_GETGROUPS, [], [getgroups(0,NULL) will return -1])
         AC_DEFINE(BROKEN_MMAP, [], [Ultrix mmap can't map files])
         AC_DEFINE(NEED_SETPRGP, [], [Need setpgrp to acquire controlling tty])
-        AC_CHECK_HEADERS(sys/syslog.h)
+        AC_DEFINE(HAVE_SYS_SYSLOG_H, 1, [Force use of sys/syslog.h on Ultrix])
+        ;;
 esac
 
 # Allow user to specify flags
@@ -2540,7 +2541,8 @@ int main()
                     ])
                 AC_CHECK_FUNCS(_getshort _getlong)
                 AC_CHECK_DECLS([_getshort, _getlong], , ,
-                    [#include <arpa/nameser.h>])
+                    [#include <sys/types.h>
+                    #include <arpa/nameser.h>])
                 AC_CHECK_MEMBER(HEADER.ad,
                         [AC_DEFINE(HAVE_HEADER_AD)],,
                         [#include <arpa/nameser.h>])