A few more minor mods; result of more e-mails between WK and myself. :-)

This commit was SVN r1476.

src/mca/ptl/elan/configure.stub

@@ -24,20 +24,16 @@ AC_DEFUN([MCA_CONFIGURE_STUB],[
         PTL_ELAN_LIBS="$PTL_ELAN_LIBS -l$lib"
     done
 
-    AC_CHECK_LIB([elan3], [elan3_create],  
+    # We only need one of elanctrl or elan3
-	[ompi_elan_have_libelan3=yes], 
-	[ompi_elan_nolibelan3=1])
 
     AC_CHECK_LIB([elanctrl], [elanctrl_open], 
-	[ompi_elan_have_libelanctrl=yes], 
+        [happy=yes PTL_ELAN_LIBS="$PTL_ELAN_LIBS -lelanctrl"], [happy=])
-	[ompi_elan_nolibelanctrl=1])
+    if test -z "$happy"; then
-
+        AC_CHECK_LIB([elan3], [elan3_create],  
-    if test "$ompi_elan_have_libelan3" = "yes"; then
+            [happy=yes PTL_ELAN_LIBS="$PTL_ELAN_LIBS -lelan3"], [happy=])
-	PTL_ELAN_LIBS="$PTL_ELAN_LIBS -lelan3"
+    fi
-    elif test "$ompi_elan_have_libelanctrl" = "yes"; then
+    if test -z "$happy"; then
-	PTL_ELAN_LIBS="$PTL_ELAN_LIBS -lelanctrl"
+	AC_MSG_WARN([*** Cannot find libelan3 or libelanctrl])
-    else
-	AC_MSG_WARN([*** Cannot find libelan3 or libelanctrl ])
 	AC_MSG_ERROR([Cannot continue])
     fi