[Gnucash-changes] r12147 - gnucash/trunk - Comment out the recently introduced second set of checks for gconf.

David Hampton hampton at cvs.gnucash.org
Wed Dec 7 01:39:34 EST 2005


Author: hampton
Date: 2005-12-07 01:39:33 -0500 (Wed, 07 Dec 2005)
New Revision: 12147
Trac: http://svn.gnucash.org/trac/changeset/12147

Modified:
   gnucash/trunk/ChangeLog
   gnucash/trunk/configure.in
Log:
Comment out the recently introduced second set of checks for gconf.
They cause problems with schema installation.


Modified: gnucash/trunk/ChangeLog
===================================================================
--- gnucash/trunk/ChangeLog	2005-12-07 04:58:23 UTC (rev 12146)
+++ gnucash/trunk/ChangeLog	2005-12-07 06:39:33 UTC (rev 12147)
@@ -1,3 +1,8 @@
+2005-12-07  David Hampton  <hampton at employees.org>
+
+	* configure.in: Comment out the recently introduced second set of
+	checks for gconf.  They cause problems with schema installation.
+
 2005-12-06  Joshua Sled  <jsled at asynchronous.org>
 
 	* gnc-main-window.c (gnc_menu_actions): Remove Misc menu.

Modified: gnucash/trunk/configure.in
===================================================================
--- gnucash/trunk/configure.in	2005-12-07 04:58:23 UTC (rev 12146)
+++ gnucash/trunk/configure.in	2005-12-07 06:39:33 UTC (rev 12147)
@@ -807,16 +807,16 @@
 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 @@
 # 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



More information about the gnucash-changes mailing list