- implicitly enable rest functions in experimental if jansson.h present

2 files changed, 15 insertions, 11 deletions

diff --git a/configure.ac b/configure.ac
index baf7a5517..f1a30ead2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -382,6 +382,16 @@ else
   AC_DEFINE([HAVE_LIBBLUETOOTH],[0],[Lacking bluetooth library])
 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
+then
+  AC_DEFINE([HAVE_REST],[1],[Have jansson library])
+else
+  AC_DEFINE([HAVE_REST],[0],[Lacking jansson library])
+fi
 
 # check for libpulse(audio) library
 pulse=0
@@ -1288,15 +1298,6 @@ AC_ARG_ENABLE([wachs],
 AC_MSG_RESULT($enable_wachs)
 AM_CONDITIONAL([HAVE_WACHS], [test "x$enable_wachs" = "xyes"])
 
-# REST API
-AC_MSG_CHECKING(whether to compile REST API)
-AC_ARG_ENABLE([rest],
-   [AS_HELP_STRING([--enable-rest], [enable REST])],
-   [enable_rest=${enableval}],
-   [enable_rest=no])
-AC_MSG_RESULT($enable_rest)
-AM_CONDITIONAL([HAVE_REST], [test "x$enable_rest" = "xyes"])
-
 # should malicious code be compiled (should only be used for testing)?
 AC_MSG_CHECKING(whether to compile malicious code)
 AC_ARG_ENABLE([malicious],
diff --git a/src/Makefile.am b/src/Makefile.am
index 5785242ba..76997918f 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -21,13 +21,16 @@ if HAVE_EXPERIMENTAL
   psyc \
   rps \
   social \
-        identity-token \
-  $(CONSENSUS) \
+        $(CONSENSUS) \
   $(SECRETSHARING) \
   $(SENSOR) \
   $(SENSORDASHBOARD)
 endif
 
+if HAVE_REST
+        EXP_DIR += identity-token
+endif
+
 if BUILD_PULSE_HELPERS
 CONVERSATION_DIR = conversation
 else