Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNickolay V. Shmyrev <nshmyrev@yandex.ru>2009-06-18 05:36:17 (GMT)
committer Nickolay V. Shmyrev <nshmyrev@yandex.ru>2009-06-18 05:36:17 (GMT)
commit2e03795ad56b30b8ca05bb843ba728a9c65ec61f (patch)
tree0ccbd13e3fdc5068d44488e2d2589cd3f04b0f6f
parent92f222d6ff04dbd267960e8ff38cb84072fe661c (diff)
[build] Optimize gconftool check
Only check for gconftool if gconf is enabled
-rw-r--r--configure.ac10
1 files changed, 5 insertions, 5 deletions
diff --git a/configure.ac b/configure.ac
index 34857c3..1b2e526 100644
--- a/configure.ac
+++ b/configure.ac
@@ -277,13 +277,13 @@ AM_CONDITIONAL([WITH_GCONF],[test "$with_gconf" = "yes"])
if test "$with_gconf" = "yes"; then
PKG_CHECK_MODULES([GCONF],[gconf-2.0])
AC_DEFINE([WITH_GCONF],[1],[Define if GConf support is enabled])
-fi
-AM_GCONF_SOURCE_2
+ AM_GCONF_SOURCE_2
-AC_PATH_PROG([GCONFTOOL], [gconftool-2], [false])
-if test "$with_gconf" = "yes" -a "$GCONFTOOL" = "false"; then
- AC_MSG_ERROR([gconftool-2 executable not found in your path - should be installed with GConf])
+ AC_PATH_PROG([GCONFTOOL], [gconftool-2], [false])
+ if test "$GCONFTOOL" = "false"; then
+ AC_MSG_ERROR([gconftool-2 executable not found in your path - should be installed with GConf])
+ fi
fi
dnl Debug mode