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 <[email protected]> Ubuntu bug #680439.
eyoung-father · Nov 29, 2010 · 924c243 · 924c243
1 parent 7045a62
commit 924c243
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/AUTHORS b/AUTHORS
@@ -40,6 +40,7 @@ Brad Hall               [email protected]
 Brandon Heller          [email protected]
 Bryan Fulton            [email protected]
 Cedric Hobbs            [email protected]
+Dave Walker             [email protected]
 Derek Cormier           [email protected]
 DK Moon                 [email protected]
 Ghanem Bahri            [email protected]

diff --git 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