[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r27215 - in libmicrohttpd: . src
From: |
gnunet |
Subject: |
[GNUnet-SVN] r27215 - in libmicrohttpd: . src |
Date: |
Tue, 21 May 2013 14:35:28 +0200 |
Author: grothoff
Date: 2013-05-21 14:35:28 +0200 (Tue, 21 May 2013)
New Revision: 27215
Modified:
libmicrohttpd/ChangeLog
libmicrohttpd/configure.ac
libmicrohttpd/src/Makefile.am
Log:
improving build system to tolerate missing libraries for libmicrospdy
Modified: libmicrohttpd/ChangeLog
===================================================================
--- libmicrohttpd/ChangeLog 2013-05-21 12:20:57 UTC (rev 27214)
+++ libmicrohttpd/ChangeLog 2013-05-21 12:35:28 UTC (rev 27215)
@@ -1,3 +1,8 @@
+Tue May 21 14:34:36 CEST 2013
+ Improving configure tests for OpenSSL and spdylay to
+ avoid build errors in libmicrospdy code if those libraries
+ are not present. -CG
+
Mon May 20 12:29:35 CEST 2013
Added MHD_CONNECTION_INFO_CONNECTION_FD to allow clients
direct access to connection socket; useful for COMET
Modified: libmicrohttpd/configure.ac
===================================================================
--- libmicrohttpd/configure.ac 2013-05-21 12:20:57 UTC (rev 27214)
+++ libmicrohttpd/configure.ac 2013-05-21 12:35:28 UTC (rev 27215)
@@ -279,20 +279,38 @@
[disable libmicrospdy]),
[enable_spdy=${enableval}],
[enable_spdy=yes])
+AC_MSG_RESULT($enable_spdy)
+
if test "$enable_spdy" = "yes"
then
+ AC_CHECK_HEADERS([openssl/err.h],
+ [AM_CONDITIONAL(HAVE_OPENSSL, true)
+ enable_spdy="yes"],
+ [AM_CONDITIONAL(HAVE_OPENSSL, false)
+ enable_spdy="no"])
+fi
+
+if test "$enable_spdy" = "yes"
+then
AC_DEFINE([SPDY_SUPPORT],[1],[include libmicrospdy support])
else
AC_DEFINE([SPDY_SUPPORT],[0],[disable libmicrospdy support])
fi
+AM_CONDITIONAL(ENABLE_SPDY, [test "x$enable_spdy" != "xno"])
+AC_MSG_CHECKING(whether we have OpenSSL and thus can support libmicrospdy)
AC_MSG_RESULT($enable_spdy)
-AM_CONDITIONAL(ENABLE_SPDY, [test "x$enable_spdy" != "xno"])
spdy_OPENSSL
# for pkg-config
SPDY_LIBDEPS=""
+AC_CHECK_HEADERS([spdylay/spdylay.h],
+ [AM_CONDITIONAL(HAVE_SPDYLAY, true)
+ have_spdylay="yes"],
+ [AM_CONDITIONAL(HAVE_SPDYLAY, false)
+ have_spdylay="no"])
+
AC_SUBST(SPDY_LIB_LDFLAGS)
# for pkg-config
AC_SUBST(SPDY_LIBDEPS)
@@ -529,6 +547,8 @@
Digest auth.: ${enable_dauth}
Postproc: ${enable_postprocessor}
HTTPS support: ${enable_https}
+ libmicrospdy: ${enable_spdy}
+ spdylay (testing): ${have_spdylay}
])
if test "x$enable_https" = "xyes"
Modified: libmicrohttpd/src/Makefile.am
===================================================================
--- libmicrohttpd/src/Makefile.am 2013-05-21 12:20:57 UTC (rev 27214)
+++ libmicrohttpd/src/Makefile.am 2013-05-21 12:35:28 UTC (rev 27215)
@@ -7,9 +7,13 @@
endif
endif
if ENABLE_SPDY
-# fixme: should test for spdylay before building testspdy!
-microspdy = microspdy spdy2http testspdy
+if HAVE_OPENSSL
+microspdy = microspdy spdy2http
+if HAVE_SPDYLAY
+microspdy += testspdy
endif
+endif
+endif
SUBDIRS = include microhttpd $(microspdy) examples $(curltests) $(zzuftests) .
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r27215 - in libmicrohttpd: . src,
gnunet <=