Moved libevent_openssl validation into libevent.m4.

Combines all libevent related header and library checks into libevent.m4. Review: https://reviews.apache.org/r/68915/
apache · Oct 4, 2018 · 9c0d41e · 9c0d41e
1 parent 2ccc37e
commit 9c0d41e
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 14 deletions.
diff --git a/configure.ac b/configure.ac
@@ -1971,20 +1971,7 @@ libcrypto is required for an SSL-enabled build.
 
   if test "x$enable_libevent" = "xyes"; then
     if test "x$with_bundled_libevent" != "xyes"; then
-      AC_CHECK_HEADERS([event2/bufferevent_ssl.h],
-                       [AC_CHECK_LIB([event_openssl],
-                                     [bufferevent_openssl_get_ssl],
-                                     [],
-                                     [AC_MSG_ERROR([cannot find libevent_openssl
--------------------------------------------------------------------
-libevent_openssl version 2+ is required for an SSL-enabled build.
--------------------------------------------------------------------
-                                     ])])],
-                       [AC_MSG_ERROR([cannot find libevent_openssl headers
--------------------------------------------------------------------
-libevent_openssl version 2+ headers are required for an SSL-enabled build.
--------------------------------------------------------------------
-      ])])
+      MESOS_HAVE_LIBEVENT_SSL()
     fi
   else
     AC_MSG_ERROR([SSL is currently only supported with libevent])

diff --git a/m4/libevent.m4 b/m4/libevent.m4
@@ -25,6 +25,16 @@
 #   Validates if we have a usable libevent.
 #
 
+#
+# SYNOPSIS
+#
+#   MESOS_HAVE_LIBEVENT_SSL()
+#
+# DESCRIPTION
+#
+#   Validates if we have a usable libevent_openssl.
+#
+
 AC_DEFUN([MESOS_HAVE_LIBEVENT],[
   AC_CHECK_HEADERS([event2/event.h], [], [
     AC_MSG_ERROR([cannot find libevent headers
@@ -54,3 +64,20 @@ libevent_pthreads version 2+ is required for libprocess to build.
 -------------------------------------------------------------------
   ])])
 ])
+
+AC_DEFUN([MESOS_HAVE_LIBEVENT_SSL],[
+  AC_CHECK_HEADERS([event2/bufferevent_ssl.h],
+                   [AC_CHECK_LIB([event_openssl],
+                                 [bufferevent_openssl_get_ssl],
+                                 [],
+                                 [AC_MSG_ERROR([cannot find libevent_openssl
+-------------------------------------------------------------------
+libevent_openssl version 2+ is required for an SSL-enabled build.
+-------------------------------------------------------------------
+                                 ])])],
+                   [AC_MSG_ERROR([cannot find libevent_openssl headers
+-------------------------------------------------------------------
+libevent_openssl version 2+ headers are required for an SSL-enabled build.
+-------------------------------------------------------------------
+  ])])
+])