AC_SUBST(GTK_LIBS)
# Check GCONF
-PKG_CHECK_MODULES(GCONF, gconf-2.0, [AC_MSG_WARN("gconf2 not present")])
+PKG_CHECK_MODULES(GCONF, gconf-2.0,
+ [AC_DEFINE([HAVE_GCONF2],[1],[Use gconf2])],
+ [AC_MSG_WARN("gconf2 not present")])
+AM_CONDITIONAL(GCONF, test -n "$GCONF_LIBS")
AC_SUBST(GCONF_CFLAGS)
AC_SUBST(GCONF_LIBS)
# Check JSON, needed for remote monitoring
JSON_LIBS=
PKG_CHECK_MODULES(JSON,
- json,
- [AC_DEFINE([HAVE_JSON],[1],[Use JSON])],
- [AC_MSG_WARN("Remote monitoring disabled, json missing")])
+ json-c,
+ [AC_DEFINE([HAVE_JSON],[1],[Use JSON])],
+ [AC_MSG_WARN("json-c missing")])
+
+if test "JSON_LIBS" == ""; then
+PKG_CHECK_MODULES(JSON,
+ json,
+ [AC_DEFINE([HAVE_JSON],[1],[Use JSON])
+ AC_DEFINE([HAVE_JSON_0],[1],[Use JSON0])],
+ [AC_MSG_WARN("json0 missing")])
+fi
+
AM_CONDITIONAL(JSON, test -n "$JSON_LIBS")
AC_SUBST(JSON_CFLAGS)
AC_SUBST(JSON_LIBS)