Remove another lingering bproc reference
This commit was SVN r24785.
Этот коммит содержится в:
родитель
042ee3ec48
Коммит
d563e58348
@ -1,69 +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-2005 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$
|
|
||||||
#
|
|
||||||
|
|
||||||
# new bproc is LANL versions >= 3.2.0
|
|
||||||
# old bproc is all Scyld versions and LANL version < 3.2.0
|
|
||||||
# ORTE_CHECK_BPROC(prefix, [action-if-new-bproc], [action-if-old-bproc],
|
|
||||||
# [action-if-not-found])
|
|
||||||
# --------------------------------------------------------
|
|
||||||
AC_DEFUN([ORTE_CHECK_BPROC],[
|
|
||||||
AC_ARG_WITH([bproc],
|
|
||||||
[AC_HELP_STRING([--with-bproc(=DIR)],
|
|
||||||
[Build BProc support, optionally adding DIR/include, DIR/lib, and DIR/lib64 to the search path for headers and libraries])])
|
|
||||||
OMPI_CHECK_WITHDIR([bproc], [$with_bproc], [include/sys/bproc.h])
|
|
||||||
|
|
||||||
AS_IF([test ! -z "$with_bproc" -a "$with_bproc" = "no"],[$4], [
|
|
||||||
orte_check_bproc_save_CPPFLAGS="$CPPFLAGS"
|
|
||||||
orte_check_bproc_save_LDFLAGS="$LDFLAGS"
|
|
||||||
orte_check_bproc_save_LIBS="$LIBS"
|
|
||||||
|
|
||||||
AS_IF([test ! -z "$with_bproc" -a "$with_bproc" != "yes"],
|
|
||||||
[CPPFLAGS="$CPPFLAGS -I$with_bproc/include"
|
|
||||||
LDFLAGS="$LDFLAGS -L$with_bproc/lib"])
|
|
||||||
AC_CHECK_HEADERS([sys/bproc.h],
|
|
||||||
[AC_CHECK_LIB([bproc],
|
|
||||||
[bproc_numnodes],
|
|
||||||
[orte_check_bproc_happy="yes"],
|
|
||||||
[orte_check_bproc_happy="no"])],
|
|
||||||
[orte_check_bproc_happy="no"])
|
|
||||||
|
|
||||||
# Check for Scyld bproc or an old version of LANL Bproc (pre 3.2.0)
|
|
||||||
AS_IF([test "$orte_check_bproc_happy" = "yes"],
|
|
||||||
[AC_CHECK_HEADERS([sys/bproc_common.h],[orte_check_bproc_happy="new"],
|
|
||||||
[orte_check_bproc_happy="old"],
|
|
||||||
[#include <stdint.h>
|
|
||||||
#include <sys/socket.h>])])
|
|
||||||
|
|
||||||
CPPFLAGS="$orte_check_bproc_save_CPPFLAGS"
|
|
||||||
LDFLAGS="$orte_check_bproc_save_LDFLAGS"
|
|
||||||
LIBS="$orte_check_bproc_save_LIBS"
|
|
||||||
|
|
||||||
AS_IF([test "$orte_check_bproc_happy" != "no"],
|
|
||||||
[AS_IF([test ! -z "$with_bproc" -a "$with_bproc" != "yes"],
|
|
||||||
[$1_CPPFLAGS="$$1_CPPFLAGS -I$with_bproc/include"
|
|
||||||
$1_LDFLAGS="$$1_LDFLAGS -L$with_bproc/lib"])
|
|
||||||
$1_LIBS="$$1_LIBS -lbproc"
|
|
||||||
AS_IF([test "$orte_check_bproc_happy" = "new"], [$2], [$3])],
|
|
||||||
[AS_IF([test ! -z "$with_bproc"],
|
|
||||||
[AC_MSG_ERROR([BProc support request but not found. Perhaps
|
|
||||||
you need to specify the location of the BProc libraries.])])
|
|
||||||
$4])
|
|
||||||
])
|
|
||||||
])
|
|
Загрузка…
x
Ссылка в новой задаче
Block a user