[mesos] branch master updated: Updated configure.ac to correct openssl/libevent setup.

[vi...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

vinodkone pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/mesos.git


The following commit(s) were added to refs/heads/master by this push:
     new dfcd31f  Updated configure.ac to correct openssl/libevent setup.
dfcd31f is described below

commit dfcd31fab6a99940fe1e33c3c6ba780f6b88b29d
Author: Till Toenshoff <to...@me.com>
AuthorDate: Mon Jul 22 18:00:10 2019 -0500

    Updated configure.ac to correct openssl/libevent setup.
    
    Fixes a problem introduced by configure.ac reordering in commit 4df2b62.
    
    Review: https://reviews.apache.org/r/71138/
---
 configure.ac | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/configure.ac b/configure.ac
index 0e3058c..ae40d56 100644
--- a/configure.ac
+++ b/configure.ac
@@ -901,14 +901,6 @@ libcrypto is required for an SSL-enabled build.
 
   LIBS="-lssl -lcrypto $LIBS"
 
-  if test "x$enable_libevent" = "xyes"; then
-    if test "x$with_bundled_libevent" != "xyes"; then
-      MESOS_HAVE_LIBEVENT()
-      MESOS_HAVE_LIBEVENT_SSL()
-    fi
-  else
-    AC_MSG_ERROR([SSL is currently only supported with libevent])
-  fi
   AC_DEFINE([USE_SSL_SOCKET], [1])
 fi
 
@@ -1605,6 +1597,16 @@ if test "x$enable_libevent" = "xyes"; then
   fi
 fi
 
+if test "x$enable_ssl" = "xyes"; then
+  if test "x$enable_libevent" = "xyes"; then
+    if test "x$with_bundled_libevent" != "xyes"; then
+      MESOS_HAVE_LIBEVENT_SSL()
+    fi
+  else
+    AC_MSG_ERROR([SSL is currently only supported with libevent])
+  fi
+fi
+
 AM_CONDITIONAL([ENABLE_LIBEVENT],
                [test "x$enable_libevent" = "xyes"])
 AM_CONDITIONAL([WITH_BUNDLED_LIBEVENT],