From b54705ae6eee002b3ccfbb1d81a55fc1c4cf40dd Mon Sep 17 00:00:00 2001 From: Jean-Philippe Orsini Date: Sun, 19 May 2013 08:19:02 +0000 Subject: [PATCH] optionnal gconf2 --- NEWS | 2 ++ configure | 5 ----- configure.ac | 5 ----- po/Makefile.in | 6 +++--- 4 files changed, 5 insertions(+), 13 deletions(-) diff --git a/NEWS b/NEWS index 5a56c91..ac825cb 100644 --- a/NEWS +++ b/NEWS @@ -1,3 +1,5 @@ +* v0.8.0.2 + * v0.8.0.1 ** added AMD GPU usage sensor (Contribution from MestreLion). diff --git a/configure b/configure index 06fbd33..b7a0e0c 100755 --- a/configure +++ b/configure @@ -7011,11 +7011,6 @@ fi -if test x"$GCONFTOOL" = xno; then - as_fn_error $? "gconftool-2 executable not found in your path - should be installed with GConf" "$LINENO" 5 -fi - - if test "x$GCONF_SCHEMA_INSTALL_SOURCE" = "x"; then GCONF_SCHEMA_CONFIG_SOURCE=`gconftool-2 --get-default-source` else diff --git a/configure.ac b/configure.ac index 22f6a8c..d0fef5f 100644 --- a/configure.ac +++ b/configure.ac @@ -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 diff --git a/po/Makefile.in b/po/Makefile.in index 3ac1459..a45906f 100644 --- a/po/Makefile.in +++ b/po/Makefile.in @@ -34,12 +34,12 @@ INSTALL_DATA = ${INSTALL} -m 644 # We use $(mkdir_p). # In automake <= 1.9.x, $(mkdir_p) is defined either as "mkdir -p --" or as # "$(mkinstalldirs)" or as "$(install_sh) -d". For these automake versions, -# ${SHELL} /home/jporsini/work/wpitchoune/svnpub/psensor/trunk/install-sh does not start with $(SHELL), so we add it. +# ${SHELL} /home/jporsini/work.local/wpitchoune/svnpub/psensor/trunk/install-sh does not start with $(SHELL), so we add it. # In automake >= 1.10, /bin/mkdir -p is derived from ${MKDIR_P}, which is defined # either as "/path/to/mkdir -p" or ".../install-sh -c -d". For these automake # versions, $(mkinstalldirs) and $(install_sh) are unused. -mkinstalldirs = $(SHELL) ${SHELL} /home/jporsini/work/wpitchoune/svnpub/psensor/trunk/install-sh -d -install_sh = $(SHELL) ${SHELL} /home/jporsini/work/wpitchoune/svnpub/psensor/trunk/install-sh +mkinstalldirs = $(SHELL) ${SHELL} /home/jporsini/work.local/wpitchoune/svnpub/psensor/trunk/install-sh -d +install_sh = $(SHELL) ${SHELL} /home/jporsini/work.local/wpitchoune/svnpub/psensor/trunk/install-sh MKDIR_P = /bin/mkdir -p mkdir_p = /bin/mkdir -p -- 2.7.4