[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] [gnunet] branch master updated: fix https://gnunet.org/bugs
From: |
gnunet |
Subject: |
[GNUnet-SVN] [gnunet] branch master updated: fix https://gnunet.org/bugs/view.php?id=4746 |
Date: |
Sun, 24 Jun 2018 20:25:40 +0200 |
This is an automated email from the git hooks/post-receive script.
martin-schanzenbach pushed a commit to branch master
in repository gnunet.
The following commit(s) were added to refs/heads/master by this push:
new e1daa8a67 fix https://gnunet.org/bugs/view.php?id=4746
new 86e0056a7 Merge branch 'master' of git+ssh://gnunet.org/gnunet
e1daa8a67 is described below
commit e1daa8a67bf88202a1fc9f69bff0b46ee5520f5e
Author: Schanzenbach, Martin <address@hidden>
AuthorDate: Sun Jun 24 20:25:16 2018 +0200
fix https://gnunet.org/bugs/view.php?id=4746
---
configure.ac | 28 +++++++++++++++++++++++++++-
1 file changed, 27 insertions(+), 1 deletion(-)
diff --git a/configure.ac b/configure.ac
index 204859556..99eeeba8a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -409,7 +409,32 @@ fi
# check for jansson library
jansson=0
-AC_CHECK_HEADER([jansson.h],jansson=1)
+AC_MSG_CHECKING(for libjansson)
+AC_ARG_WITH(jansson,
+ [ --with-jansson=PFX base of libjansson installation],
+ [AC_MSG_RESULT([$with_jansson])
+ case $with_jansson in
+ no)
+ ;;
+ yes)
+ AC_CHECK_HEADERS(jansson.h,
+ AC_CHECK_LIB([jansson], [json_loads],
+ jansson=1))
+ ;;
+ *)
+ LDFLAGS="-L$with_jansson/lib $LDFLAGS"
+ CPPFLAGS="-I$with_jansson/include $CPPFLAGS"
+ AC_CHECK_HEADERS(jansson.h,
+ AC_CHECK_LIB([jansson], [json_loads],
+ EXT_LIB_PATH="-L$with_jansson/lib $EXT_LIB_PATH"
+ jansson=1))
+ ;;
+ esac
+ ],
+ [AC_MSG_RESULT([--with-jansson not specified])
+ AC_CHECK_HEADERS(jansson.h,
+ AC_CHECK_LIB([jansson], [json_loads],
+ jansson=1))])
AM_CONDITIONAL(HAVE_JANSSON, [test "$jansson" = 1])
if test "x$jansson" = x1
then
@@ -418,6 +443,7 @@ else
AC_DEFINE([HAVE_JANSSON],[0],[Lacking jansson library])
fi
+
# check for libpulse(audio) library
pulse=0
AC_CHECK_LIB(pulse,pa_stream_peek,
--
To stop receiving notification emails like this one, please contact
address@hidden
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] [gnunet] branch master updated: fix https://gnunet.org/bugs/view.php?id=4746,
gnunet <=