- Allow to work without xt-catamount module on Jaguar,

reducing the amount of components, that up to now needed to be
   deselected.

This commit was SVN r22205.

ompi/mca/btl/portals/configure.m4

@@ -32,6 +32,12 @@ AC_DEFUN([MCA_btl_portals_CONFIG],[
            $1],
           [$2])
 
+    AC_CHECK_HEADERS([catamount/cnos_mpi_os.h], [],
+                      [AC_CHECK_HEADERS([cnos_mpi_os.h], [], [$2],
+                          [AC_INCLUDES_DEFAULT])],
+                      [AC_INCLUDES_DEFAULT])
+
+
     # substitute in the things needed to build portals
     AC_SUBST([btl_portals_CPPFLAGS])
     AC_SUBST([btl_portals_LDFLAGS])

ompi/mca/common/portals/common_portals_crayxt3.c

@@ -16,7 +16,13 @@
  * $HEADER$
  */
 
-#include <catamount/cnos_mpi_os.h>
+#include "ompi_config.h"
+
+#if defined(HAVE_CNOS_MPI_OS_H)
+#  include "cnos_mpi_os.h"
+#elif defined(HAVE_CATAMOUNT_CNOS_MPI_OS_H)
+#  include "catamount/cnos_mpi_os.h"
+#endif
 
 #include "ompi/constants.h"
 #include "ompi/proc/proc.h"

orte/mca/ess/alps/configure.m4

@@ -21,6 +21,11 @@
 # MCA_ess_alps_CONFIG([action-if-found], [action-if-not-found])
 # -----------------------------------------------------------
 AC_DEFUN([MCA_ess_alps_CONFIG],[
+        AC_CHECK_HEADERS([catamount/cnos_mpi_os.h], [],
+                         [AC_CHECK_HEADERS([cnos_mpi_os.h], [], [$2],
+                             [AC_INCLUDES_DEFAULT])],
+                         [AC_INCLUDES_DEFAULT])
+
 	ORTE_CHECK_ALPS([ess_alps],
 	    [AC_CHECK_FUNC([cnos_get_rank], [$1], [$2])],
 	    [$2])

orte/mca/ess/alps/ess_alps_module.c

@@ -20,7 +20,11 @@
 #include "orte_config.h"
 #include "orte/constants.h"
 
-#include <catamount/cnos_mpi_os.h>
+#if defined(HAVE_CNOS_MPI_OS_H)
+#  include "cnos_mpi_os.h"
+#elif defined(HAVE_CATAMOUNT_CNOS_MPI_OS_H)
+#  include "catamount/cnos_mpi_os.h"
+#endif
 
 #include "orte/util/show_help.h"
 #include "opal/mca/paffinity/paffinity.h"

orte/mca/ess/cnos/ess_cnos_module.c

@@ -20,7 +20,11 @@
 #include "orte_config.h"
 #include "orte/constants.h"
 
-#include <catamount/cnos_mpi_os.h>
+#if defined(HAVE_CNOS_MPI_OS_H)
+#  include "cnos_mpi_os.h"
+#elif defined(HAVE_CATAMOUNT_CNOS_MPI_OS_H)
+#  include "catamount/cnos_mpi_os.h"
+#endif
 
 #include "opal/mca/paffinity/paffinity.h"
 #include "opal/util/output.h"

orte/mca/grpcomm/cnos/grpcomm_cnos_module.c

@@ -35,7 +35,11 @@
 #include "grpcomm_cnos.h"
 
 #if OMPI_GRPCOMM_CNOS_HAVE_BARRIER
-#include <catamount/cnos_mpi_os.h>
+#  if defined(HAVE_CNOS_MPI_OS_H)
+#    include "cnos_mpi_os.h"
+#  elif defined(HAVE_CATAMOUNT_CNOS_MPI_OS_H)
+#    include "catamount/cnos_mpi_os.h"
+#  endif
 #endif
 
 /* API functions */