aboutsummaryrefslogtreecommitdiff
path: root/configure.ac
diff options
context:
space:
mode:
authorFlorian Dold <florian.dold@gmail.com>2015-12-19 16:09:54 +0000
committerFlorian Dold <florian.dold@gmail.com>2015-12-19 16:09:54 +0000
commit3b0d29c322aaa0e394d4e63219b9b97a29e41e30 (patch)
tree3a527057b89efde58abd44e435b75484ee88a7e7 /configure.ac
parentc159ab01bd16e9f3ad1776fa6fb26398cb7986d9 (diff)
downloadgnunet-3b0d29c322aaa0e394d4e63219b9b97a29e41e30.tar.gz
gnunet-3b0d29c322aaa0e394d4e63219b9b97a29e41e30.zip
Make HAVE_REST depend on both mhd and jansson.
Diffstat (limited to 'configure.ac')
-rw-r--r--configure.ac9
1 files changed, 5 insertions, 4 deletions
diff --git a/configure.ac b/configure.ac
index f2d467eb7..9a3441fa2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -387,12 +387,12 @@ fi
387# check for jansson library 387# check for jansson library
388jansson=0 388jansson=0
389AC_CHECK_HEADER([jansson.h],jansson=1) 389AC_CHECK_HEADER([jansson.h],jansson=1)
390AM_CONDITIONAL(HAVE_REST, [test "$jansson" = 1]) 390AM_CONDITIONAL(HAVE_JANSSON, [test "$jansson" = 1])
391if test "$jansson" = 1 391if test "x$jansson" = x1
392then 392then
393 AC_DEFINE([HAVE_REST],[1],[Have jansson library]) 393 AC_DEFINE([HAVE_JANSSON],[1],[Have jansson library])
394else 394else
395 AC_DEFINE([HAVE_REST],[0],[Lacking jansson library]) 395 AC_DEFINE([HAVE_JANSSON],[0],[Lacking jansson library])
396fi 396fi
397 397
398# check for libpulse(audio) library 398# check for libpulse(audio) library
@@ -966,6 +966,7 @@ AC_ARG_WITH(microhttpd,
966AM_CONDITIONAL(HAVE_MHD, test x$lmhd = x1) 966AM_CONDITIONAL(HAVE_MHD, test x$lmhd = x1)
967AC_DEFINE_UNQUOTED([HAVE_MHD], $lmhd, [We have libmicrohttpd]) 967AC_DEFINE_UNQUOTED([HAVE_MHD], $lmhd, [We have libmicrohttpd])
968 968
969AM_CONDITIONAL(HAVE_REST, [test x$lmhd = x1 -a x$jansson = x1])
969 970
970# restore LIBS 971# restore LIBS
971LIBS=$SAVE_LIBS 972LIBS=$SAVE_LIBS