From 225c684ccc27d5d415ff22a9aecda550b076cedd Mon Sep 17 00:00:00 2001 From: Jeff Squyres Date: Sun, 16 Nov 2014 12:44:14 -0800 Subject: [PATCH] opal_check_portals.m4: remove this unused file It looks like OPAL_CHECK_PORTALS is not used anywhere; it looks like it has been completely replaced by opal_check_portals4.m4 (OPAL_CHECK_PORTALS4). --- config/opal_check_portals.m4 | 158 ----------------------------------- 1 file changed, 158 deletions(-) delete mode 100644 config/opal_check_portals.m4 diff --git a/config/opal_check_portals.m4 b/config/opal_check_portals.m4 deleted file mode 100644 index d3dd0e0cc6f..00000000000 --- a/config/opal_check_portals.m4 +++ /dev/null @@ -1,158 +0,0 @@ -# -*- shell-script -*- -# -# Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana -# University Research and Technology -# Corporation. All rights reserved. -# Copyright (c) 2004-2005 The University of Tennessee and The University -# of Tennessee Research Foundation. All rights -# reserved. -# Copyright (c) 2004-2005 High Performance Computing Center Stuttgart, -# University of Stuttgart. All rights reserved. -# Copyright (c) 2004-2006 The Regents of the University of California. -# All rights reserved. -# Copyright (c) 2009 Cisco Systems, Inc. All rights reserved. -# $COPYRIGHT$ -# -# Additional copyrights may follow -# -# $HEADER$ -# - -# OPAL_CHECK_PORTALS(prefix, [action-if-found], [action-if-not-found]) -# -------------------------------------------------------- -# check if PORTALS support can be found. sets prefix_{CPPFLAGS, -# LDFLAGS, LIBS} as needed and runs action-if-found if there is -# support, otherwise executes action-if-not-found -AC_DEFUN([OPAL_CHECK_PORTALS],[ - # save compiler flags so that we don't alter them for later - # components. - check_portals_save_CPPFLAGS="$CPPFLAGS" - check_portals_save_LDFLAGS="$LDFLAGS" - check_portals_save_LIBS="$LIBS" - - check_portals_CPPFLAGS= - check_portals_LDFLAGS= - check_portals_LIBS= - - check_portals_configuration="none" - ompi_check_portals_happy="yes" - - # Get some configuration information - AC_ARG_WITH([portals], - [AC_HELP_STRING([--with-portals(=DIR)], - [Build Portals support, optionally adding DIR/include, DIR/lib, and DIR/lib64 to the search path for headers and libraries])]) - OPAL_CHECK_WITHDIR([portals], [$with_portals], [include/portals3.h]) - AC_ARG_WITH([portals-config], - AC_HELP_STRING([--with-portals-config], - [configuration to use for Portals support. - One of "utcp", "xt3", "xt3-modex". (default: utcp)])) - AC_ARG_WITH([portals-libs], - [AC_HELP_STRING([--with-portals-libs=LIBS], - [Libraries to link with for portals])]) - - AC_MSG_CHECKING([for Portals configuration]) - if test "$with_portals_config" = "" ; then - with_portals_config="utcp" - elif test "$with_portals_config" = "redstorm" ; then - with_portals_config="xt3" - elif test "$with_portals_config" = "cnl_modex" ; then - with_portals_config="xt3-modex" - fi - OPAL_PORTALS_UTCP=0 - OPAL_PORTALS_CRAYXT3=0 - OPAL_PORTALS_CRAYXT3_MODEX=0 - case "$with_portals_config" in - "utcp") - OPAL_PORTALS_UTCP=1 - OPAL_PORTALS_HAVE_EVENT_UNLINK=1 - check_portals_LIBS="-lp3utcp -lp3api -lp3lib -lp3rt -lp3utcp" - check_portals_header_prefix= - AC_MSG_RESULT([utcp]) - ;; - "xt3") - OPAL_PORTALS_CRAYXT3=1 - OPAL_PORTALS_HAVE_EVENT_UNLINK=0 - check_portals_LIBS= - check_portals_header_prefix="portals/" - AC_MSG_RESULT([Cray XT3]) - ;; - "xt3-modex") - OPAL_PORTALS_CRAYXT3_MODEX=1 - OPAL_PORTALS_HAVE_EVENT_UNLINK=0 - check_portals_LIBS= - check_portals_header_prefix="portals/" - AC_MSG_RESULT([Cray XT3 - Modex]) - ;; - *) - # ok to call ERROR here - the user specified something invalid. - # that should be brought to his attention - AC_MSG_ERROR([unknown Portals configuration. Can not continue]) - ;; - esac - - AC_DEFINE_UNQUOTED([OPAL_PORTALS_HAVE_EVENT_UNLINK], - [$OPAL_PORTALS_HAVE_EVENT_UNLINK], - [Does Portals send a PTL_EVENT_UNLINK event]) - - AC_DEFINE_UNQUOTED([OPAL_PORTALS_UTCP], [$OPAL_PORTALS_UTCP], - [Use the UTCP reference implementation of Portals]) - - AC_DEFINE_UNQUOTED([OPAL_PORTALS_CRAYXT3], [$OPAL_PORTALS_CRAYXT3], - [Use the Cray XT-3 implementation of Portals]) - - AC_DEFINE_UNQUOTED([OPAL_PORTALS_CRAYXT3_MODEX], [$OPAL_PORTALS_CRAYXT3_MODEX], - [Use the Cray XT-3 implementation of Portals using Modex]) - - # Add correct -I and -L flags - AS_IF([test -n "$with_portals"], - [AS_IF([test -d "$with_portals/include"], - [check_portals_CPPFLAGS="-I$with_portals/include" - CPPFLAGS="$CPPFLAGS $check_portals_CPPFLAGS"], []) - AS_IF([test -d "$with_portals/lib"], - [check_portals_LDFLAGS="-L$with_portals/lib" - LDFLAGS="$LDFLAGS $check_portals_LDFLAGS"], [])]) - - # Try to find all the portals libraries (this is not fun!) - if test -n "$with_portals_libs" ; then - check_portals_LIBS="" - for lib in $with_portals_libs ; do - check_portals_LIBS="$check_portals_LIBS -l$lib" - done - fi - - # check for portals - LIBS="$LIBS $check_portals_LIBS" - AC_CHECK_HEADERS([${check_portals_header_prefix}portals3.h], - [AC_MSG_CHECKING([if possible to link Portals application]) - AC_LINK_IFELSE([AC_LANG_PROGRAM([#include <${check_portals_header_prefix}portals3.h>], - [int i; PtlInit(&i);])], - [AC_MSG_RESULT([yes]) - ompi_check_portals_happy="yes"], - [AC_MSG_RESULT([no]) - ompi_check_portals_happy="no"])], - [ompi_check_portals_happy="no"]) - - # Deal with static-only Portals UTCP libs. See note in - # ompi/mca/common/portals/configure.m4. Then possibly cry. - if test "$with_portals_config" = "utcp" ; then - if test "$1" != "common_portals" ; then - check_portals_LIBS= - fi - fi - - # reset the flags for the next test - CPPFLAGS="$check_portals_save_CPPFLAGS" - LDFLAGS="$check_portals_save_LDFLAGS" - LIBS="$check_portals_save_LIBS" - - $1_CPPFLAGS="$check_portals_CPPFLAGS" - $1_LDFLAGS="$check_portals_LDFLAGS" - $1_LIBS="$check_portals_LIBS" - - AS_IF([test "$ompi_check_portals_happy" = "yes"], - [$2], - [AS_IF([test ! -z "$with_portals" -a "$with_portals" != "no"], - [AC_MSG_ERROR([Portals support requested but not found. Aborting])]) - $3]) -]) -