diff options
Diffstat (limited to 'configure.ac')
-rw-r--r-- | configure.ac | 44 |
1 files changed, 44 insertions, 0 deletions
diff --git a/configure.ac b/configure.ac index 91e0a96e..6f2a7851 100644 --- a/configure.ac +++ b/configure.ac | |||
@@ -34,6 +34,14 @@ AC_SUBST(LIB_VERSION_CURRENT) | |||
34 | AC_SUBST(LIB_VERSION_REVISION) | 34 | AC_SUBST(LIB_VERSION_REVISION) |
35 | AC_SUBST(LIB_VERSION_AGE) | 35 | AC_SUBST(LIB_VERSION_AGE) |
36 | 36 | ||
37 | LIBSPDY_VERSION_CURRENT=0 | ||
38 | LIBSPDY_VERSION_REVISION=0 | ||
39 | LIBSPDY_VERSION_AGE=0 | ||
40 | AC_SUBST(LIBSPDY_VERSION_CURRENT) | ||
41 | AC_SUBST(LIBSPDY_VERSION_REVISION) | ||
42 | AC_SUBST(LIBSPDY_VERSION_AGE) | ||
43 | |||
44 | |||
37 | if test `uname -s` = "OS/390" | 45 | if test `uname -s` = "OS/390" |
38 | then | 46 | then |
39 | # configure binaries for z/OS | 47 | # configure binaries for z/OS |
@@ -263,6 +271,39 @@ AC_CHECK_LIB(magic, magic_open, | |||
263 | AM_CONDITIONAL(HAVE_MAGIC, false))], | 271 | AM_CONDITIONAL(HAVE_MAGIC, false))], |
264 | AM_CONDITIONAL(HAVE_MAGIC, false)) | 272 | AM_CONDITIONAL(HAVE_MAGIC, false)) |
265 | 273 | ||
274 | |||
275 | # optional: libmicrospdy support. Enabled by default | ||
276 | AC_MSG_CHECKING(whether to support libmicrospdy) | ||
277 | AC_ARG_ENABLE([spdy], | ||
278 | AS_HELP_STRING([--disable-spdy], | ||
279 | [disable libmicrospdy]), | ||
280 | [enable_spdy=${enableval}], | ||
281 | [enable_spdy=yes]) | ||
282 | if test "$enable_spdy" = "yes" | ||
283 | then | ||
284 | AC_DEFINE([SPDY_SUPPORT],[1],[include libmicrospdy support]) | ||
285 | else | ||
286 | AC_DEFINE([SPDY_SUPPORT],[0],[disable libmicrospdy support]) | ||
287 | fi | ||
288 | AC_MSG_RESULT($enable_spdy) | ||
289 | AM_CONDITIONAL(ENABLE_SPDY, [test "x$enable_spdy" != "xno"]) | ||
290 | |||
291 | spdy_OPENSSL | ||
292 | # for pkg-config | ||
293 | SPDY_LIBDEPS="" | ||
294 | |||
295 | |||
296 | AC_SUBST(SPDY_LIB_LDFLAGS) | ||
297 | # for pkg-config | ||
298 | AC_SUBST(SPDY_LIBDEPS) | ||
299 | |||
300 | AM_CONDITIONAL(ENABLE_MINITASN1, [test -n " " ] ) | ||
301 | AM_CONDITIONAL(ENABLE_OPENSSL, [test -n "" ] ) | ||
302 | AM_CONDITIONAL(HAVE_LD_OUTPUT_DEF, [test -n "" ] ) | ||
303 | AM_CONDITIONAL(HAVE_LD_VERSION_SCRIPT, [test -n "" ] ) | ||
304 | |||
305 | |||
306 | |||
266 | LIBS=$SAVE_LIBS | 307 | LIBS=$SAVE_LIBS |
267 | AM_CONDITIONAL(HAVE_CURL, test x$curl = x1) | 308 | AM_CONDITIONAL(HAVE_CURL, test x$curl = x1) |
268 | 309 | ||
@@ -450,9 +491,12 @@ src/Makefile | |||
450 | src/include/Makefile | 491 | src/include/Makefile |
451 | src/include/plibc/Makefile | 492 | src/include/plibc/Makefile |
452 | src/microhttpd/Makefile | 493 | src/microhttpd/Makefile |
494 | src/microspdy/Makefile | ||
495 | src/spdy2http/Makefile | ||
453 | src/examples/Makefile | 496 | src/examples/Makefile |
454 | src/testcurl/Makefile | 497 | src/testcurl/Makefile |
455 | src/testcurl/https/Makefile | 498 | src/testcurl/https/Makefile |
499 | src/testspdy/Makefile | ||
456 | src/testzzuf/Makefile]) | 500 | src/testzzuf/Makefile]) |
457 | AC_OUTPUT | 501 | AC_OUTPUT |
458 | 502 | ||