orte/alps: add support for --with-alps=yes on CLE 5.0 and clean out tabs

This commit was SVN r27096.

orte/config/orte_check_alps.m4

@@ -38,6 +38,16 @@ AC_DEFUN([ORTE_CHECK_ALPS],[
         # save the CPPFLAGS so we can check for alps/apInfo.h without adding $with_alps/include to the global path
         orte_check_alps_$1_save_CPPFLAGS="$CPPFLAGS"
 
+        #
+        # check to see where alps is installed, it wandered to a new location starting with CLE 5.0
+        #
+ 
+        if test -f "/usr/lib/alps/libalps.a" ; then
+            using_cle5_install="no"
+        else
+            using_cle5_install="yes"
+        fi
+
         if test "$with_alps" = "no" -o -z "$with_alps" ; then
             orte_check_alps_happy="no"
         else
@@ -52,14 +62,24 @@ AC_DEFUN([ORTE_CHECK_ALPS],[
                    AS_IF([test -d "$with_alps/lib64"],
                        [orte_check_alps_libdir="$with_alps/lib64"],
                        [orte_check_alps_libdir="$with_alps/lib"])
+               else
+                   if test "$using_cle5_install" = "yes"; then
+                       orte_check_alps_libdir="/opt/cray/alps/default/lib64"
                    else
                        orte_check_alps_libdir="/usr/lib/alps"
                    fi
                fi
+           fi
 
+           if test "$using_cle5_install" = "yes" ; then
                   AS_IF([test "$with_alps" = "yes"],
                         [orte_check_alps_dir="/usr"],
                         [orte_check_alps_dir="$with_alps"])
+           else
+                  AS_IF([test "$with_alps" = "yes"],
+                        [orte_check_alps_dir="/opt/cray/alps/default"],
+                        [orte_check_alps_dir="$with_alps"])
+           fi
 
            $1_CPPFLAGS="-I$orte_check_alps_dir/include"
            $1_LDFLAGS="-L$orte_check_alps_libdir"