Fix a bug in the configure.m4 to ensure we disable unused libevent modes. Edit their Makefile.am to remove bufferevent support since we don't use it either.

Sorry for mid-day correction.

This commit was SVN r25453.

opal/mca/event/libevent2013/configure.m4

@@ -33,9 +33,7 @@ AC_DEFUN([MCA_opal_event_libevent2013_CONFIG],[
     
     AC_MSG_CHECKING([libevent configuration args])
 
-    str=`event_args="--disable-dns --disable-http --disable-rpc --disable-openssl --enable-hidden-symbols --includedir=$includedir/openmpi/opal/event/libevent/include"`
+    event_args="--disable-dns --disable-http --disable-rpc --disable-openssl --enable-hidden-symbols --includedir=$includedir/openmpi/opal/event/libevent/include"
-    eval $str
-    unset str
 
     AC_ARG_ENABLE(event-rtsig,
         AC_HELP_STRING([--enable-event-rtsig],

opal/mca/event/libevent2013/libevent/Makefile.am

@@ -178,12 +178,14 @@ endif
 #	echo "#endif" >> $@
 
 # Open MPI: -- eliminate extra libevent libraries. We compile
-# everything that is enabled into the core.
+# everything that is enabled into the core, removing bufferevents
-CORE_SRC = event.c evthread.c buffer.c \
+# as OMPI does not use them
+#       buffer.c \
 	bufferevent.c bufferevent_sock.c bufferevent_filter.c \
-	bufferevent_pair.c listener.c bufferevent_ratelim.c \
+	bufferevent_pair.c bufferevent_ratelim.c
-	evmap.c	log.c evutil.c evutil_rand.c strlcpy.c event_tagging.c \
+CORE_SRC = event.c evthread.c listener.c \
-	$(SYS_SRC)
+           evmap.c log.c evutil.c evutil_rand.c strlcpy.c event_tagging.c \
+           $(SYS_SRC)
 CORE_LIBS =
 
 if HTTP
@@ -200,17 +202,20 @@ if PTHREADS
 CORE_SRC += evthread_pthread.c
 endif
 
-if OPENSSL
+# Open MPI: do not include ssl
-CORE_SRC += bufferevent_openssl.c
+#if OPENSSL
-CORE_LIBS += -lcrypto -lssl
+#CORE_SRC += bufferevent_openssl.c
-endif
+#CORE_LIBS += -lcrypto -lssl
+#endif
 
 libevent_la_SOURCES = $(CORE_SRC) $(headers)
 libevent_la_LIBADD = $(CORE_LIBS) $(SYS_LIBS)
 
+# Open MPI: do not include bufferevent
+# evbuffer-internal.h \
+	bufferevent-internal.h
 EXTRA_DIST += event.h evutil.h util-internal.h mm-internal.h ipv6-internal.h \
-	strlcpy-internal.h evbuffer-internal.h \
+	strlcpy-internal.h event-internal.h \
-	bufferevent-internal.h event-internal.h \
 	evthread-internal.h defer-internal.h \
 	minheap-internal.h log-internal.h evsignal-internal.h evmap-internal.h \
 	changelist-internal.h iocp-internal.h \