fix alps configury

This commit was SVN r27962.

config/orte_check_alps.m4

@@ -71,19 +71,14 @@ AC_DEFUN([ORTE_CHECK_ALPS],[
                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"])
+           if test "$with_alps" = "yes" ; then
+               AS_IF([test "$using_cle5_install" = "yes"],
+                   [orte_check_alps_dir="/opt/cray/alps/default"],
+                   [orte_check_alps_dir="/usr"])
            else
-                  AS_IF([test "$with_alps" = "yes"],
-                        [orte_check_alps_dir="/opt/cray/alps/default"],
-                        [orte_check_alps_dir="$with_alps"])
+               orte_check_alps_dir="$with_alps"
            fi
 
-           $1_CPPFLAGS="-I$orte_check_alps_dir/include"
-           $1_LDFLAGS="-L$orte_check_alps_libdir"
-
            if test -z "$orte_check_alps_pmi_happy"; then
                # if pmi support is requested, then ORTE_CHECK_PMI
                # will have added the -lpmi flag to LIBS. We then need
@@ -109,6 +104,9 @@ AC_DEFUN([ORTE_CHECK_ALPS],[
         fi
     fi
 
+    $1_CPPFLAGS="-I$orte_check_alps_dir/include"
+    $1_LDFLAGS="-L$orte_check_alps_libdir"
+
     AS_IF([test "$orte_check_alps_happy" = "yes"], 
           [$2], 
           [$3])

orte/mca/ras/alps/Makefile.am

@@ -53,8 +53,10 @@ mcacomponent_LTLIBRARIES = $(component)
 mca_ras_alps_la_SOURCES = $(component_sources)
 mca_ras_alps_la_LDFLAGS = -module -avoid-version $(ras_alps_LDFLAGS)
 mca_ras_alps_la_LIBADD = $(ras_alps_LIBS)
+mca_ras_alps_la_CPPFLAGS = $(ras_alps_CPPFLAGS)
 
 noinst_LTLIBRARIES = $(lib)
 libmca_ras_alps_la_SOURCES = $(lib_sources)
 libmca_ras_alps_la_LDFLAGS = -module -avoid-version $(ras_alps_LDFLAGS)
 libmca_ras_alps_la_LIBADD = $(ras_alps_LIBS)
+libmca_ras_alps_la_CPPFLAGS = $(ras_alps_CPPFLAGS)