aboutsummaryrefslogtreecommitdiff
path: root/m4
diff options
context:
space:
mode:
authorBen Pfaff <blp@nicira.com>2010-11-24 12:25:10 -0800
committerBen Pfaff <blp@nicira.com>2010-11-29 09:54:29 -0800
commit924c24342c872045791ca463af702cf21e86d2c3 (patch)
tree8953a6365075eaf8485d43b373f14595d1580a06 /m4
parent7045a624ea8a516f536e7857b0bc6c474e7f2426 (diff)
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.
Diffstat (limited to 'm4')
-rw-r--r--m4/openvswitch.m46
1 files changed, 3 insertions, 3 deletions
diff --git a/m4/openvswitch.m4 b/m4/openvswitch.m4
index c5f07420..fe30eec2 100644
--- 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