X-Git-Url: http://git.wpitchoune.net/gitweb/?a=blobdiff_plain;f=configure.ac;h=4d48d97a5c31723590fe57d23c888cac4f893387;hb=50f520fcfc9e1b4f615983432973a7171e5cc600;hp=b9292c76f91f778103ded83e5ae3b320ecfa0871;hpb=8433816fae0e04baf1cb3f53e87ad7ed52210915;p=psensor.git

diff --git a/configure.ac b/configure.ac
index b9292c7..4d48d97 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,7 +1,7 @@
 #                                               -*- Autoconf -*-
 # Process this file with autoconf to produce a configure script.
 
-AC_PREREQ([2.64])
+AC_PREREQ([2.69])
 AC_INIT([psensor], [0.8.0.x],[jeanfi@gmail.com],[psensor],[http://wpitchoune.net/psensor])
 
 AM_INIT_AUTOMAKE([-Wall -Werror gnu])
@@ -9,12 +9,16 @@ 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
 
 # Checks lib build
 AC_PROG_RANLIB
+AM_PROG_AR
 
 # Checks for header files.
 AC_PATH_X
@@ -53,16 +57,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 +83,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)
@@ -145,7 +152,7 @@ PKG_CHECK_MODULES(JSON,
 		  [AC_DEFINE([HAVE_JSON],[1],[Use JSON])], 
 		  [AC_MSG_WARN("json-c missing")])
 
-if test "JSON_LIBS" == ""; then
+if test "$JSON_LIBS" == ""; then
 PKG_CHECK_MODULES(JSON, 
 		  json, 
 		  [AC_DEFINE([HAVE_JSON],[1],[Use JSON])