diff options
| author | Ben Pfaff <blp@nicira.com> | 2010-08-20 11:26:03 -0700 |
|---|---|---|
| committer | Ben Pfaff <blp@nicira.com> | 2010-08-26 13:51:38 -0700 |
| commit | f272ec7373a11a5917c9f3aca56969a48eec2f96 (patch) | |
| tree | 3f9b8f0af3620d2aa4103dd59d0fbd1e2ee865b6 /m4 | |
| parent | 2105ccc8503374c12b1d5e4cd6d4b23eb89d4d02 (diff) | |
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.
Diffstat (limited to 'm4')
| -rw-r--r-- | m4/openvswitch.m4 | 18 |
1 files changed, 11 insertions, 7 deletions
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 |