diff options
author | Schanzenbach, Martin <martin.schanzenbach@aisec.fraunhofer.de> | 2018-06-24 20:25:16 +0200 |
---|---|---|
committer | Schanzenbach, Martin <martin.schanzenbach@aisec.fraunhofer.de> | 2018-06-24 20:25:16 +0200 |
commit | e1daa8a67bf88202a1fc9f69bff0b46ee5520f5e (patch) | |
tree | b82cb9c60bf06fc591721b60c80759c67349b88f /configure.ac | |
parent | 918d1fcfef087fdcb9c27c15244ada8074890239 (diff) | |
download | gnunet-e1daa8a67bf88202a1fc9f69bff0b46ee5520f5e.tar.gz gnunet-e1daa8a67bf88202a1fc9f69bff0b46ee5520f5e.zip |
fix https://gnunet.org/bugs/view.php?id=4746
Diffstat (limited to 'configure.ac')
-rw-r--r-- | configure.ac | 28 |
1 files changed, 27 insertions, 1 deletions
diff --git a/configure.ac b/configure.ac index 204859556..99eeeba8a 100644 --- a/configure.ac +++ b/configure.ac | |||
@@ -409,7 +409,32 @@ fi | |||
409 | 409 | ||
410 | # check for jansson library | 410 | # check for jansson library |
411 | jansson=0 | 411 | jansson=0 |
412 | AC_CHECK_HEADER([jansson.h],jansson=1) | 412 | AC_MSG_CHECKING(for libjansson) |
413 | AC_ARG_WITH(jansson, | ||
414 | [ --with-jansson=PFX base of libjansson installation], | ||
415 | [AC_MSG_RESULT([$with_jansson]) | ||
416 | case $with_jansson in | ||
417 | no) | ||
418 | ;; | ||
419 | yes) | ||
420 | AC_CHECK_HEADERS(jansson.h, | ||
421 | AC_CHECK_LIB([jansson], [json_loads], | ||
422 | jansson=1)) | ||
423 | ;; | ||
424 | *) | ||
425 | LDFLAGS="-L$with_jansson/lib $LDFLAGS" | ||
426 | CPPFLAGS="-I$with_jansson/include $CPPFLAGS" | ||
427 | AC_CHECK_HEADERS(jansson.h, | ||
428 | AC_CHECK_LIB([jansson], [json_loads], | ||
429 | EXT_LIB_PATH="-L$with_jansson/lib $EXT_LIB_PATH" | ||
430 | jansson=1)) | ||
431 | ;; | ||
432 | esac | ||
433 | ], | ||
434 | [AC_MSG_RESULT([--with-jansson not specified]) | ||
435 | AC_CHECK_HEADERS(jansson.h, | ||
436 | AC_CHECK_LIB([jansson], [json_loads], | ||
437 | jansson=1))]) | ||
413 | AM_CONDITIONAL(HAVE_JANSSON, [test "$jansson" = 1]) | 438 | AM_CONDITIONAL(HAVE_JANSSON, [test "$jansson" = 1]) |
414 | if test "x$jansson" = x1 | 439 | if test "x$jansson" = x1 |
415 | then | 440 | then |
@@ -418,6 +443,7 @@ else | |||
418 | AC_DEFINE([HAVE_JANSSON],[0],[Lacking jansson library]) | 443 | AC_DEFINE([HAVE_JANSSON],[0],[Lacking jansson library]) |
419 | fi | 444 | fi |
420 | 445 | ||
446 | |||
421 | # check for libpulse(audio) library | 447 | # check for libpulse(audio) library |
422 | pulse=0 | 448 | pulse=0 |
423 | AC_CHECK_LIB(pulse,pa_stream_peek, | 449 | AC_CHECK_LIB(pulse,pa_stream_peek, |