From 99e268b9ffecf79e888c54058a10a1d7ab7ed62c Mon Sep 17 00:00:00 2001
From: Jeff Squyres <jsquyres@cisco.com>
Date: Fri, 25 Jun 2004 14:22:15 +0000
Subject: [PATCH] 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 | 20 ++++++++------------
 1 file changed, 8 insertions(+), 12 deletions(-)

diff --git a/src/mca/ptl/elan/configure.stub b/src/mca/ptl/elan/configure.stub
index 5bf5c92770..ce86dfcc59 100644
--- a/src/mca/ptl/elan/configure.stub
+++ b/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],  
-	[ompi_elan_have_libelan3=yes], 
-	[ompi_elan_nolibelan3=1])
+    # We only need one of elanctrl or elan3
 
     AC_CHECK_LIB([elanctrl], [elanctrl_open], 
-	[ompi_elan_have_libelanctrl=yes], 
-	[ompi_elan_nolibelanctrl=1])
-
-    if test "$ompi_elan_have_libelan3" = "yes"; then
-	PTL_ELAN_LIBS="$PTL_ELAN_LIBS -lelan3"
-    elif test "$ompi_elan_have_libelanctrl" = "yes"; then
-	PTL_ELAN_LIBS="$PTL_ELAN_LIBS -lelanctrl"
-    else
-	AC_MSG_WARN([*** Cannot find libelan3 or libelanctrl ])
+        [happy=yes PTL_ELAN_LIBS="$PTL_ELAN_LIBS -lelanctrl"], [happy=])
+    if test -z "$happy"; then
+        AC_CHECK_LIB([elan3], [elan3_create],  
+            [happy=yes PTL_ELAN_LIBS="$PTL_ELAN_LIBS -lelan3"], [happy=])
+    fi
+    if test -z "$happy"; then
+	AC_MSG_WARN([*** Cannot find libelan3 or libelanctrl])
 	AC_MSG_ERROR([Cannot continue])
     fi