configure: Check for pkg-config "openssl" library instead of "libssl".

Checking for libssl only does not necessarily link against libcrypto, so
the build can gratuitously fail.

Reported-by: Dave Walker <DaveWalker@ubuntu.com>
Ubuntu bug #680439.

diff --git a/AUTHORS b/AUTHORS
index 3e80eef1d8ba3f22ea428cd6eb335d10baa77d46..d283def20e2aea9204ea7da5853216b717e47879 100644 (file)
--- a/AUTHORS
+++ b/AUTHORS
@@ -40,6 +40,7 @@ Brad Hall               brad@nicira.com
 Brandon Heller          brandonh@stanford.edu
 Bryan Fulton            bryan@nicira.com
 Cedric Hobbs            cedric@nicira.com
+Dave Walker             DaveWalker@ubuntu.com
 Derek Cormier           derek.cormier@lab.ntt.co.jp
 DK Moon                 dkmoon@nicira.com
 Ghanem Bahri            bahri.ghanem@gmail.com

diff --git a/m4/openvswitch.m4 b/m4/openvswitch.m4
index c5f0742016f0f5aad9b31b0b0587cf10bdc8cfcb..fe30eec2cf043026c97026cd873f87c8407877ef 100644 (file)
--- a/m4/openvswitch.m4
+++ b/m4/openvswitch.m4
@@ -75,18 +75,18 @@ AC_DEFUN([OVS_CHECK_OPENSSL],
    if test "$ssl" != false; then
        dnl Make sure that pkg-config is installed.
        m4_pattern_forbid([PKG_CHECK_MODULES])
-       PKG_CHECK_MODULES([SSL], [libssl], 
+       PKG_CHECK_MODULES([SSL], [openssl], 
          [HAVE_OPENSSL=yes],
          [HAVE_OPENSSL=no
           if test "$ssl" = check; then
-            AC_MSG_WARN([Cannot find libssl:
+            AC_MSG_WARN([Cannot find openssl:
 
 $SSL_PKG_ERRORS
 
 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)])
+            AC_MSG_ERROR([Cannot find openssl (use --disable-ssl to configure without SSL support)])
           fi])
    else
        HAVE_OPENSSL=no