X-Git-Url: https://git.wpitchoune.net/gitweb/?p=psensor.git;a=blobdiff_plain;f=configure.ac;h=fc28ac06590430a4f1d5f48f6a332d3d52ec86b7;hp=7ec9779db72d53c206dc26d69666a00392e7af42;hb=fb3e2a0f4acd9d28e431716d2865741202285815;hpb=19e18fde31e67bcdaac02d93ddcec6d021d50add

diff --git a/configure.ac b/configure.ac
index 7ec9779..fc28ac0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,20 +1,26 @@
 #                                               -*- Autoconf -*-
 # Process this file with autoconf to produce a configure script.
 
-AC_PREREQ([2.64])
-AC_INIT([psensor], [0.8.0.x],[jeanfi@gmail.com],[psensor],[http://wpitchoune.net/psensor])
+AC_PREREQ([2.69])
+AC_INIT([psensor], [0.8.0.6],[jeanfi@gmail.com],[psensor],[http://wpitchoune.net/psensor])
 
 AM_INIT_AUTOMAKE([-Wall -Werror gnu])
 
 AC_CONFIG_SRCDIR([src/ui.c])
 AC_CONFIG_HEADERS([config.h])
 
+# m4
+AC_CONFIG_MACRO_DIR([m4])
+
 # Checks for programs.
 AC_PROG_CC
 AM_PROG_CC_C_O
 
+AC_SYS_LARGEFILE
+
 # Checks lib build
 AC_PROG_RANLIB
+AM_PROG_AR
 
 # Checks for header files.
 AC_PATH_X
@@ -53,16 +59,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
@@ -74,7 +83,10 @@ AC_SUBST(GTK_CFLAGS)
 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 missing psensor will not be built")])
+AM_CONDITIONAL(GCONF, test -n "$GCONF_LIBS")
 AC_SUBST(GCONF_CFLAGS)
 AC_SUBST(GCONF_LIBS)
 
@@ -138,9 +150,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)