From f272ec7373a11a5917c9f3aca56969a48eec2f96 Mon Sep 17 00:00:00 2001 From: Ben Pfaff Date: Fri, 20 Aug 2010 11:26:03 -0700 Subject: configure: Enable OpenSSL support by default. Years ago some users had broken OpenSSL libraries that didn't actually work, so we disabled OpenSSL by default. By now, I hope that those users have fixed their systems. --- m4/openvswitch.m4 | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) (limited to 'm4') diff --git a/m4/openvswitch.m4 b/m4/openvswitch.m4 index d3e9f9f0..5d77ca24 100644 --- a/m4/openvswitch.m4 +++ b/m4/openvswitch.m4 @@ -60,30 +60,34 @@ AC_DEFUN([OVS_CHECK_NETLINK], [Define to 1 if Netlink protocol is available.]) fi]) -dnl Checks for OpenSSL, if --enable-ssl is passed in. +dnl Checks for OpenSSL. AC_DEFUN([OVS_CHECK_OPENSSL], [AC_ARG_ENABLE( [ssl], - [AC_HELP_STRING([--enable-ssl], - [Enable ssl support (requires libssl)])], + [AC_HELP_STRING([--disable-ssl], [Disable OpenSSL support])], [case "${enableval}" in (yes) ssl=true ;; (no) ssl=false ;; (*) AC_MSG_ERROR([bad value ${enableval} for --enable-ssl]) ;; esac], - [ssl=false]) + [ssl=check]) - if test "$ssl" = true; then + if test "$ssl" != false; then dnl Make sure that pkg-config is installed. m4_pattern_forbid([PKG_CHECK_MODULES]) PKG_CHECK_MODULES([SSL], [libssl], [HAVE_OPENSSL=yes], [HAVE_OPENSSL=no - AC_MSG_WARN([Cannot find libssl: + if test "$ssl" = check; then + AC_MSG_WARN([Cannot find libssl: $SSL_PKG_ERRORS -OpenFlow connections over SSL will not be supported.])]) +OpenFlow connections over SSL will not be supported. +(You may use --disable-ssl to suppress this warning.)]) + else + AC_MSG_ERROR([Cannot find libssl (use --disable-ssl to configure without SSL support)]) + fi]) else HAVE_OPENSSL=no fi -- cgit v1.2.3