Modify the configure system in the paffinity framework so that only one component is built. Cleanout variable name conflicts that on some systems prevented building

This commit was SVN r19122.

opal/mca/paffinity/configure.m4

@@ -0,0 +1,13 @@
+dnl -*- shell-script -*-
+dnl
+dnl Copyright (c) 2007      Los Alamos National Security, LLC.
+dnl                         All rights reserved. 
+dnl $COPYRIGHT$
+dnl 
+dnl Additional copyrights may follow
+dnl 
+dnl $HEADER$
+dnl
+
+dnl we only want those at same priority
+m4_define(MCA_paffinity_CONFIGURE_MODE, STOP_AT_FIRST_PRIORITY)

opal/mca/paffinity/darwin/configure.m4

@@ -22,12 +22,12 @@
 # MCA_paffinity_darwin_CONFIG([action-if-found], [action-if-not-found])
 # -----------------------------------------------------------
 AC_DEFUN([MCA_paffinity_darwin_CONFIG],[
-    OMPI_VAR_SCOPE_PUSH([happy])
+    OMPI_VAR_SCOPE_PUSH([paff_darwin_happy])
     # check to see if we have <mach/mach_host.h>
     # as this is a Darwin-specific thing
-    AC_CHECK_HEADER([mach/mach_host.h], [happy=yes], [happy=no])
+    AC_CHECK_HEADER([mach/mach_host.h], [paff_darwin_happy=yes], [paff_darwin_happy=no])
 
-    AS_IF([test "$happy" = "yes"], [$1], [$2])
+    AS_IF([test "$paff_darwin_happy" = "yes"], [$1], [$2])
     OMPI_VAR_SCOPE_POP
 ])dnl
 

opal/mca/paffinity/darwin/configure.params

@@ -20,3 +20,9 @@
 #
 
 PARAM_CONFIG_FILES="Makefile"
+
+#
+# Set the config priority so that, if we can build,
+# only this component will build
+
+PARAM_CONFIG_PRIORITY=50

opal/mca/paffinity/linux/configure.params

@@ -20,3 +20,9 @@
 #
 
 PARAM_CONFIG_FILES="Makefile"
+
+#
+# Set the config priority so that, if we can build,
+# only this component will build
+
+PARAM_CONFIG_PRIORITY=60

opal/mca/paffinity/posix/configure.m4

@@ -22,18 +22,18 @@
 # MCA_paffinity_posix_CONFIG([action-if-found], [action-if-not-found])
 # -----------------------------------------------------------
 AC_DEFUN([MCA_paffinity_posix_CONFIG],[
-    OMPI_VAR_SCOPE_PUSH([happy])
+    OMPI_VAR_SCOPE_PUSH([paff_posix_happy])
     # Check to see if we have <unistd.h>
-    AC_CHECK_HEADER([unistd.h], [happy=yes], [happy=no])
+    AC_CHECK_HEADER([unistd.h], [paff_posix_happy=yes], [paff_posix_happy=no])
 
     # Check to see if we have _SC_NPROCESSORS_ONLN
-    AS_IF([test "$happy" = "yes"],
+    AS_IF([test "$paff_posix_happy" = "yes"],
           [AC_MSG_CHECKING([for _SC_NPROCESSORS_ONLN])
            AS_IF([test "$OMPI_HAVE__SC_NPROCESSORS_ONLN" = "1"],
-                 [happy=yes], [happy=no])
-           AC_MSG_RESULT([(cached) $happy])])
+                 [paff_posix_happy=yes], [paff_posix_happy=no])
+           AC_MSG_RESULT([(cached) $paff_posix_happy])])
 
-    AS_IF([test "$happy" = "yes"], [$1], [$2])
+    AS_IF([test "$paff_posix_happy" = "yes"], [$1], [$2])
     OMPI_VAR_SCOPE_POP
 ])dnl
 

opal/mca/paffinity/posix/configure.params

@@ -20,3 +20,9 @@
 #
 
 PARAM_CONFIG_FILES="Makefile"
+
+#
+# Set the config priority so that we only build
+# if nobody else can
+
+PARAM_CONFIG_PRIORITY=10

opal/mca/paffinity/solaris/configure.m4

@@ -22,26 +22,24 @@
 # MCA_paffinity_solaris_CONFIG([action-if-found], [action-if-not-found])
 # -----------------------------------------------------------
 AC_DEFUN([MCA_paffinity_solaris_CONFIG],[
+    OMPI_VAR_SCOPE_PUSH([paff_solaris_happy])
     #check to see if we have <sys/procset.h>
-    AC_CHECK_HEADER([sys/procset.h], [happy=yes], [happy=no])
+    AC_CHECK_HEADER([sys/procset.h], [paff_solaris_happy=yes], [paff_solaris_happy=no])
 
-    if test "$happy" = "yes"; then
+    if test "$paff_solaris_happy" = "yes"; then
         # check for processor_bind()
-        AC_CHECK_FUNC([processor_bind],[happy=yes],[happy=no])
+        AC_CHECK_FUNC([processor_bind],[paff_solaris_happy=yes],[paff_solaris_happy=no])
     fi
 
-    if test "$happy" = "yes"; then
+    if test "$paff_solaris_happy" = "yes"; then
        # check for whether header has P_PID defined
        AC_MSG_CHECKING([if P_PID is defined])
        AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <sys/procset.h>]], [[int i = P_PID;]])],
-                         [happy=yes],[happy=no])
-       AC_MSG_RESULT([$happy ])
+                         [paff_solaris_happy=yes],[paff_solaris_happy=no])
+       AC_MSG_RESULT([$paff_solaris_happy ])
     fi
 
-    if test "$happy" = "yes"; then
-       $1
-    else
-       $2
-    fi
+    AS_IF([test "$paff_solaris_happy" = "yes"], [$1], [$2])
+    OMPI_VAR_SCOPE_POP
 ])dnl
 

opal/mca/paffinity/solaris/configure.params

@@ -20,3 +20,9 @@
 #
 
 PARAM_CONFIG_FILES="Makefile"
+
+#
+# Set the config priority so that, if we can build,
+# only this component will build
+
+PARAM_CONFIG_PRIORITY=60

opal/mca/paffinity/windows/configure.params

@@ -20,3 +20,9 @@
 #
 
 PARAM_CONFIG_FILES="Makefile"
+
+#
+# Set the config priority so that, if we can build,
+# only this component will build
+
+PARAM_CONFIG_PRIORITY=60