diff options
| author | Florian Dold <florian.dold@gmail.com> | 2015-12-19 16:09:54 +0000 |
|---|---|---|
| committer | Florian Dold <florian.dold@gmail.com> | 2015-12-19 16:09:54 +0000 |
| commit | 3b0d29c322aaa0e394d4e63219b9b97a29e41e30 (patch) | |
| tree | 3a527057b89efde58abd44e435b75484ee88a7e7 /configure.ac | |
| parent | c159ab01bd16e9f3ad1776fa6fb26398cb7986d9 (diff) | |
Make HAVE_REST depend on both mhd and jansson.
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/configure.ac b/configure.ac index f2d467eb70..9a3441fa2d 100644 --- a/configure.ac +++ b/configure.ac @@ -387,12 +387,12 @@ fi # check for jansson library jansson=0 AC_CHECK_HEADER([jansson.h],jansson=1) -AM_CONDITIONAL(HAVE_REST, [test "$jansson" = 1]) -if test "$jansson" = 1 +AM_CONDITIONAL(HAVE_JANSSON, [test "$jansson" = 1]) +if test "x$jansson" = x1 then - AC_DEFINE([HAVE_REST],[1],[Have jansson library]) + AC_DEFINE([HAVE_JANSSON],[1],[Have jansson library]) else - AC_DEFINE([HAVE_REST],[0],[Lacking jansson library]) + AC_DEFINE([HAVE_JANSSON],[0],[Lacking jansson library]) fi # check for libpulse(audio) library @@ -966,6 +966,7 @@ AC_ARG_WITH(microhttpd, AM_CONDITIONAL(HAVE_MHD, test x$lmhd = x1) AC_DEFINE_UNQUOTED([HAVE_MHD], $lmhd, [We have libmicrohttpd]) +AM_CONDITIONAL(HAVE_REST, [test x$lmhd = x1 -a x$jansson = x1]) # restore LIBS LIBS=$SAVE_LIBS |