From: Nickolay V. Shmyrev Date: Thu, 18 Jun 2009 05:36:17 +0000 (+0400) Subject: [build] Optimize gconftool check X-Git-Tag: EVINCE_2_27_4~19 X-Git-Url: https://www.fi.muni.cz/~kas/git//home/kas/public_html/git/?a=commitdiff_plain;h=2e03795ad56b30b8ca05bb843ba728a9c65ec61f;p=evince.git [build] Optimize gconftool check Only check for gconftool if gconf is enabled --- diff --git a/configure.ac b/configure.ac index 34857c37..1b2e526b 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