X-Git-Url: http://git.wpitchoune.net/gitweb/?p=psensor-pkg-ubuntu.git;a=blobdiff_plain;f=configure.ac;fp=configure.ac;h=e13331bf89f8c0fa458283577ca5fc637a826b2d;hp=c81887fd97b82bfa1343e0cdb67a2a0cf2eaccb0;hb=5c1e07fec97e34a94331b6b47e25c98f2b2e4cce;hpb=4c50d430bea4b8462b0ae7ab70baf3f538f87718 diff --git a/configure.ac b/configure.ac index c81887f..e13331b 100644 --- a/configure.ac +++ b/configure.ac @@ -2,7 +2,7 @@ # Process this file with autoconf to produce a configure script. AC_PREREQ([2.69]) -AC_INIT([psensor], [1.1.1],[jeanfi@gmail.com],[psensor],[http://wpitchoune.net/psensor]) +AC_INIT([psensor], [1.1.2],[jeanfi@gmail.com],[psensor],[http://wpitchoune.net/psensor]) AM_INIT_AUTOMAKE([-Wall gnu]) @@ -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,8 +59,10 @@ 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,,[AC_MSG_WARN("gtk missing psensor will not be built")]) +# Check GTK+ 3.0 +PKG_CHECK_MODULES(GTK, + [gtk+-3.0 >= 3.4],, + [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 " @@ -81,9 +74,16 @@ GTK_CFLAGS+=" -DGSEAL_ENABLE " AC_SUBST(GTK_CFLAGS) AC_SUBST(GTK_LIBS) -### Optional +# Check udisks2 +PKG_CHECK_MODULES(LIBUDISKS2, + udisks2, + [AC_DEFINE([HAVE_LIBUDISKS2],[1],[Use libudisks])], + [AC_MSG_WARN("Library udisks2 not present")]) +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")]) @@ -195,7 +195,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} @@ -218,7 +218,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, @@ -228,8 +228,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],[