Fix issue with sctp config scripts not detecting netinet/in.h dependency. Also removing tabs from sctp m4 file
This commit was SVN r26599.
Этот коммит содержится в:
Terry Dontje
родитель
5d61dffbbc
Коммит
634fc278d9
@ -10,7 +10,8 @@
|
||||
# University of Stuttgart. All rights reserved.
|
||||
# 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 Cisco Systems, Inc. All rights reserved.
|
||||
# Copyright (c) 2012 Oracle and/or its affiliates. All rights reserved.
|
||||
# $COPYRIGHT$
|
||||
#
|
||||
# Additional copyrights may follow
|
||||
@ -18,8 +19,9 @@
|
||||
# $HEADER$
|
||||
#
|
||||
|
||||
# _OMPI_CHECK_PACKAGE_HEADER(prefix, header, dir-prefix,
|
||||
# [action-if-found], [action-if-not-found])
|
||||
# _OMPI_CHECK_PACKAGE_HEADER(prefix, header, dir-prefix,
|
||||
# [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.
|
||||
@ -152,11 +155,12 @@ AC_DEFUN([OMPI_CHECK_PACKAGE],[
|
||||
ompi_check_package_$1_orig_LDFLAGS="$$1_LDFLAGS"
|
||||
ompi_check_package_$1_orig_LIBS="$$1_LIBS"
|
||||
|
||||
_OMPI_CHECK_PACKAGE_HEADER([$1], [$2], [$6],
|
||||
_OMPI_CHECK_PACKAGE_HEADER([$1], [$2], [$6],
|
||||
[_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],
|
||||
|
||||
@ -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
|
||||
@ -25,12 +26,12 @@
|
||||
# support, otherwise executes action-if-not-found
|
||||
AC_DEFUN([OMPI_CHECK_SCTP],[
|
||||
AC_ARG_WITH([sctp],
|
||||
[AC_HELP_STRING([--with-sctp(=DIR)],
|
||||
[Build SCTP support, searching for libraries in DIR])])
|
||||
[AC_HELP_STRING([--with-sctp(=DIR)],
|
||||
[Build SCTP support, searching for libraries in DIR])])
|
||||
OMPI_CHECK_WITHDIR([sctp], [$with_sctp], [include/netinet/sctp.h])
|
||||
AC_ARG_WITH([sctp-libdir],
|
||||
[AC_HELP_STRING([--with-sctp-libdir=DIR],
|
||||
[Search for SCTP libraries in DIR])])
|
||||
[AC_HELP_STRING([--with-sctp-libdir=DIR],
|
||||
[Search for SCTP libraries in DIR])])
|
||||
|
||||
btl_sctp_CFLAGS="`echo $CFLAGS`"
|
||||
#only try to build this on Solaris, Linux, Mac OS X, or some BSD variant
|
||||
@ -38,85 +39,90 @@ AC_DEFUN([OMPI_CHECK_SCTP],[
|
||||
ompi_sctp_api_libname="sctp"
|
||||
case "$host" in
|
||||
*linux*)
|
||||
ompi_sctp_try_to_build="yes"
|
||||
ompi_sctp_try_to_build="yes"
|
||||
AC_DEFINE(OMPI_MCA_BTL_SCTP_USE_ONE_TO_ONE_SOCKET, 0,
|
||||
[Default value for socket style to use with SCTP BTL])
|
||||
AC_DEFINE(OMPI_MCA_BTL_SCTP_CONCATENATES_IOVS, 0,
|
||||
[False if you can use iovec's directly with SCTP BTL])
|
||||
;;
|
||||
;;
|
||||
*bsd*)
|
||||
case "$host" in
|
||||
*freebsd7*)
|
||||
# FreeBSD 7 has SCTP in an unpatched default kernel with
|
||||
# the SCTP API contained within libc.
|
||||
ompi_sctp_api_libname="c"
|
||||
;;
|
||||
*)
|
||||
# keep the default lib (sctp not c)
|
||||
;;
|
||||
esac
|
||||
case "$host" in
|
||||
*freebsd7*)
|
||||
# FreeBSD 7 has SCTP in an unpatched default kernel with
|
||||
# the SCTP API contained within libc.
|
||||
ompi_sctp_api_libname="c"
|
||||
;;
|
||||
*)
|
||||
# keep the default lib (sctp not c)
|
||||
;;
|
||||
esac
|
||||
|
||||
# only add -DFREEBSD once to get extra sin_len field
|
||||
btl_sctp_CFLAGS="`echo $btl_sctp_CFLAGS | sed 's/-DFREEBSD//g'`"
|
||||
btl_sctp_CFLAGS="$btl_sctp_CFLAGS -DFREEBSD"
|
||||
ompi_sctp_try_to_build="yes"
|
||||
ompi_sctp_try_to_build="yes"
|
||||
AC_DEFINE(OMPI_MCA_BTL_SCTP_USE_ONE_TO_ONE_SOCKET, 0,
|
||||
[Default value for socket style to use with SCTP BTL])
|
||||
AC_DEFINE(OMPI_MCA_BTL_SCTP_CONCATENATES_IOVS, 0,
|
||||
[False if you can use iovec's directly with SCTP BTL])
|
||||
AC_MSG_WARN([Adding -DFREEBSD to set extra sin_len field in sockaddr.])
|
||||
;;
|
||||
AC_MSG_WARN([Adding -DFREEBSD to set extra sin_len field in sockaddr.])
|
||||
;;
|
||||
# Mac OS X support for SCTP NKE. Adjustments should look like *bsd*...
|
||||
*darwin*)
|
||||
# only add -DFREEBSD once to get extra sin_len field
|
||||
btl_sctp_CFLAGS="`echo $btl_sctp_CFLAGS | sed 's/-DFREEBSD//g'`"
|
||||
btl_sctp_CFLAGS="$btl_sctp_CFLAGS -DFREEBSD"
|
||||
ompi_sctp_try_to_build="yes"
|
||||
ompi_sctp_try_to_build="yes"
|
||||
AC_DEFINE(OMPI_MCA_BTL_SCTP_USE_ONE_TO_ONE_SOCKET, 0,
|
||||
[Default value for socket style to use with SCTP BTL])
|
||||
AC_DEFINE(OMPI_MCA_BTL_SCTP_CONCATENATES_IOVS, 0,
|
||||
[False if you can use iovec's directly with SCTP BTL])
|
||||
AC_MSG_WARN([Adding -DFREEBSD to set extra sin_len field in sockaddr.])
|
||||
;;
|
||||
AC_MSG_WARN([Adding -DFREEBSD to set extra sin_len field in sockaddr.])
|
||||
;;
|
||||
*solaris*)
|
||||
# Solaris SCTP stack makes different assumptions about one-to-many
|
||||
# sockets so change the default to use one-to-one sockets
|
||||
ompi_sctp_try_to_build="yes"
|
||||
ompi_sctp_try_to_build="yes"
|
||||
AC_DEFINE(OMPI_MCA_BTL_SCTP_USE_ONE_TO_ONE_SOCKET, 1,
|
||||
[Default value for socket style to use with SCTP BTL])
|
||||
AC_DEFINE(OMPI_MCA_BTL_SCTP_CONCATENATES_IOVS, 1,
|
||||
[False if you can use iovec's directly with SCTP BTL])
|
||||
;;
|
||||
;;
|
||||
*)
|
||||
AC_MSG_WARN([Only build sctp BTL on Solaris, Linux, Mac OS X, and BSD variants])
|
||||
;;
|
||||
AC_MSG_WARN([Only build sctp BTL on Solaris, Linux, Mac OS X, and BSD variants])
|
||||
;;
|
||||
esac
|
||||
|
||||
OMPI_CHECK_WITHDIR([sctp-libdir], [$with_sctp_libdir], [lib${ompi_sctp_api_libname}.*])
|
||||
|
||||
AS_IF([test "$with_sctp" != "no" -a "$ompi_sctp_try_to_build" = "yes"],
|
||||
[AS_IF([test ! -z "$with_sctp" -a "$with_sctp" != "yes"],
|
||||
[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"])
|
||||
|
||||
OMPI_CHECK_PACKAGE([$1],
|
||||
[netinet/sctp.h],
|
||||
[$ompi_sctp_api_libname],
|
||||
[sctp_recvmsg],
|
||||
[],
|
||||
[$ompi_check_sctp_dir],
|
||||
[$ompi_check_sctp_libdir],
|
||||
[ompi_check_sctp_happy="yes"],
|
||||
[ompi_check_sctp_happy="no"])
|
||||
],
|
||||
[ompi_check_sctp_happy="no"])
|
||||
[AS_IF([test ! -z "$with_sctp" -a "$with_sctp" != "yes"],
|
||||
[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],
|
||||
[sctp_recvmsg],
|
||||
[],
|
||||
[$ompi_check_sctp_dir],
|
||||
[$ompi_check_sctp_libdir],
|
||||
[ompi_check_sctp_happy="yes"],
|
||||
[ompi_check_sctp_happy="no"],
|
||||
[
|
||||
#ifdef HAVE_NETINET_IN_H
|
||||
#include <netinet/in.h>
|
||||
#endif
|
||||
])
|
||||
],
|
||||
[ompi_check_sctp_happy="no"])
|
||||
|
||||
AS_IF([test "$ompi_check_sctp_happy" = "yes"],
|
||||
[$2],
|
||||
[AS_IF([test ! -z "$with_sctp" -a "$with_sctp" != "no"],
|
||||
[AC_MSG_ERROR([SCTP support requested but not found. Aborting])])
|
||||
$3])
|
||||
[$2],
|
||||
[AS_IF([test ! -z "$with_sctp" -a "$with_sctp" != "no"],
|
||||
[AC_MSG_ERROR([SCTP support requested but not found. Aborting])])
|
||||
$3])
|
||||
])
|
||||
|
||||
|
||||
|
||||
Загрузка…
x
Ссылка в новой задаче
Block a user