[GNUnet-SVN] r29049 - libmicrohttpd

[gnunet]

Author: grothoff
Date: 2013-09-06 10:01:14 +0200 (Fri, 06 Sep 2013)
New Revision: 29049

Modified:
   libmicrohttpd/ChangeLog
   libmicrohttpd/configure.ac
Log:
check openssl symbols for libmicrospdy

Modified: libmicrohttpd/ChangeLog
===================================================================
--- libmicrohttpd/ChangeLog     2013-09-06 07:17:18 UTC (rev 29048)
+++ libmicrohttpd/ChangeLog     2013-09-06 08:01:14 UTC (rev 29049)
@@ -1,7 +1,12 @@
+Fri Sep  6 10:00:44 CEST 2013
+       Improved check for proper OpenSSL version for
+       libmicrospdy. -CG
+
 Wed Sep  4 17:23:15 CEST 2013
-       Set IPV6_V6ONLY socket option correctly when IPv6 is 
-       enabled (MHD_USE_IPv6) but not dual stack 
+       Set IPV6_V6ONLY socket option correctly when IPv6 is
+       enabled (MHD_USE_IPv6) but not dual stack
        (MHD_USE_DUAL_STACK) -MW
+
 Mon Sep  2 22:59:45 CEST 2013
        Fix use-after-free in epoll()-mode on read error.
        Releasing libmicrohttpd 0.9.30. -CG

Modified: libmicrohttpd/configure.ac
===================================================================
--- libmicrohttpd/configure.ac  2013-09-06 07:17:18 UTC (rev 29048)
+++ libmicrohttpd/configure.ac  2013-09-06 08:01:14 UTC (rev 29049)
@@ -337,8 +337,11 @@
 if test "$enable_spdy" = "yes"
 then
  AC_CHECK_HEADERS([openssl/err.h], 
-                   [AM_CONDITIONAL(HAVE_OPENSSL, true)
-                   enable_spdy="yes"], 
+                   AC_CHECK_LIB(crypto, SSL_CTX_set_next_protos_advertised_cb,
+                    [AM_CONDITIONAL(HAVE_OPENSSL, true)
+                     enable_spdy="yes"], 
+                    [AM_CONDITIONAL(HAVE_OPENSSL, false)
+                    enable_spdy="no"]),
                    [AM_CONDITIONAL(HAVE_OPENSSL, false)
                    enable_spdy="no"])
 else