projects
/
psensor.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
release 1.1.1
[psensor.git]
/
configure.ac
diff --git
a/configure.ac
b/configure.ac
index
57ffa42
..
c81887f
100644
(file)
--- a/
configure.ac
+++ b/
configure.ac
@@
-1,20
+1,26
@@
# -*- Autoconf -*-
# Process this file with autoconf to produce a configure script.
# -*- Autoconf -*-
# Process this file with autoconf to produce a configure script.
-AC_PREREQ([2.6
4
])
-AC_INIT([psensor], [
0.8.0.x
],[jeanfi@gmail.com],[psensor],[http://wpitchoune.net/psensor])
+AC_PREREQ([2.6
9
])
+AC_INIT([psensor], [
1.1.1
],[jeanfi@gmail.com],[psensor],[http://wpitchoune.net/psensor])
-AM_INIT_AUTOMAKE([-Wall
-Werror
gnu])
+AM_INIT_AUTOMAKE([-Wall gnu])
AC_CONFIG_SRCDIR([src/ui.c])
AC_CONFIG_HEADERS([config.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
# Checks for programs.
AC_PROG_CC
AM_PROG_CC_C_O
+AC_SYS_LARGEFILE
+
# Checks lib build
AC_PROG_RANLIB
# Checks lib build
AC_PROG_RANLIB
+AM_PROG_AR
# Checks for header files.
AC_PATH_X
# Checks for header files.
AC_PATH_X
@@
-32,9
+38,8
@@
AC_CHECK_FUNCS([gettimeofday memmove socket strdup strtol])
AM_GNU_GETTEXT_VERSION([0.16])
AM_GNU_GETTEXT([external])
AM_GNU_GETTEXT_VERSION([0.16])
AM_GNU_GETTEXT([external])
-# Gconf
-AC_PATH_PROG(GCONFTOOL, gconftool-2, no)
-AM_GCONF_SOURCE_2
+# Gsettings
+GLIB_GSETTINGS
############### common
############### common
@@
-45,7
+50,7
@@
AC_SUBST(PTHREAD_LIBS)
# Checks sensors, required by psensor and psensor-server
AC_CHECK_LIB(sensors, sensors_init)
# Checks sensors, required by psensor and psensor-server
AC_CHECK_LIB(sensors, sensors_init)
-AC_CHECK_HEADERS([sensors/sensors.h sensors/error
s
.h])
+AC_CHECK_HEADERS([sensors/sensors.h sensors/error.h])
SENSORS_LIBS=-lsensors
AC_SUBST(SENSORS_LIBS)
SENSORS_LIBS=-lsensors
AC_SUBST(SENSORS_LIBS)
@@
-53,16
+58,19
@@
AC_SUBST(SENSORS_LIBS)
### Required
### 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)
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
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
# ensure that only allowed headers are included
GTK_CFLAGS+=" -DGTK_DISABLE_SINGLE_INCLUDES "
# ensure that no gtk deprecated symbols are used
@@
-73,14
+81,6
@@
GTK_CFLAGS+=" -DGSEAL_ENABLE "
AC_SUBST(GTK_CFLAGS)
AC_SUBST(GTK_LIBS)
AC_SUBST(GTK_CFLAGS)
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")])
-AM_CONDITIONAL(GCONF, test -n "$GCONF_LIBS")
-AC_SUBST(GCONF_CFLAGS)
-AC_SUBST(GCONF_LIBS)
-
### Optional
# check libatasmart
### Optional
# check libatasmart
@@
-141,13
+141,13
@@
AC_SUBST(CURL_LIBS)
# Check JSON, needed for remote monitoring
JSON_LIBS=
PKG_CHECK_MODULES(JSON,
# Check JSON, needed for remote monitoring
JSON_LIBS=
PKG_CHECK_MODULES(JSON,
- json-c
,
+ 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,
[AC_DEFINE([HAVE_JSON],[1],[Use JSON])],
[AC_MSG_WARN("json-c missing")])
if test "$JSON_LIBS" == ""; then
PKG_CHECK_MODULES(JSON,
- 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")])
[AC_DEFINE([HAVE_JSON],[1],[Use JSON])
AC_DEFINE([HAVE_JSON_0],[1],[Use JSON0])],
[AC_MSG_WARN("json0 missing")])
@@
-272,6
+272,9
@@
AC_CONFIG_FILES([
AC_CHECK_PROGS([HELP2MAN], [help2man])
AC_CHECK_PROGS([HELP2MAN], [help2man])
+AC_CHECK_PROG([ASCIIDOC], [asciidoc], yes)
+AM_CONDITIONAL(ASCIIDOC, test -n "$ASCIIDOC")
+
AC_CHECK_PROG(HAVE_CPPCHECK, cppcheck, yes)
AM_CONDITIONAL(CPPCHECK, test -n "$HAVE_CPPCHECK")
AC_CHECK_PROG(HAVE_CPPCHECK, cppcheck, yes)
AM_CONDITIONAL(CPPCHECK, test -n "$HAVE_CPPCHECK")