# -*- Autoconf -*-
# Process this file with autoconf to produce a configure script.
-AC_PREREQ([2.64])
-AC_INIT([psensor], [0.7.0.x],[jeanfi@gmail.com],[psensor],[http://wpitchoune.net/psensor])
+AC_PREREQ([2.69])
+AC_INIT([psensor], [1.2.1],[jeanfi@gmail.com],[psensor],[http://wpitchoune.net/psensor])
-AM_INIT_AUTOMAKE([-Wall -Werror gnu])
+AM_INIT_AUTOMAKE([-Wall gnu])
-AC_CONFIG_SRCDIR([src/compat.h])
+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
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])
-# 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
+# Gsettings
+GLIB_GSETTINGS
############### common
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])
-SENSORS_LIBS=-lsensors
+AC_CHECK_LIB(sensors, sensors_init,
+ [SENSORS_LIBS=-lsensors
+ AC_DEFINE([HAVE_LIBSENSORS],[1],[Use libsensors])])
+AC_CHECK_HEADERS([sensors/sensors.h sensors/error.h])
+AM_CONDITIONAL(SENSORS, test -n "$SENSORS_LIBS")
AC_SUBST(SENSORS_LIBS)
############### psensor
### 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)
+# 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 "
-# ensure that no gtk deprecated symbols are used
+# ensure that no gtk/dk deprecated symbols are used
GTK_CFLAGS+=" -DGDK_DISABLE_DEPRECATED "
-GTK_CFLAGS+=" -DGTK_DISABLE_DEPRECATED "
+# do not enable flag because GtkStatusIcon is deprecated
+#GTK_CFLAGS+=" -DGTK_DISABLE_DEPRECATED "
# ensure use of accessors
GTK_CFLAGS+=" -DGSEAL_ENABLE "
AC_SUBST(GTK_CFLAGS)
AC_SUBST(GTK_LIBS)
-# Check GCONF
-PKG_CHECK_MODULES(GCONF, gconf-2.0)
-AC_SUBST(GCONF_CFLAGS)
-AC_SUBST(GCONF_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")])
# 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)
# 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 >= 0.11.99,
+ [AC_DEFINE([HAVE_JSON],[1],[Use JSON])],
+ [AC_MSG_WARN("json-c missing")])
+
+if test "$JSON_LIBS" == ""; then
+PKG_CHECK_MODULES(JSON,
+ json >= 0.11.99,
+ [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)
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}
############### psensor-server
-# libmicrohttpd, mandatory for psensor-server
+# Check libmicrohttpd, mandatory for psensor-server
LIBMICROHTTPD_LIBS=
PKG_CHECK_MODULES(LIBMICROHTTPD,
libmicrohttpd,
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],[
])
AC_CHECK_PROGS([HELP2MAN], [help2man])
+AM_CONDITIONAL(HELP2MAN, test -n "$HELP2MAN")
+
+AC_CHECK_PROG([ASCIIDOCTOR], [asciidoctor], yes)
+AM_CONDITIONAL(ASCIIDOCTOR, test -n "$ASCIIDOCTOR")
AC_CHECK_PROG(HAVE_CPPCHECK, cppcheck, yes)
AM_CONDITIONAL(CPPCHECK, test -n "$HAVE_CPPCHECK")