X-Git-Url: http://git.wpitchoune.net/gitweb/?a=blobdiff_plain;f=configure.ac;h=4f624415a3d678d9ece21e72e04298a3d1b46072;hb=932dee9a347578a191e47b466e7669b5129eeae2;hp=213ff7cf50dee768f7c8bc77f855104633fab024;hpb=c14414799a4caf1569648fce1b61aceb95f6cafc;p=psensor.git

diff --git a/configure.ac b/configure.ac
index 213ff7c..4f62441 100644
--- a/configure.ac
+++ b/configure.ac
@@ -53,16 +53,19 @@ AC_SUBST(SENSORS_LIBS)
 
 ### Required
 
-PKG_CHECK_MODULES(X11, x11)
+PKG_CHECK_MODULES(X11, x11,,[AC_MSG_WARN("x11 missing psensor will not be built")])
+AM_CONDITIONAL(X11, test -n "$X11_LIBS")
 AC_SUBST(X11_CFLAGS)
 AC_SUBST(X11_LIBS)
 
-PKG_CHECK_MODULES(XEXT, xext)
+PKG_CHECK_MODULES(XEXT, xext,,[AC_MSG_WARN("xext missing psensor will not be built")])
+AM_CONDITIONAL(XEXT, test -n "$XEXT_LIBS")
 AC_SUBST(XEXT_CFLAGS)
 AC_SUBST(XEXT_LIBS)
 
 # Checks GTK+ 3.0
-PKG_CHECK_MODULES(GTK, gtk+-3.0)		
+PKG_CHECK_MODULES(GTK, gtk+-3.0,,[AC_MSG_WARN("gtk missing psensor will not be built")])
+AM_CONDITIONAL(GTK, test -n "$GTK_LIBS")
 # ensure that only allowed headers are included
 GTK_CFLAGS+=" -DGTK_DISABLE_SINGLE_INCLUDES "
 # ensure that no gtk deprecated symbols are used
@@ -76,7 +79,7 @@ AC_SUBST(GTK_LIBS)
 # Check GCONF
 PKG_CHECK_MODULES(GCONF, gconf-2.0,
 	          [AC_DEFINE([HAVE_GCONF2],[1],[Use gconf2])],
-	          [AC_MSG_WARN("gconf2 not present")])
+	          [AC_MSG_WARN("gconf2 missing psensor will not be built")])
 AM_CONDITIONAL(GCONF, test -n "$GCONF_LIBS")
 AC_SUBST(GCONF_CFLAGS)
 AC_SUBST(GCONF_LIBS)
@@ -141,9 +144,18 @@ AC_SUBST(CURL_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)