* replaces all uses of == with = in test arguments

* make sure LIBS contains -lpmapi before checking for pm_cycles()
* reorder aix functions so that we don't use get_usecs() before we
  define it

This commit was SVN r6970.

config/ompi_check_bproc.m4

@@ -25,7 +25,7 @@ AC_DEFUN([OMPI_CHECK_BPROC],[
                 [AC_HELP_STRING([--with-bproc],
                                 [Directory where the BProc software is installed])])
 
-    AS_IF([test ! -z "$with_bproc" -a "$with_bproc" == "no"],[$4], [ 
+    AS_IF([test ! -z "$with_bproc" -a "$with_bproc" = "no"],[$4], [ 
         ompi_check_bproc_save_CPPFLAGS="$CPPFLAGS"
         ompi_check_bproc_save_LDFLAGS="$LDFLAGS"
         ompi_check_bproc_save_LIBS="$LIBS"

opal/mca/timer/aix/configure.m4

@@ -49,7 +49,8 @@ AC_DEFUN([MCA_timer_aix_CONFIG],[
     AS_IF([test "$timer_aix_happy" = "yes"],
           [AC_CHECK_LIB([pmapi],
                         [pm_cycles],
-                        [timer_aix_LIBS="-lpmapi"],
+                        [LIBS="$LIBS -lpmapi"
+                         timer_aix_LIBS="-lpmapi"],
                         [timer_aix_LIBS=""])])
 
     # get us a HAVE_PM_CYCLES #define

opal/mca/timer/aix/timer_aix.h

@@ -24,16 +24,6 @@ typedef uint64_t opal_timer_t;
 extern opal_timer_t opal_timer_aix_freq_mhz;
 extern opal_timer_t opal_timer_aix_freq;
 
-static inline opal_timer_t
-opal_timer_base_get_cycles()
-{
-#ifdef HAVE_PM_CYCLES
-    return opal_timer_base_get_usec * opal_timer_aix_freq_mhz;
-#else
-    return 0;
-#endif
-}
-
 static inline opal_timer_t
 opal_timer_base_get_usec()
 {
@@ -47,6 +37,16 @@ opal_timer_base_get_usec()
     return retval;
 }    
 
+static inline opal_timer_t
+opal_timer_base_get_cycles()
+{
+#ifdef HAVE_PM_CYCLES
+    return opal_timer_base_get_usec() * opal_timer_aix_freq_mhz;
+#else
+    return 0;
+#endif
+}
+
 static inline opal_timer_t
 opal_timer_base_get_freq()
 {

opal/mca/timer/configure.m4

@@ -25,7 +25,7 @@ AC_DEFUN([MCA_timer_CONFIG],[
         MCA_CONFIGURE_FRAMEWORK($1, $2)
 
         # someone should have set this...
-        if test "$timer_base_include" == "" ; then
+        if test "$timer_base_include" = "" ; then
             timer_base_include="base/base_null.h"
         fi