From e3feddfdd4749311719059b294270d792bab4ac7 Mon Sep 17 00:00:00 2001 From: Thara Angskun Date: Thu, 8 Sep 2005 09:49:21 +0000 Subject: [PATCH] Move from stone aged configure.stub to configure.m4 This commit was SVN r7231. --- orte/mca/pls/poe/configure.m4 | 46 +++++++++++++++++++++++ orte/mca/pls/poe/configure.stub | 65 --------------------------------- 2 files changed, 46 insertions(+), 65 deletions(-) create mode 100644 orte/mca/pls/poe/configure.m4 delete mode 100644 orte/mca/pls/poe/configure.stub diff --git a/orte/mca/pls/poe/configure.m4 b/orte/mca/pls/poe/configure.m4 new file mode 100644 index 0000000000..70e4299618 --- /dev/null +++ b/orte/mca/pls/poe/configure.m4 @@ -0,0 +1,46 @@ +# -*- shell-script -*- +# +# Copyright (c) 2004-2005 The Trustees of Indiana University. +# All rights reserved. +# Copyright (c) 2004-2005 The Trustees of the University of Tennessee. +# 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$ +# +# Additional copyrights may follow +# +# $HEADER$ +# + +# MCA_pls_poe_CONFIG([action-if-found], [action-if-not-found]) +# ----------------------------------------------------------- + +AC_DEFUN([MCA_pls_poe_CONFIG],[ + AC_ARG_WITH([poe], + [AC_HELP_STRING([--with-poe=DIR], + [directory where POE was installed])]) + + AS_IF([test ! -z "$with_poe" -a "$with_poe" = "no"], [$2], [ + AS_IF([test -z "$with_poe" -o "$with_poe" = "yes"], + [AC_PATH_PROG(OMPI_POE,poe)], + [AC_PATH_PROG(OMPI_POE,poe,,$with_poe)] + ) + AS_IF([test ! -z "$OMPI_POE"], [ + AC_DEFINE_UNQUOTED([OMPI_HAVE_POE], [1], [Whether we have POE support or not]) + AC_DEFINE_UNQUOTED([OMPI_POE], ["$OMPI_POE"], [POE execution path]) + AC_PATH_PROG(LSLPP,lslpp) + AC_MSG_CHECKING([POE Version]) + AS_IF([test ! -z "$LSLPP"], [ + OMPI_POE_VERSION=`$LSLPP -q -c -L ppe.poe | cut -f 3 -d ':'` + AC_MSG_RESULT($OMPI_POE_VERSION) + AC_DEFINE_UNQUOTED([OMPI_POE_VERSION], ["$OMPI_POE_VERSION"], [POE Version]) + ], [ + AC_MSG_RESULT([Unknown]) + ]) + [$1] + ], [$2] ) + ]) +]) diff --git a/orte/mca/pls/poe/configure.stub b/orte/mca/pls/poe/configure.stub deleted file mode 100644 index 2c56d9dbb7..0000000000 --- a/orte/mca/pls/poe/configure.stub +++ /dev/null @@ -1,65 +0,0 @@ -# -*- shell-script -*- -# -# Copyright (c) 2004-2005 The Trustees of Indiana University. -# All rights reserved. -# Copyright (c) 2004-2005 The Trustees of the University of Tennessee. -# 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$ -# -# Additional copyrights may follow -# -# $HEADER$ -# - -# -# Main function. This will be invoked in the middle of the templated -# configure script. -# -AC_DEFUN([MCA_CONFIGURE_STUB],[ -# -# Make a best effort to see if we are on a POE system. -# - -OMPI_HAVE_POE=0 - -AC_ARG_WITH(poe, - AC_HELP_STRING([--with-poe=DIR], - [directory where the Parallel Operating Environment(POE) was installed])) - -if test "$with_poe" != "no"; then - if test "$with_poe" = "yes"; then - AC_PATH_PROG(OMPI_POE,poe) - elif test -d "$with_poe"; then - AC_PATH_PROG(OMPI_POE,poe,,$with_poe) - elif test -z "$with_poe"; then - AC_PATH_PROG(OMPI_POE,poe) - fi - - if test ! -z "$OMPI_POE"; then - OMPI_HAVE_POE=1 - fi -fi - - -if test "$OMPI_HAVE_POE" = "1"; then - AC_PATH_PROG(LSLPP,lslpp) - if test ! -z "$LSLPP"; then - AC_MSG_CHECKING([POE Version]) - OMPI_POE_VERSION=`$LSLPP -q -c -L ppe.poe | cut -f 3 -d ':'` - AC_MSG_RESULT($OMPI_POE_VERSION) - else - OMPI_POE_VERSION="unknown" - fi -else - AC_MSG_ERROR([*** Connot find working POE]) -fi - -AC_DEFINE_UNQUOTED(OMPI_HAVE_POE, $OMPI_HAVE_POE, [Whether we have POE support or not]) -AC_DEFINE(OMPI_POE_VERSION, $OMPI_POE_VERSION, [POE Version]) -AC_DEFINE(OMPI_POE, $OMPI_POE, [POE execution name]) - -])dnl