* Add checks for fork/execve/setpgid for slurm components so that they

automagically don't build on platforms without such things
* Fix for mistaken use of cache variable in assembly setup
* one more cached test hits the books

This commit was SVN r7404.

acinclude.m4

@@ -59,6 +59,7 @@ m4_include(config/ompi_check_bproc.m4)
 m4_include(config/ompi_check_mvapi.m4)
 m4_include(config/ompi_check_openib.m4)
 m4_include(config/ompi_check_package.m4)
+m4_include(config/ompi_check_slurm.m4)
 m4_include(config/ompi_check_tm.m4)
 m4_include(config/ompi_check_xgrid.m4)
 m4_include(config/ompi_config_subdir.m4)

config/ompi_check_slurm.m4

@@ -0,0 +1,50 @@
+# -*- 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$
+#
+
+
+# OMPI_CHECK_SLURM(prefix, [action-if-found], [action-if-not-found])
+# --------------------------------------------------------
+AC_DEFUN([OMPI_CHECK_SLURM],[
+    AC_ARG_WITH([slurm],
+                [AC_HELP_STRING([--with-slurm],
+                                [Build SLURM scheduler component (default: yes)])])
+
+    if test "with_slurm" = "no" ; then
+        ompi_check_slurm_happy="no"
+    else 
+        ompi_check_slurm_happy="yes"
+    fi
+
+    AS_IF([test "$ompi_check_slurm_happy" = "yes"],
+          [AC_CHECK_FUNC([fork],
+                         [ompi_check_slurm_happy="yes"],
+                         [ompi_check_slurm_happy="no"])])
+
+    AS_IF([test "$ompi_check_slurm_happy" = "yes"],
+          [AC_CHECK_FUNC([execve],
+                         [ompi_check_slurm_happy="yes"],
+                         [ompi_check_slurm_happy="no"])])
+
+    AS_IF([test "$ompi_check_slurm_happy" = "yes"],
+          [AC_CHECK_FUNC([setpgid],
+                         [ompi_check_slurm_happy="yes"],
+                         [ompi_check_slurm_happy="no"])])
+
+    AS_IF([test "$ompi_check_slurm_happy" = "yes"], 
+          [$2], 
+          [$3])
+])

config/ompi_config_asm.m4

@@ -260,10 +260,9 @@ AC_DEFUN([OMPI_CHECK_ASM_ALIGN_LOG],[
     AC_REQUIRE([OMPI_CHECK_ASM_LABEL_SUFFIX])
     AC_REQUIRE([AC_PROG_NM])
 
-    ompi_cv_asm_align_log=0
+    AC_CACHE_CHECK([if .align directive takes logarithmic value],
-    asm_result="no"
+                   [ompi_cv_asm_align_log],
-    AC_MSG_CHECKING([if .align directive takes logarithmic value])
+                   [ OMPI_TRY_ASSEMBLE([        $ompi_cv_asm_text
-    OMPI_TRY_ASSEMBLE([        $ompi_cv_asm_text
         .align 4
         $ompi_cv_asm_global foo
         .byte 1
@@ -275,13 +274,19 @@ foo$ompi_cv_asm_label_suffix
     # test for both 16 and 10 (decimal and hex notations)
     echo "configure: .align test address offset is $ompi_asm_addr" >& AC_FD_CC
     if test "$ompi_asm_addr" = "16" -o "$ompi_asm_addr" = "10" ; then
-       ompi_cv_asm_align_log=1
+       ompi_cv_asm_align_log="yes"
-       asm_result="yes"
+    else
+        ompi_cv_asm_align_log="no"
+    fi])
+
+    if test "$ompi_cv_asm_align_log" = "yes" -o "$ompi_cv_asm_align_log" = "1" ; then
+        ompi_asm_align_log_result=1
+    else
+        ompi_asm_align_log_result=0
     fi
-    AC_MSG_RESULT([$asm_result])
 
     AC_DEFINE_UNQUOTED([OMPI_ASM_ALIGN_LOG],
-                       [$ompi_cv_asm_align_log],
+                       [$asm_align_log_result],
                        [Assembly align directive expects logarithmic value])
 
     unset omp_asm_addr asm_result
@@ -859,8 +864,8 @@ asm_format="${ompi_asm_arch_config}"
 asm_format="${asm_format}-${ompi_cv_asm_text}-${ompi_cv_asm_global}"
 asm_format="${asm_format}-${ompi_cv_asm_label_suffix}-${ompi_cv_asm_gsym}"
 asm_format="${asm_format}-${ompi_cv_asm_lsym}"
-asm_format="${asm_format}-${ompi_cv_asm_type}-${ompi_cv_asm_size}"
+asm_format="${asm_format}-${ompi_cv_asm_type}-${ompi_asm_size}"
-asm_format="${asm_format}-${ompi_cv_asm_align_log}"
+asm_format="${asm_format}-${ompi_asm_align_log_result}"
 if test "$ompi_cv_asm_arch" = "POWERPC32" -o "$ompi_cv_asm_arch" = "POWERPC64" ; then
     asm_format="${asm_format}-${ompi_cv_asm_powerpc_r_reg}"
 else

orte/mca/pls/slurm/configure.m4

@@ -0,0 +1,35 @@
+# -*- 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_slurm_CONFIG([action-if-found], [action-if-not-found])
+# -----------------------------------------------------------
+AC_DEFUN([MCA_pls_slurm_CONFIG],[
+    OMPI_CHECK_SLURM([pls_slurm], [pls_slurm_good=1], [pls_slurm_good=0])
+         
+    # if check worked, set wrapper flags if so.  
+    # Evaluate succeed / fail
+    AS_IF([test "$pls_slurm_good" = "1"],
+          [pls_slurm_WRAPPER_EXTRA_LDFLAGS="$pls_slurm_LDFLAGS"
+           pls_slurm_WRAPPER_EXTRA_LIBS="$pls_slurm_LIBS"
+           $1],
+          [$2])
+
+    # set build flags to use in makefile
+    AC_SUBST([pls_slurm_CPPFLAGS])
+    AC_SUBST([pls_slurm_LDFLAGS])
+    AC_SUBST([pls_slurm_LIBS])
+])dnl

orte/mca/ras/slurm/configure.m4

@@ -0,0 +1,35 @@
+# -*- 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_ras_slurm_CONFIG([action-if-found], [action-if-not-found])
+# -----------------------------------------------------------
+AC_DEFUN([MCA_ras_slurm_CONFIG],[
+    OMPI_CHECK_SLURM([ras_slurm], [ras_slurm_good=1], [ras_slurm_good=0])
+         
+    # if check worked, set wrapper flags if so.  
+    # Evaluate succeed / fail
+    AS_IF([test "$ras_slurm_good" = "1"],
+          [ras_slurm_WRAPPER_EXTRA_LDFLAGS="$ras_slurm_LDFLAGS"
+           ras_slurm_WRAPPER_EXTRA_LIBS="$ras_slurm_LIBS"
+           $1],
+          [$2])
+
+    # set build flags to use in makefile
+    AC_SUBST([ras_slurm_CPPFLAGS])
+    AC_SUBST([ras_slurm_LDFLAGS])
+    AC_SUBST([ras_slurm_LIBS])
+])dnl