X-Git-Url: http://git.wpitchoune.net/gitweb/?a=blobdiff_plain;f=configure.ac;h=abf0c5cd63af3722c7f35296c7708caaafb49d75;hb=781b933c5e5b678f9be3efb25291dee8a8f43f3e;hp=ccce11fb6b2a6762af2e58c5dbed91043afe8746;hpb=2ce90f919ef907baabd3b9adfb228365af30be0e;p=psensor.git

diff --git a/configure.ac b/configure.ac
index ccce11f..abf0c5c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2,7 +2,7 @@
 # Process this file with autoconf to produce a configure script.
 
 AC_PREREQ([2.64])
-AC_INIT([psensor], [0.6.2.13],[jeanfi@gmail.com],[psensor],[http://wpitchoune.net/psensor])
+AC_INIT([psensor], [0.8.0.x],[jeanfi@gmail.com],[psensor],[http://wpitchoune.net/psensor])
 
 AM_INIT_AUTOMAKE([-Wall -Werror gnu])
 
@@ -18,7 +18,7 @@ AC_PROG_RANLIB
 
 # Checks for header files.
 AC_PATH_X
-AC_CHECK_HEADERS([arpa/inet.h netinet/in.h stdint.h stdlib.h string.h sys/socket.h sys/time.h unistd.h getopt.h])
+AC_CHECK_HEADERS([stdbool.h])
 
 # Checks for typedefs, structures, and compiler characteristics.
 AC_TYPE_SIZE_T
@@ -32,8 +32,22 @@ AC_CHECK_FUNCS([gettimeofday memmove socket strdup strtol])
 AM_GNU_GETTEXT_VERSION([0.16])
 AM_GNU_GETTEXT([external])
 
+# Gconf
+AC_PATH_PROG(GCONFTOOL, gconftool-2, no)
+
+if test x"$GCONFTOOL" = xno; then
+  AC_MSG_ERROR([gconftool-2 executable not found in your path - should be installed with GConf])
+fi
+
+AM_GCONF_SOURCE_2
+
 ############### common 
 
+# Checks pthread
+AC_CHECK_LIB(pthread, pthread_create)
+PTHREAD_LIBS=-pthread
+AC_SUBST(PTHREAD_LIBS)
+
 # Checks sensors, required by psensor and psensor-server
 AC_CHECK_LIB(sensors, sensors_init)
 AC_CHECK_HEADERS([sensors/sensors.h sensors/errors.h])
@@ -52,23 +66,18 @@ PKG_CHECK_MODULES(XEXT, xext)
 AC_SUBST(XEXT_CFLAGS)
 AC_SUBST(XEXT_LIBS)
 
-# Checks GTK
-GTK_LIBS=
-PKG_CHECK_MODULES(GTK,
-		  gtk+-3.0,
-		  [AC_DEFINE([HAVE_GTK3],[1],[Use GTK3])],
-		  [AC_MSG_WARN("GTK+ 3 not present")])
-AM_CONDITIONAL(GTK, test -n "$GTK_LIBS")
+# Checks GTK+ 3.0
+PKG_CHECK_MODULES(GTK, gtk+-3.0)		
+# ensure that only allowed headers are included
+GTK_CFLAGS+=" -DGTK_DISABLE_SINGLE_INCLUDES "
+# ensure that no gtk deprecated symbols are used
+GTK_CFLAGS+=" -DGDK_DISABLE_DEPRECATED "
+GTK_CFLAGS+=" -DGTK_DISABLE_DEPRECATED "
+# ensure use of accessors
+GTK_CFLAGS+=" -DGSEAL_ENABLE "
 AC_SUBST(GTK_CFLAGS)
 AC_SUBST(GTK_LIBS)
 
-if test "$GTK_LIBS" == ""; then
-   PKG_CHECK_MODULES(GTK, gtk+-2.0 )
-   AM_CONDITIONAL(GTK, test -n "$GTK_LIBS")
-   AC_SUBST(GTK_CFLAGS)
-   AC_SUBST(GTK_LIBS)
-fi
-
 # Check GCONF
 PKG_CHECK_MODULES(GCONF, gconf-2.0)
 AC_SUBST(GCONF_CFLAGS)
@@ -76,6 +85,15 @@ AC_SUBST(GCONF_LIBS)
 
 ### Optional
 
+# check libatasmart
+PKG_CHECK_MODULES(ATASMART, libatasmart,
+	          [AC_DEFINE([HAVE_ATASMART],[1],[Use libatasmart])],
+               	  [AC_MSG_WARN("Library atasmart not present")])
+
+AM_CONDITIONAL(ATASMART, test -n "$ATASMART_LIBS")
+AC_SUBST(ATASMART_CFLAGS)
+AC_SUBST(ATASMART_LIBS)
+
 # Check libnotify
 LIBNOTIFY_LIBS=
 PKG_CHECK_MODULES(LIBNOTIFY, 
@@ -224,12 +242,10 @@ AC_SUBST(GTOP_LIBS)
 
 AC_CONFIG_FILES([
  Makefile
+ doc/Makefile
  src/Makefile
  src/glade/Makefile
- src/plib/Makefile
  src/lib/Makefile
- src/unity/Makefile
- src/libpsensor_json/Makefile
  src/server/Makefile
  icons/hicolor/scalable/Makefile
  icons/hicolor/14x14/Makefile
@@ -249,4 +265,7 @@ AC_CONFIG_FILES([
 
 AC_CHECK_PROGS([HELP2MAN], [help2man])
 
+AC_CHECK_PROG(HAVE_CPPCHECK, cppcheck, yes)
+AM_CONDITIONAL(CPPCHECK, test -n "$HAVE_CPPCHECK")
+
 AC_OUTPUT