From a963aebfdbcf60bdc1c052fd1c1bf3cc9f9be143 Mon Sep 17 00:00:00 2001
From: Jeff Squyres <jsquyres@cisco.com>
Date: Thu, 12 May 2005 01:42:24 +0000
Subject: [PATCH] Fix the check for socklen_t.

This commit was SVN r5691.
---
 configure.ac | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/configure.ac b/configure.ac
index b5cec4d405..1b3a90520d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -188,6 +188,16 @@ AC_CHECK_TYPES(intptr_t)
 AC_CHECK_TYPES(uintptr_t)
 AC_CHECK_TYPES(mode_t)
 
+# socklen_t needs <sys/socket.h>, which will not be covered by the
+# standard includes for AC_CHECK_TYPES
+
+AC_CHECK_TYPES(socklen_t, [AC_DEFINE(HAVE_SOCKLEN_T, 1, 
+                                     [Whether we have socklen_t or not])],
+               [], [AC_INCLUDES_DEFAULT
+#include <sys/socket.h>])
+
+
+
 #
 # Check for type sizes
 #
@@ -1093,14 +1103,6 @@ AC_DEFINE_UNQUOTED(OMPI_USE_STDBOOL_H, $OMPI_USE_STDBOOL_H,
 AC_MSG_RESULT([$MSG])
 
 
-# Check for socklen_t.  Don't do this with all the other
-# AC_CHECK_TYPES checks, above, because we want this to be after the
-# big AC_CHECK_HEADERS (above) so that the test will automatically
-# include <sys/socket.h>, which is where socklen_t should be defined.
-
-AC_CHECK_TYPES(socklen_t)
-
-
 ##################################
 # Libraries
 ##################################