projects
/
psensor.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
removed useless empty line
[psensor.git]
/
configure.ac
diff --git
a/configure.ac
b/configure.ac
index
8088332
..
abf0c5c
100644
(file)
--- a/
configure.ac
+++ b/
configure.ac
@@
-2,7
+2,7
@@
# Process this file with autoconf to produce a configure script.
AC_PREREQ([2.64])
# 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_INIT([psensor], [0.
8
.0.x],[jeanfi@gmail.com],[psensor],[http://wpitchoune.net/psensor])
AM_INIT_AUTOMAKE([-Wall -Werror gnu])
AM_INIT_AUTOMAKE([-Wall -Werror gnu])
@@
-19,7
+19,6
@@
AC_PROG_RANLIB
# Checks for header files.
AC_PATH_X
AC_CHECK_HEADERS([stdbool.h])
# Checks for header files.
AC_PATH_X
AC_CHECK_HEADERS([stdbool.h])
-AC_CHECK_HEADERS(pthread.h,, [AC_MSG_ERROR([pthread.h required])])
# Checks for typedefs, structures, and compiler characteristics.
AC_TYPE_SIZE_T
# Checks for typedefs, structures, and compiler characteristics.
AC_TYPE_SIZE_T
@@
-45,7
+44,9
@@
AM_GCONF_SOURCE_2
############### common
# Checks pthread
############### common
# Checks pthread
-AC_CHECK_LIB(pthread, pthread_create, [LIBS="$LIBS -lpthread"])
+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)
# Checks sensors, required by psensor and psensor-server
AC_CHECK_LIB(sensors, sensors_init)
@@
-241,6
+242,7
@@
AC_SUBST(GTOP_LIBS)
AC_CONFIG_FILES([
Makefile
AC_CONFIG_FILES([
Makefile
+ doc/Makefile
src/Makefile
src/glade/Makefile
src/lib/Makefile
src/Makefile
src/glade/Makefile
src/lib/Makefile
@@
-263,4
+265,7
@@
AC_CONFIG_FILES([
AC_CHECK_PROGS([HELP2MAN], [help2man])
AC_CHECK_PROGS([HELP2MAN], [help2man])
+AC_CHECK_PROG(HAVE_CPPCHECK, cppcheck, yes)
+AM_CONDITIONAL(CPPCHECK, test -n "$HAVE_CPPCHECK")
+
AC_OUTPUT
AC_OUTPUT