X-Git-Url: http://git.wpitchoune.net/gitweb/?a=blobdiff_plain;f=configure.ac;h=6ce3fbda823a321cc796e9b5c589c5beb84ad471;hb=850c80cb3c81b5bd24245ebf98165a98e47baa71;hp=5e95bf259fea6e34ceea19c250a340e14792f30c;hpb=fb33860236e4641a520ffa4e52deeef952b2853f;p=psensor.git

diff --git a/configure.ac b/configure.ac
index 5e95bf2..6ce3fbd 100644
--- a/configure.ac
+++ b/configure.ac
@@ -26,15 +26,6 @@ AM_PROG_AR
 AC_PATH_X
 AC_CHECK_HEADERS([stdbool.h])
 
-# Checks for typedefs, structures, and compiler characteristics.
-AC_TYPE_SIZE_T
-AC_TYPE_SSIZE_T
-
-# Checks for library functions.
-AC_FUNC_MALLOC
-AC_FUNC_REALLOC
-AC_CHECK_FUNCS([gettimeofday memmove socket strdup strtol])
-
 AM_GNU_GETTEXT_VERSION([0.16])
 AM_GNU_GETTEXT([external])
 
@@ -68,7 +59,7 @@ AM_CONDITIONAL(XEXT, test -n "$XEXT_LIBS")
 AC_SUBST(XEXT_CFLAGS)
 AC_SUBST(XEXT_LIBS)
 
-# Checks GTK+ 3.0
+# Check GTK+ 3.0
 PKG_CHECK_MODULES(GTK,
 		  [gtk+-3.0 >= 3.4],,
 		  [AC_MSG_WARN("gtk missing psensor will not be built")])
@@ -83,8 +74,7 @@ GTK_CFLAGS+=" -DGSEAL_ENABLE "
 AC_SUBST(GTK_CFLAGS)
 AC_SUBST(GTK_LIBS)
 
-# udisks2
-
+# Check udisks2
 PKG_CHECK_MODULES(LIBUDISKS2,
 		  udisks2,
 		  [AC_DEFINE([HAVE_LIBUDISKS2],[1],[Use libudisks])],
@@ -93,7 +83,7 @@ AM_CONDITIONAL(LIBUDISKS2, test -n "$LIBUDISKS2_LIBS")
 AC_SUBST(LIBUDISKS2_CFLAGS)
 AC_SUBST(LIBUDISKS2_LIBS)
 
-# check libatasmart
+# Check libatasmart
 PKG_CHECK_MODULES(ATASMART, libatasmart,
 	          [AC_DEFINE([HAVE_ATASMART],[1],[Use libatasmart])],
                	  [AC_MSG_WARN("Library atasmart not present")])
@@ -114,26 +104,9 @@ AC_SUBST(LIBNOTIFY_LIBS)
 
 # Checks AppIndicator 
 APPINDICATOR_LIBS=
-
 PKG_CHECK_MODULES(APPINDICATOR, appindicator3-0.1,
      [AC_DEFINE([HAVE_APPINDICATOR],[1],[Use AppIndicator3-0.1])],
      [AC_MSG_WARN(AppIndicator 3-0.1 not present")])
-
-if test "$APPINDICATOR_LIBS" == ""; then
-   PKG_CHECK_MODULES(APPINDICATOR, 
-     appindicator-0.1 <= 0.2.9 , 
-     [AC_DEFINE([HAVE_APPINDICATOR],[1],[Use AppIndicator 0.2.9])
-      AC_DEFINE([HAVE_APPINDICATOR_029],[1],[Use AppIndicator 0.2.9])
-     ],
-     [AC_MSG_WARN(AppIndicator 0.2.9 not present")])
-fi
-
-if test "$APPINDICATOR_LIBS" == ""; then
-   PKG_CHECK_MODULES(APPINDICATOR, 
-     appindicator-0.1 > 0.2.9, 
-     [AC_DEFINE([HAVE_APPINDICATOR],[1],[Use AppIndicator > 0.2.9])], 
-     [AC_MSG_WARN("AppIndicator > 0.2.9 not present")])
-fi
 AM_CONDITIONAL(APPINDICATOR, test -n "$APPINDICATOR_LIBS")
 AC_SUBST(APPINDICATOR_CFLAGS)
 AC_SUBST(APPINDICATOR_LIBS)
@@ -205,7 +178,7 @@ AC_SUBST(UNITY_CFLAGS)
 AC_SUBST(UNITY_LIBS)
 AM_CONDITIONAL(UNITY, test -n "$UNITY_LIBS")
 
-# libatiadl
+# Check libatiadl
 AC_ARG_WITH(libatiadl,
 [  --with-libatiadl[=DIR]   use libatiadlxx in DIR],[
 		   ATIADL_DIR=${withval}
@@ -228,7 +201,7 @@ AC_SUBST(LIBATIADL_LIBS)
 
 ############### psensor-server
 
-# libmicrohttpd, mandatory for psensor-server
+# Check libmicrohttpd, mandatory for psensor-server
 LIBMICROHTTPD_LIBS=
 PKG_CHECK_MODULES(LIBMICROHTTPD, 
   libmicrohttpd, 
@@ -238,8 +211,7 @@ AM_CONDITIONAL(LIBMICROHTTPD, test -n "$LIBMICROHTTPD_LIBS")
 AC_SUBST(LIBMICROHTTPD_CFLAGS)
 AC_SUBST(LIBMICROHTTPD_LIBS)
 
-# GTop, optional
-
+# Check gtop2, optional
 AC_ARG_WITH(gtop,
 [  --with-gtop[=yes|no]   use gtop],[
 	with_gtop=$withval],[