From: Ben Pfaff Date: Wed, 24 Nov 2010 20:25:10 +0000 (-0800) Subject: configure: Check for pkg-config "openssl" library instead of "libssl". X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=924c24342c872045791ca463af702cf21e86d2c3;p=openvswitch 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 Ubuntu bug #680439. --- diff --git a/AUTHORS b/AUTHORS index 3e80eef1..d283def2 100644 --- 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 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