[mpich2-commits] r6760 - mpich2/trunk/src/mpid/ch3/channels/nemesis

[goodell at mcs.anl.gov]

Author: goodell
Date: 2010-05-28 15:33:48 -0500 (Fri, 28 May 2010)
New Revision: 6760

Modified:
   mpich2/trunk/src/mpid/ch3/channels/nemesis/configure.in
Log:
simplify check for OPA atomic emulation in nemesis

Uses a define added in r106 of OPA.  Now nemesis doesn't need to
use an AC_ARG_WITH matching OPA's argument.

Reviewed by buntinas at .

Modified: mpich2/trunk/src/mpid/ch3/channels/nemesis/configure.in
===================================================================
--- mpich2/trunk/src/mpid/ch3/channels/nemesis/configure.in	2010-05-28 20:12:40 UTC (rev 6759)
+++ mpich2/trunk/src/mpid/ch3/channels/nemesis/configure.in	2010-05-28 20:33:48 UTC (rev 6760)
@@ -246,9 +246,6 @@
 
 # ensure that atomic primitives are available
 AC_MSG_CHECKING([for OpenPA atomic primitive availability])
-AC_ARG_WITH(atomic-primitives, [--with-atomic-primitives - set to 'no' to permit
-                                atomic primitive emulation.  See the openpa
-                                directory for more info.],, with_atomic_primitives=not_specified)
 
 # Double check that we actually have a present and working OpenPA
 # configuration.  This must be AC_COMPILE_IFELSE instead of the stronger
@@ -288,10 +285,16 @@
 ],using_emulated_atomics=no,using_emulated_atomics=yes)
 
     if test "$using_emulated_atomics" = "yes" ; then
-        if test "$with_atomic_primitives" = "no" ; then
+        AC_PREPROC_IFELSE([
+#include <opa_primitives.h>
+/* may also be undefined in older (pre-r106) versions of OPA */
+#if !defined(OPA_EXPLICIT_EMULATION)
+#error "lock-based emulation was automatic, not explicit"
+#endif
+],[atomics_explicitly_emulated=yes],[atomics_explicitly_emulated=no])
+        if test "$atomics_explicitly_emulated" = "yes" ; then
             AC_MSG_RESULT([yes (emulated)])
         else
-            # error
             AC_MSG_RESULT([no])
             AC_MSG_ERROR([
 The nemesis channel was selected yet no native atomic primitives are