* disable TCP ptl and oob components if there is no TCP support (look at

sockaddr_in - seems to be a good indicator)
* disable util/if code if no inet devices (again, no sockaddr_in)
* add enable/disable flag to disable stacktrace pretty-print code
  (defaults to enabled).  Seems there's something funky going on with
  the preprocessor on Red Storm that was causing problems - this was
  the easiest fix
* clean up a bunch of the configure.m4 files to remove bogus comments,
   properly comment them, fix the dumb logic for happy/unhappy
* Create a macro for testing both header and library for a package, 
  since we seem to do this kind of test quite often.  Handles the
  -I and -L search paths properly (including stripping out /usr and
  /usr/local if not needed)
* Converted mvapi components to configure.m4, using the nice new
  ompi_check_package macro (above)

This commit was SVN r6454.

config/ompi_configure_options.m4

@@ -272,6 +272,24 @@ else
 fi
 AM_CONDITIONAL(WANT_INSTALL_HEADERS, test "$WANT_INSTALL_HEADERS" = 1)
 
+#
+# Do we want the pretty-print stack trace feature?
+#
+AC_MSG_CHECKING([if want pretty-print stacktrace])
+AC_ARG_ENABLE([pretty-print-stacktrace],
+    [AC_HELP_STRING([--enable-pretty-print-stacktrace],
+                    [Pretty print stacktrace on process signal])])
+if test "$enable_pretty_print_stacktrace" = "no" ; then
+    AC_MSG_RESULT([no])
+    WANT_PRETTY_PRINT_STACKTRACE=0
+else
+    AC_MSG_RESULT([yes])
+    WANT_PRETTY_PRINT_STACKTRACE=1
+fi
+AC_DEFINE_UNQUOTED([OMPI_WANT_PRETTY_PRINT_STACKTRACE],
+                   [$WANT_PRETTY_PRINT_STACKTRACE],
+                   [if want pretty-print stack trace feature])
+
 # --enable-dist
 # ...?
 

configure.ac

@@ -256,15 +256,6 @@ AC_CHECK_TYPES(intptr_t)
 AC_CHECK_TYPES(uintptr_t)
 AC_CHECK_TYPES(mode_t)
 
