diff options
-rw-r--r-- | configure.ac | 9 |
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 |
388 | jansson=0 | 388 | jansson=0 |
389 | AC_CHECK_HEADER([jansson.h],jansson=1) | 389 | AC_CHECK_HEADER([jansson.h],jansson=1) |
390 | AM_CONDITIONAL(HAVE_REST, [test "$jansson" = 1]) | 390 | AM_CONDITIONAL(HAVE_JANSSON, [test "$jansson" = 1]) |
391 | if test "$jansson" = 1 | 391 | if test "x$jansson" = x1 |
392 | then | 392 | then |
393 | AC_DEFINE([HAVE_REST],[1],[Have jansson library]) | 393 | AC_DEFINE([HAVE_JANSSON],[1],[Have jansson library]) |
394 | else | 394 | else |
395 | AC_DEFINE([HAVE_REST],[0],[Lacking jansson library]) | 395 | AC_DEFINE([HAVE_JANSSON],[0],[Lacking jansson library]) |
396 | fi | 396 | fi |
397 | 397 | ||
398 | # check for libpulse(audio) library | 398 | # check for libpulse(audio) library |
@@ -966,6 +966,7 @@ AC_ARG_WITH(microhttpd, | |||
966 | AM_CONDITIONAL(HAVE_MHD, test x$lmhd = x1) | 966 | AM_CONDITIONAL(HAVE_MHD, test x$lmhd = x1) |
967 | AC_DEFINE_UNQUOTED([HAVE_MHD], $lmhd, [We have libmicrohttpd]) | 967 | AC_DEFINE_UNQUOTED([HAVE_MHD], $lmhd, [We have libmicrohttpd]) |
968 | 968 | ||
969 | AM_CONDITIONAL(HAVE_REST, [test x$lmhd = x1 -a x$jansson = x1]) | ||
969 | 970 | ||
970 | # restore LIBS | 971 | # restore LIBS |
971 | LIBS=$SAVE_LIBS | 972 | LIBS=$SAVE_LIBS |