Fix issue with sctp config scripts not detecting netinet/in.h dependency. Also removing tabs from sctp m4 file

This commit was SVN r26599.

config/ompi_check_package.m4

@@ -11,6 +11,7 @@
 # Copyright (c) 2004-2005 The Regents of the University of California.
 #                         All rights reserved.
 # Copyright (c) 2012      Cisco Systems, Inc.  All rights reserved.
+# Copyright (c) 2012      Oracle and/or its affiliates.  All rights reserved.
 # $COPYRIGHT$
 # 
 # Additional copyrights may follow
@@ -19,7 +20,8 @@
 #
 
 # _OMPI_CHECK_PACKAGE_HEADER(prefix, header, dir-prefix, 
-#                            [action-if-found], [action-if-not-found])
+#                            [action-if-found], [action-if-not-found],
+*                            includes)
 # --------------------------------------------------------------------
 AC_DEFUN([_OMPI_CHECK_PACKAGE_HEADER], [
     # This is stolen from autoconf to peek under the covers to get the
@@ -46,7 +48,7 @@ AC_DEFUN([_OMPI_CHECK_PACKAGE_HEADER], [
           [AS_IF([test "$3" != ""],
                  [$1_CPPFLAGS="$$1_CPPFLAGS -I$3/include"
                   CPPFLAGS="$CPPFLAGS -I$3/include"])
-           AC_CHECK_HEADER([$2], [$4], [$5])],
+          AC_CHECK_HEADER([$2], [$4], [$5], [$6])],
           [$4])
     unset ompi_check_package_header_happy
     
@@ -137,7 +139,8 @@ AC_DEFUN([_OMPI_CHECK_PACKAGE_LIB], [
 #                    extra-libraries, 
 #                    dir-prefix,
 #                    libdir-prefix,
-#                    [action-if-found], [action-if-not-found]
+#                    [action-if-found], [action-if-not-found],
+#                    includes)
 # -----------------------------------------------------------
 # check for package defined by header and libs, and probably
 # located in dir-prefix, possibly with libs in libdir-prefix.
@@ -156,7 +159,8 @@ AC_DEFUN([OMPI_CHECK_PACKAGE],[
           [_OMPI_CHECK_PACKAGE_LIB([$1], [$3], [$4], [$5], [$6], [$7],
                 [ompi_check_package_happy="yes"],
                 [ompi_check_package_happy="no"])],
-          [ompi_check_package_happy="no"])
+          [ompi_check_package_happy="no"],
+          [$10])
 
     AS_IF([test "$ompi_check_package_happy" = "yes"],
           [$8],

ompi/mca/btl/sctp/configure.m4

@@ -11,6 +11,7 @@
 # Copyright (c) 2004-2005 The Regents of the University of California.
 #                         All rights reserved.
 # Copyright (c) 2009-2010 Cisco Systems, Inc.  All rights reserved.
+# Copyright (c) 2012      Oracle and/or its affiliates.  All rights reserved.
 # $COPYRIGHT$
 # 
 # Additional copyrights may follow
@@ -99,7 +100,7 @@ AC_DEFUN([OMPI_CHECK_SCTP],[
                 [ompi_check_sctp_dir="$with_sctp"])
             AS_IF([test ! -z "$with_sctp_libdir" -a "$with_sctp_libdir" != "yes"],
                 [ompi_check_sctp_libdir="$with_sctp_libdir"])
-
+            AC_CHECK_HEADERS([netinet/in.h])
             OMPI_CHECK_PACKAGE([$1],
                 [netinet/sctp.h],
                 [$ompi_sctp_api_libname],
@@ -108,7 +109,12 @@ AC_DEFUN([OMPI_CHECK_SCTP],[
                 [$ompi_check_sctp_dir],
                 [$ompi_check_sctp_libdir],
                 [ompi_check_sctp_happy="yes"],
-		[ompi_check_sctp_happy="no"])
+                [ompi_check_sctp_happy="no"],
+                [
+#ifdef HAVE_NETINET_IN_H
+#include <netinet/in.h>
+#endif
+                ])
             ],
         [ompi_check_sctp_happy="no"])