-# socklen_t needs <sys/socket.h>, which will not be covered by the
-# standard includes for AC_CHECK_TYPES
-
-AC_CHECK_TYPES(socklen_t, [AC_DEFINE(HAVE_SOCKLEN_T, 1, 
-                                     [Whether we have socklen_t or not])],
-               [], [AC_INCLUDES_DEFAULT
-#include <sys/socket.h>])
-
-
 
 #
 # Check for type sizes
@@ -1011,33 +1002,6 @@ AC_CHECK_HEADERS([alloca.h aio.h arpa/inet.h dirent.h \
     sys/types.h sys/uio.h sys/utsname.h sys/wait.h syslog.h \
     time.h termios.h ulimit.h unistd.h util.h])
 
-# SA_RESTART in signal.h
-AC_MSG_CHECKING([if SA_RESTART defined in signal.h])
-AC_EGREP_CPP(yes, [
-#include <signal.h>
-#ifdef SA_RESTART
-    yes
-#endif ], [MSG=yes VALUE=1], [MSG=no VALUE=0])
-AC_DEFINE_UNQUOTED(OMPI_HAVE_SA_RESTART, $VALUE, 
-    [Whether we have SA_RESTART in <signal.h> or not])
-AC_MSG_RESULT([$MSG])
-
-# sa_len in struct sockaddr
-AC_MSG_CHECKING([for sa_len in struct sockaddr])
-AC_TRY_COMPILE([#include <sys/types.h>
-#include <sys/socket.h>], [struct sockaddr s; s.sa_len;],
-[MSG=yes VALUE=1], [MSG=no VALUE=0])
-AC_DEFINE_UNQUOTED(OMPI_HAVE_SA_LEN, $VALUE,
-    [Whether we have the sa_len struct in <sys/socket.h> or not])
-AC_MSG_RESULT([$MSG])
-
-AC_CHECK_MEMBERS([struct dirent.d_type], [], [], [
-#include <sys/types.h>
-#include <dirent.h>])
-
-AC_CHECK_MEMBERS([siginfo_t.si_fd],,,[#include <signal.h>])
-
-
 # Note that sometimes we have <stdbool.h>, but it doesn't work (e.g.,
 # have both Portland and GNU installed; using pgcc will find GNU's
 # <stdbool.h>, which all it does -- by standard -- is define "bool" to
@@ -1071,6 +1035,56 @@ AC_MSG_RESULT([$MSG])
 AC_CACHE_SAVE
 
 
+##################################
+# Types
+##################################
+
+ompi_show_title "Type tests"
+
+# Size of pid_t
+AC_CHECK_SIZEOF(pid_t)
+
+AC_CHECK_TYPES([socklen_t], [AC_DEFINE([HAVE_SOCKLEN_T], [1], 
+                                       [Whether we have socklen_t or not])],
+               [], [AC_INCLUDES_DEFAULT
+#include <sys/socket.h>])
+
+AC_CHECK_TYPES([struct sockaddr_in], [], [], [AC_INCLUDES_DEFAULT
+#ifdef HAVE_NETINET_IN_H
+#include <netinet/in.h>
+#endif])
+
+# SA_RESTART in signal.h
+AC_MSG_CHECKING([if SA_RESTART defined in signal.h])
+AC_EGREP_CPP(yes, [
+#include <signal.h>
+#ifdef SA_RESTART
+    yes
+#endif ], [MSG=yes VALUE=1], [MSG=no VALUE=0])
+AC_DEFINE_UNQUOTED(OMPI_HAVE_SA_RESTART, $VALUE, 
+    [Whether we have SA_RESTART in <signal.h> or not])
+AC_MSG_RESULT([$MSG])
+
+# sa_len in struct sockaddr
+AC_MSG_CHECKING([for sa_len in struct sockaddr])
+AC_TRY_COMPILE([#include <sys/types.h>
+#include <sys/socket.h>], [struct sockaddr s; s.sa_len;],
+[MSG=yes VALUE=1], [MSG=no VALUE=0])
+AC_DEFINE_UNQUOTED(OMPI_HAVE_SA_LEN, $VALUE,
+    [Whether we have the sa_len struct in <sys/socket.h> or not])
+AC_MSG_RESULT([$MSG])
+
+AC_CHECK_MEMBERS([struct dirent.d_type], [], [], [
+#include <sys/types.h>
+#include <dirent.h>])
+
+AC_CHECK_MEMBERS([siginfo_t.si_fd],,,[#include <signal.h>])
+
+
+# checkpoint results
+AC_CACHE_SAVE
+
+
 ##################################
 # Libraries
 ##################################
@@ -1203,10 +1217,6 @@ AC_DEFINE_UNQUOTED(OMPI_OFFSET_DATATYPE, $MPI_OFFSET_DATATYPE, [MPI datatype cor
 
 AC_WORDS_BIGENDIAN
 
-# Size of pid_t
-
-AC_CHECK_SIZEOF(pid_t)
-
 OMPI_CHECK_BROKEN_QSORT
 
 # all: SYSV semaphores

ompi/mca/btl/mvapi/configure.m4

@@ -16,8 +16,8 @@
 #
 
 
-# MCA_btl_mvapi_CONFIG(action-if-can-compile, 
-#                        [action-if-cant-compile])
+# MCA_btl_mvapi_CONFIG([action-if-can-compile], 
+#                      [action-if-cant-compile])
 # ------------------------------------------------
 AC_DEFUN([MCA_btl_mvapi_CONFIG],[
     OMPI_CHECK_MVAPI([btl_mvapi],
@@ -30,12 +30,15 @@ AC_DEFUN([MCA_btl_mvapi_CONFIG],[
            $1],
           [$2])
 
-    # Many vapi.h's have horrid semantics and don't obey ISOC99
-    # standards.  So we have to turn off flags like -pedantic.  Sigh.
+    # Many of the vapi.h files floating around don't obey ISO99 C
+    # standard, so cause oodles of warnings with -pedantic and
+    # -Wundef.  Remove them from CFLAGS, which is then used to
+    # forcefully override CFLAGS in the makefile for MVAPI
+    # components
     btl_mvapi_CFLAGS="`echo $CFLAGS | sed 's/-pedantic//g'`"
     btl_mvapi_CFLAGS="`echo $btl_mvapi_CFLAGS | sed 's/-Wundef//g'`"
 
-    # substitute in the things needed to build Portals
+    # substitute in the things needed to build mvapi
     AC_SUBST([btl_mvapi_CFLAGS])
     AC_SUBST([btl_mvapi_CPPFLAGS])
     AC_SUBST([btl_mvapi_LDFLAGS])

ompi/mca/io/romio/configure.m4

@@ -15,6 +15,8 @@
 # $HEADER$
 #
 
+# MCA_io_romio_CONFIG([action-if-found], [action-if-not-found])
+# -----------------------------------------------------------
 AC_DEFUN([MCA_io_romio_CONFIG],[
     io_romio_LIBS="$LIBS"
 
@@ -29,38 +31,37 @@ AC_DEFUN([MCA_io_romio_CONFIG],[
            [AC_MSG_RESULT([no])
             $2], 
            [AC_MSG_RESULT([yes])
+            AC_MSG_CHECKING([if MPI profiling is enabled])
+            AS_IF([test "$enable_mpi_profile" = "no"],
+                  [AC_MSG_RESULT([no])
+                   AC_MSG_WARN([*** The ROMIO io component requires the MPI profiling layer])
+                   $2],
+                  [AC_MSG_RESULT([yes])
 
-    AC_MSG_CHECKING([if MPI profiling is enabled])
-    AS_IF([test "$enable_mpi_profile" = "no"],
-          [AC_MSG_RESULT([no])
-           AC_MSG_WARN([*** The ROMIO io component requires the MPI profiling layer])
-           $2],
-          [AC_MSG_RESULT([yes])
+                   AS_IF([test -n "$with_io_romio_flags" -a "$with_io_romio_flags" != "no"],
+                         [io_romio_flags="$with_io_romio_flags $io_romio_flags"],
+                         [io_romio_flags=])
+                   AS_IF([test "$compile_mode" = "dso"],
+                         [io_romio_shared=enable
+                          io_romio_static=disable],
+                         [io_romio_shared=disable
+                          io_romio_static=enable])
+                   AS_IF([test -n "$prefix" -a "$prefix" != "NONE"], 
+                         [io_romio_prefix_arg="--prefix=$prefix"], 
+                         [io_romio_prefix_arg=])
+                   io_romio_flags="CFLAGS="'"'"$CFLAGS"'"'" CPPFLAGS="'"'"$CPPFLAGS"'"'" FFLAGS="'"'"$FFLAGS"'"'" LDFLAGS="'"'"$LSFLAGS"'"'" --$io_romio_shared-shared --$io_romio_static-static $io_romio_flags $io_romio_prefix_arg"
 
-           AS_IF([test -n "$with_io_romio_flags" -a "$with_io_romio_flags" != "no"],
-                 [io_romio_flags="$with_io_romio_flags $io_romio_flags"],
-                 [io_romio_flags=])
-           AS_IF([test "$compile_mode" = "dso"],
-                 [io_romio_shared=enable
-                  io_romio_static=disable],
-                 [io_romio_shared=disable
-                  io_romio_static=enable])
-           AS_IF([test -n "$prefix" -a "$prefix" != "NONE"], 
-                 [io_romio_prefix_arg="--prefix=$prefix"], 
-                 [io_romio_prefix_arg=])
-           io_romio_flags="CFLAGS="'"'"$CFLAGS"'"'" CPPFLAGS="'"'"$CPPFLAGS"'"'" FFLAGS="'"'"$FFLAGS"'"'" LDFLAGS="'"'"$LSFLAGS"'"'" --$io_romio_shared-shared --$io_romio_static-static $io_romio_flags $io_romio_prefix_arg"
+                   AC_CHECK_LIB(aio, main)
 
-           AC_CHECK_LIB(aio, main)
+                   ompi_show_subtitle "Configuring ROMIO distribution"
+                   OMPI_CONFIG_SUBDIR([ompi/mca/io/romio/romio-dist], 
+                                      [$io_romio_flags],
+                                      [io_romio_happy=1], [io_romio_happy=0])
 
-           ompi_show_subtitle "Configuring ROMIO distribution"
-           OMPI_CONFIG_SUBDIR([ompi/mca/io/romio/romio-dist], 
-                              [$io_romio_flags],
-                              [io_romio_happy=1], [io_romio_happy=0])
-
-           AS_IF([test "$io_romio_happy" = "1"],
-                 [echo "ROMIO distribution configured successfully"
-                  $1],
-                 [LIBS="$io_romio_LIBS"
-                  AC_MSG_WARN([ROMIO distribution did not configure successfully])
-                  $2])])])
+                   AS_IF([test "$io_romio_happy" = "1"],
+                         [echo "ROMIO distribution configured successfully"
+                          $1],
+                         [LIBS="$io_romio_LIBS"
+                          AC_MSG_WARN([ROMIO distribution did not configure successfully])
+                          $2])])])
 ])

ompi/mca/mpool/mvapi/configure.m4

@@ -16,7 +16,7 @@
 #
 
 
-# MCA_mpool_mvapi_CONFIG(action-if-can-compile, 
+# MCA_mpool_mvapi_CONFIG([action-if-can-compile], 
 #                        [action-if-cant-compile])
 # ------------------------------------------------
 AC_DEFUN([MCA_mpool_mvapi_CONFIG],[
@@ -30,8 +30,11 @@ AC_DEFUN([MCA_mpool_mvapi_CONFIG],[
            $1],
           [$2])
 
-    # Many vapi.h's have horrid semantics and don't obey ISOC99
-    # standards.  So we have to turn off flags like -pedantic.  Sigh.
+    # Many of the vapi.h files floating around don't obey ISO99 C
+    # standard, so cause oodles of warnings with -pedantic and
+    # -Wundef.  Remove them from CFLAGS, which is then used to
+    # forcefully override CFLAGS in the makefile for MVAPI
+    # components
     mpool_mvapi_CFLAGS="`echo $CFLAGS | sed 's/-pedantic//g'`"
     mpool_mvapi_CFLAGS="`echo $mpool_mvapi_CFLAGS | sed 's/-Wundef//g'`"
 

ompi/mca/ptl/sm/src/ptl_sm.h

@@ -21,8 +21,13 @@
 
 #include <stdlib.h>
 #include <sys/types.h>
+#ifdef HAVE_SYS_SOCKET_H
 #include <sys/socket.h>
+#endif
+#ifdef HAVE_NETINET_IN_H
 #include <netinet/in.h>
+#endif
+
 #include "class/ompi_free_list.h"
 #include "class/ompi_bitmap.h"
 #include "class/ompi_fifo.h"

ompi/mca/ptl/tcp/configure.m4

@@ -0,0 +1,29 @@
+# -*- 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_ptl_tcp_CONFIG([action-if-found], [action-if-not-found])
+# -----------------------------------------------------------
+AC_DEFUN([MCA_ptl_tcp_CONFIG],[
+    # check for sockaddr_in (a good sign we have TCP)
+    AC_CHECK_TYPES([struct sockaddr_in], 
+                   [$1],
+                   [$2], 
+                   [AC_INCLUDES_DEFAULT
+#ifdef HAVE_NETINET_IN_H
+#include <netinet/in.h>
+#endif])
+])dnl

opal/util/if.c

@@ -51,6 +51,8 @@
 #include "opal/util/output.h"
 #include "opal/util/strncpy.h"
 
+#ifdef HAVE_STRUCT_SOCKADDR_IN
+
 #ifndef IF_NAMESIZE
 #define IF_NAMESIZE 32
 #endif
@@ -635,3 +637,79 @@ opal_ifislocal(char *hostname)
 
     return false;
 }
+
+#else /* HAVE_STRUCT_SOCKADDR_IN */
+
+/* if we don't have struct sockaddr_in, we don't have traditional
+   ethernet devices.  Just make everything a no-op error call (except
+   for finailize, which will return successfully) */
+
+int
+opal_ifnametoaddr(const char* if_name, 
+                  struct sockaddr* if_addr, int size)
+{
+    return OMPI_ERR_NOT_SUPPORTED;
+}
+
+int
+opal_ifaddrtoname(const char* if_addr, 
+                  char* if_name, int size)
+{
+    return OMPI_ERR_NOT_SUPPORTED;
+}
+
+int
+opal_ifnametoindex(const char* if_name);
+{
+    return OMPI_ERR_NOT_SUPPORTED;
+}
+
+int
+opal_ifcount(void);
+{
+    return OMPI_ERR_NOT_SUPPORTED;
+}
+
+int
+opal_ifbegin(void); 
+{
+    return OMPI_ERR_NOT_SUPPORTED;
+}
+
+int
+opal_ifnext(int if_index);
+{
+    return OMPI_ERR_NOT_SUPPORTED;
+}
+
+int
+opal_ifindextoname(int if_index, char* if_name, int);
+{
+    return OMPI_ERR_NOT_SUPPORTED;
+}
+
+int
+opal_ifindextoaddr(int if_index, struct sockaddr*, int);
+{
+    return OMPI_ERR_NOT_SUPPORTED;
+}
+
+int
+opal_ifindextomask(int if_index, struct sockaddr*, int);
+{
+    return OMPI_ERR_NOT_SUPPORTED;
+}
+
+bool
+opal_ifislocal(char *hostname);
+{
+    return false;
+}
+
+int
+opal_iffinalize(void);
+{
+    return OMPI_SUCCESS;
+}
+
+#endif /* HAVE_STRUCT_SOCKADDR_IN */

opal/util/stacktrace.c

@@ -55,7 +55,7 @@
  *
  * FIXME: Should distinguish for systems, which don't have siginfo...
  */
-#ifndef WIN32
+#if OMPI_WANT_PRETTY_PRINT_STACKTRACE && ! defined(WIN32)
 static void opal_show_stackframe (int signo, siginfo_t * info, void * p)
 {   
 #ifdef __GLIBC__
@@ -259,7 +259,7 @@ static void opal_show_stackframe (int signo, siginfo_t * info, void * p)
     fflush(stderr);
 }
 
-#endif /* WIN32 */
+#endif /* OMPI_WANT_PRETTY_PRINT_STACKTRACE && ! defined(WIN32) */
 
 
 /**
@@ -274,7 +274,7 @@ static void opal_show_stackframe (int signo, siginfo_t * info, void * p)
  */
 int opal_util_register_stackhandlers (void)
 {
-#ifndef WIN32
+#if OMPI_WANT_PRETTY_PRINT_STACKTRACE && ! defined(WIN32)
     struct sigaction act;
     char * string_value;
     char * tmp;
@@ -319,7 +319,8 @@ int opal_util_register_stackhandlers (void)
         return OMPI_ERR_IN_ERRNO;
       }
     }
-#endif /* WIN32 */
+#endif /* OMPI_WANT_PRETTY_PRINT_STACKTRACE && ! defined(WIN32) */
+
     return OMPI_SUCCESS;
 }
 

orte/mca/iof/null/configure.m4

@@ -15,6 +15,8 @@
 # $HEADER$
 #
 
+# MCA_iof_null_CONFIG([action-if-found], [action-if-not-found])
+# -----------------------------------------------------------
 AC_DEFUN([MCA_iof_null_CONFIG],[
 
     # README README README README README README README README README

orte/mca/oob/tcp/configure.m4

@@ -0,0 +1,29 @@
+# -*- 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_oob_tcp_CONFIG([action-if-found], [action-if-not-found])
+# -----------------------------------------------------------
+AC_DEFUN([MCA_oob_tcp_CONFIG],[
+    # check for sockaddr_in (a good sign we have TCP)
+    AC_CHECK_TYPES([struct sockaddr_in], 
+                   [$1],
+                   [$2], 
+                   [AC_INCLUDES_DEFAULT
+#ifdef HAVE_NETINET_IN_H
+#include <netinet/in.h>
+#endif])
+])dnl

orte/mca/pls/bproc/configure.m4

@@ -15,15 +15,21 @@
 # $HEADER$
 #
 
+# MCA_pls_bproc_CONFIG([action-if-found], [action-if-not-found])
+# -----------------------------------------------------------
 AC_DEFUN([MCA_pls_bproc_CONFIG],[
     OMPI_CHECK_BPROC([pls_bproc], [pls_bproc_good=1], 
                      [pls_bproc_good=0])
 
-    AS_IF([test "$pls_bproc_good" = "0"], [$2],
+    # if check worked, set wrapper flags if so.  
+    # Evaluate succeed / fail
+    AS_IF([test "$pls_bproc_good" = "1"],
           [pls_bproc_WRAPPER_EXTRA_LDFLAGS="$pls_bproc_LDFLAGS"
            pls_bproc_WRAPPER_EXTRA_LIBS="$pls_bproc_LIBS"
-           $1])
+           $1],
+          [$2])
 
+    # set build flags to use in makefile
     AC_SUBST([pls_bproc_OBJCFLAGS])
     AC_SUBST([pls_bproc_LDFLAGS])
     AC_SUBST([pls_bproc_LIBS])

orte/mca/pls/bproc_orted/configure.m4

@@ -15,15 +15,21 @@
 # $HEADER$
 #
 
+# MCA_pls_bproc_orted_CONFIG([action-if-found], [action-if-not-found])
+# -----------------------------------------------------------
 AC_DEFUN([MCA_pls_bproc_orted_CONFIG],[
     OMPI_CHECK_BPROC([pls_bproc_orted], [pls_bproc_orted_good=1], 
                      [pls_bproc_orted_good=0])
 
-    AS_IF([test "$pls_bproc_orted_good" = "0"], [$2],
+    # if check worked, set wrapper flags if so.  
+    # Evaluate succeed / fail
+    AS_IF([test "$pls_bproc_orted_good" = "1"], 
           [pls_bproc_orted_WRAPPER_EXTRA_LDFLAGS="$pls_bproc_orted_LDFLAGS"
            pls_bproc_orted_WRAPPER_EXTRA_LIBS="$pls_bproc_orted_LIBS"
-           $1])
+           $1],
+          [$2])
 
+    # set build flags to use in makefile
     AC_SUBST([pls_bproc_orted_OBJCFLAGS])
     AC_SUBST([pls_bproc_orted_LDFLAGS])
     AC_SUBST([pls_bproc_orted_LIBS])

orte/mca/pls/bproc_seed/configure.m4

@@ -15,18 +15,21 @@
 # $HEADER$
 #
 
+# MCA_pls_bproc_seed_CONFIG([action-if-found], [action-if-not-found])
+# -----------------------------------------------------------
 AC_DEFUN([MCA_pls_bproc_seed_CONFIG],[
     OMPI_CHECK_BPROC([pls_bproc_seed], [pls_bproc_seed_good=1], 
                      [pls_bproc_seed_good=0])
 
-    # For very dumb reasons involving linking, it's near impossible
-    # to build the XGrid components as static libraries.  Disable if that's
-    # the case.
-    AS_IF([test "$pls_bproc_seed_good" = "0"], [$2],
+    # if check worked, set wrapper flags if so.  
+    # Evaluate succeed / fail
+    AS_IF([test "$pls_bproc_seed_good" = "1"],
           [pls_bproc_seed_WRAPPER_EXTRA_LDFLAGS="$pls_bproc_seed_LDFLAGS"
            pls_bproc_seed_WRAPPER_EXTRA_LIBS="$pls_bproc_seed_LIBS"
-           $1])
+           $1],
+          [$2])
 
+    # set build flags to use in makefile
     AC_SUBST([pls_bproc_seed_OBJCFLAGS])
     AC_SUBST([pls_bproc_seed_LDFLAGS])
     AC_SUBST([pls_bproc_seed_LIBS])

orte/mca/pls/tm/configure.m4

@@ -15,14 +15,20 @@
 # $HEADER$
 #
 
+# MCA_pls_tm_CONFIG([action-if-found], [action-if-not-found])
+# -----------------------------------------------------------
 AC_DEFUN([MCA_pls_tm_CONFIG],[
     OMPI_CHECK_TM([pls_tm], [pls_tm_good=1], [pls_tm_good=0])
          
-    AS_IF([test "$pls_tm_good" = "0"], [$2],
+    # if check worked, set wrapper flags if so.  
+    # Evaluate succeed / fail
+    AS_IF([test "$pls_tm_good" = "1"],
           [pls_tm_WRAPPER_EXTRA_LDFLAGS="$pls_tm_LDFLAGS"
            pls_tm_WRAPPER_EXTRA_LIBS="$pls_tm_LIBS"
-           $1])
+           $1],
+          [$2])
 
+    # set build flags to use in makefile
     AC_SUBST([pls_tm_CPPFLAGS])
     AC_SUBST([pls_tm_LDFLAGS])
     AC_SUBST([pls_tm_LIBS])

orte/mca/pls/xgrid/configure.m4

@@ -15,6 +15,8 @@
 # $HEADER$
 #
 
+# MCA_pls_xgrid_CONFIG([action-if-found], [action-if-not-found])
+# -----------------------------------------------------------
 AC_DEFUN([MCA_pls_xgrid_CONFIG],[
     OMPI_CHECK_XGRID([pls_xgrid], [pls_xgrid_good=1], [pls_xgrid_good=0])
 
@@ -29,6 +31,7 @@ AC_DEFUN([MCA_pls_xgrid_CONFIG],[
                   [AC_MSG_WARN([XGrid components must be built as DSOs.  Disabling])
                    $2])])
 
+    # set build flags to use in makefile
     AC_SUBST([pls_xgrid_OBJCFLAGS])
     AC_SUBST([pls_xgrid_LDFLAGS])
 ])dnl

orte/mca/ras/bjs/configure.m4

@@ -15,17 +15,20 @@
 # $HEADER$
 #
 
+# MCA_ras_bjs_CONFIG([action-if-found], [action-if-not-found])
+# -----------------------------------------------------------
 AC_DEFUN([MCA_ras_bjs_CONFIG],[
     OMPI_CHECK_BPROC([ras_bjs], [ras_bjs_good=1], [ras_bjs_good=0])
 
-    # For very dumb reasons involving linking, it's near impossible
-    # to build the XGrid components as static libraries.  Disable if that's
-    # the case.
-    AS_IF([test "$ras_bjs_good" = "0"], [$2],
+    # if check worked, set wrapper flags if so.  
+    # Evaluate succeed / fail
+    AS_IF([test "$ras_bjs_good" = "1"],
           [ras_bjs_WRAPPER_EXTRA_LDFLAGS="$ras_bjs_LDFLAGS"
            ras_bjs_WRAPPER_EXTRA_LIBS="$ras_bjs_LIBS"
-           $1])
+           $1],
+          [$2])
 
+    # set build flags to use in makefile
     AC_SUBST([ras_bjs_OBJCFLAGS])
     AC_SUBST([ras_bjs_LDFLAGS])
     AC_SUBST([ras_bjs_LIBS])

orte/mca/ras/lsf_bproc/configure.m4

@@ -15,17 +15,20 @@
 # $HEADER$
 #
 
+# MCA_ras_lsf_bproc_CONFIG([action-if-found], [action-if-not-found])
+# -----------------------------------------------------------
 AC_DEFUN([MCA_ras_lsf_bproc_CONFIG],[
     OMPI_CHECK_BPROC([ras_lsf_bproc], [ras_lsf_bproc_good=1], [ras_lsf_bproc_good=0])
 
-    # For very dumb reasons involving linking, it's near impossible
-    # to build the XGrid components as static libraries.  Disable if that's
-    # the case.
-    AS_IF([test "$ras_lsf_bproc_good" = "0"], [$2],
+    # if check worked, set wrapper flags if so.  
+    # Evaluate succeed / fail
+    AS_IF([test "$ras_lsf_bproc_good" = "1"],
           [ras_lsf_bproc_WRAPPER_EXTRA_LDFLAGS="$ras_lsf_bproc_LDFLAGS"
            ras_lsf_bproc_WRAPPER_EXTRA_LIBS="$ras_lsf_bproc_LIBS"
-           $1])
+           $1],
+          [$2])
 
+    # set build flags to use in makefile
     AC_SUBST([ras_lsf_bproc_OBJCFLAGS])
     AC_SUBST([ras_lsf_bproc_LDFLAGS])
     AC_SUBST([ras_lsf_bproc_LIBS])

orte/mca/ras/tm/configure.m4

@@ -15,14 +15,20 @@
 # $HEADER$
 #
 
+# MCA_ras_tm_CONFIG([action-if-found], [action-if-not-found])
+# -----------------------------------------------------------
 AC_DEFUN([MCA_ras_tm_CONFIG],[
     OMPI_CHECK_TM([ras_tm], [ras_tm_good=1], [ras_tm_good=0])
-         
-    AS_IF([test "$ras_tm_good" = "0"], [$2],
+
+    # if check worked, set wrapper flags if so.  
+    # Evaluate succeed / fail
+    AS_IF([test "$ras_tm_good" = "1"],
           [ras_tm_WRAPPER_EXTRA_LDFLAGS="$ras_tm_LDFLAGS"
            ras_tm_WRAPPER_EXTRA_LIBS="$ras_tm_LIBS"
-           $1])
+           $1],
+          [$2])
 
+    # set build flags to use in makefile
     AC_SUBST([ras_tm_CPPFLAGS])
     AC_SUBST([ras_tm_LDFLAGS])
     AC_SUBST([ras_tm_LIBS])

orte/mca/ras/xgrid/configure.m4

@@ -15,6 +15,8 @@
 # $HEADER$
 #
 
+# MCA_ras_xgrid_CONFIG([action-if-found], [action-if-not-found])
+# -----------------------------------------------------------
 AC_DEFUN([MCA_ras_xgrid_CONFIG],[
     OMPI_CHECK_XGRID([ras_xgrid], [ras_xgrid_good=1], [ras_xgrid_good=0])