From a89fe0309eab87f22a00be8f6c9fa44fe875f8dc Mon Sep 17 00:00:00 2001 From: David Hampton Date: Wed, 7 Dec 2005 06:39:33 +0000 Subject: [PATCH] Comment out the recently introduced second set of checks for gconf. They cause problems with schema installation. git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@12147 57a11ea4-9604-0410-9ed3-97b8803252fd --- ChangeLog | 5 +++++ configure.in | 22 +++++++++++----------- 2 files changed, 16 insertions(+), 11 deletions(-) diff --git a/ChangeLog b/ChangeLog index 7125f40056..9705ee3a61 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2005-12-07 David Hampton + + * configure.in: Comment out the recently introduced second set of + checks for gconf. They cause problems with schema installation. + 2005-12-06 Joshua Sled * gnc-main-window.c (gnc_menu_actions): Remove Misc menu. diff --git a/configure.in b/configure.in index f60de45caa..67906ec87b 100644 --- a/configure.in +++ b/configure.in @@ -807,16 +807,16 @@ else fi AM_CONDITIONAL(WITH_LIBGSF_GNOME, test $have_gnome = yes) -# GConf configuration -dnl Don't publish the GCONFTOOL variable, AM_GCONF_SOURCE_2 has ``gconftool-2'' hardwired. -GCONFTOOL= -AC_CHECK_PROG([GCONFTOOL], [gconftool-2], [gconftool-2], [no]) -if test "x$GCONFTOOL" = "xno"; then - AC_MSG_WARN([thumbnailer will not be built, unable to find gconftool-2]) -else - AM_GCONF_SOURCE_2 -fi -AM_CONDITIONAL(WITH_GCONF, test "x$GCONFTOOL" != "xno") +## # GConf configuration +## dnl Don't publish the GCONFTOOL variable, AM_GCONF_SOURCE_2 has ``gconftool-2'' hardwired. +## GCONFTOOL= +## AC_CHECK_PROG([GCONFTOOL], [gconftool-2], [gconftool-2], [no]) +## if test "x$GCONFTOOL" = "xno"; then +## AC_MSG_WARN([thumbnailer will not be built, unable to find gconftool-2]) +## else +## AM_GCONF_SOURCE_2 +## fi +## AM_CONDITIONAL(WITH_GCONF, test "x$GCONFTOOL" != "xno") dnl # LDFLAGS="-no-undefined $LDFLAGS" @@ -831,7 +831,7 @@ AM_CONDITIONAL(PLATFORM_WIN32, false) # dnl AM_CONDITIONAL(ENABLE_GTK_DOC, false) # dnl AM_CONDITIONAL(GTK_DOC_USE_LIBTOOL, false) AM_CONDITIONAL(WITH_LIBGSF_GNOME, false) -AM_CONDITIONAL(WITH_GCONF, false) +# dnl AM_CONDITIONAL(WITH_GCONF, false) AM_CONDITIONAL(WITH_PYTHON, false) fi