projects
/
psensor.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
gconf optionnal
[psensor.git]
/
configure.ac
diff --git
a/configure.ac
b/configure.ac
index
8d1dba2
..
213ff7c
100644
(file)
--- a/
configure.ac
+++ b/
configure.ac
@@
-2,11
+2,11
@@
# 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])
-AC_CONFIG_SRCDIR([src/
compat.h
])
+AC_CONFIG_SRCDIR([src/
ui.c
])
AC_CONFIG_HEADERS([config.h])
# Checks for programs.
AC_CONFIG_HEADERS([config.h])
# Checks for programs.
@@
-34,11
+34,6
@@
AM_GNU_GETTEXT([external])
# Gconf
AC_PATH_PROG(GCONFTOOL, gconftool-2, no)
# 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
############### common
AM_GCONF_SOURCE_2
############### common
@@
-79,7
+74,10
@@
AC_SUBST(GTK_CFLAGS)
AC_SUBST(GTK_LIBS)
# Check GCONF
AC_SUBST(GTK_LIBS)
# Check GCONF
-PKG_CHECK_MODULES(GCONF, gconf-2.0)
+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)
AC_SUBST(GCONF_CFLAGS)
AC_SUBST(GCONF_LIBS)
@@
-242,6
+240,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