X-Git-Url: http://git.wpitchoune.net/gitweb/?a=blobdiff_plain;f=configure.ac;h=994ac011cb5b0712e3a270f1afcde51f2c718db3;hb=427d5d13aea3d3010e928274533907aa99a94df7;hp=abf0c5cd63af3722c7f35296c7708caaafb49d75;hpb=82d492247c5121b5aa2da5ecf8127ab474fac095;p=psensor.git diff --git a/configure.ac b/configure.ac index abf0c5c..994ac01 100644 --- a/configure.ac +++ b/configure.ac @@ -6,7 +6,7 @@ AC_INIT([psensor], [0.8.0.x],[jeanfi@gmail.com],[psensor],[http://wpitchoune.net 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. @@ -34,11 +34,6 @@ 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 ############### common @@ -79,7 +74,10 @@ AC_SUBST(GTK_CFLAGS) AC_SUBST(GTK_LIBS) # Check GCONF -PKG_CHECK_MODULES(GCONF, gconf-2.0) +PKG_CHECK_MODULES(GCONF, gconf-2.0, + [AC_DEFINE([HAVE_GCON2],[1],[Use gconf2])], + [AC_MSG_WARN("gconf2 not present")]) +AM_CONDITIONAL(GCONF, test -n "$GCONF_LIBS") AC_SUBST(GCONF_CFLAGS) AC_SUBST(GCONF_LIBS)