r14624 - gnucash/branches/2.0 - Find absolute path of gconftool-2 during configure. Make gconftool rules to

[Christian Stimming]

Author: cstim
Date: 2006-08-09 05:44:37 -0400 (Wed, 09 Aug 2006)
New Revision: 14624
Trac: http://svn.gnucash.org/trac/changeset/14624

Modified:
   gnucash/branches/2.0/ChangeLog
   gnucash/branches/2.0/configure.in
   gnucash/branches/2.0/src/business/business-gnome/schemas/Makefile.am
   gnucash/branches/2.0/src/gnome-utils/schemas/Makefile.am
   gnucash/branches/2.0/src/gnome/schemas/Makefile.am
   gnucash/branches/2.0/src/import-export/hbci/schemas/Makefile.am
   gnucash/branches/2.0/src/import-export/schemas/Makefile.am
Log:
Find absolute path of gconftool-2 during configure. Make gconftool rules to
fail if gconftool-2 could not be found. bug#349851.
Backporting r14607, audited by c.shoemaker.

Modified: gnucash/branches/2.0/ChangeLog
===================================================================
--- gnucash/branches/2.0/ChangeLog	2006-08-09 09:42:36 UTC (rev 14623)
+++ gnucash/branches/2.0/ChangeLog	2006-08-09 09:44:37 UTC (rev 14624)
@@ -1,5 +1,9 @@
 2006-08-08  Christian Stimming <stimming at tuhh.de>
 
+	* configure.in, src/gnome-utils/schemas/Makefile.am: Find absolute
+	path of gconftool-2 during configure. Make gconftool rules to fail
+	if gconftool-2 could not be found. bug#349851.
+
 	* src/gnome-utils/druid-gnc-xml-import.c: Improve wording for XML
 	data file import druid. bug#342727.
 

Modified: gnucash/branches/2.0/configure.in
===================================================================
--- gnucash/branches/2.0/configure.in	2006-08-09 09:42:36 UTC (rev 14623)
+++ gnucash/branches/2.0/configure.in	2006-08-09 09:44:37 UTC (rev 14624)
@@ -469,6 +469,9 @@
 ### look for gconf
 
 PKG_CHECK_MODULES(GCONF, gconf-2.0 >= "2.0")
+# Look up gconftool-2
+AC_PATH_PROG(GCONFTOOL, gconftool-2)
+AC_SUBST(GCONFTOOL)
 AC_SUBST(GCONF_CFLAGS)
 AC_SUBST(GCONF_LIBS)
 

Modified: gnucash/branches/2.0/src/business/business-gnome/schemas/Makefile.am
===================================================================
--- gnucash/branches/2.0/src/business/business-gnome/schemas/Makefile.am	2006-08-09 09:42:36 UTC (rev 14623)
+++ gnucash/branches/2.0/src/business/business-gnome/schemas/Makefile.am	2006-08-09 09:44:37 UTC (rev 14624)
@@ -12,10 +12,10 @@
 install-data-local:
 if GCONF_SCHEMAS_INSTALL
 	-mkdir -p $(DESTDIR)$(GCONF_SCHEMA_CONFIG_SOURCE_DIRONLY)
-	-GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) gconftool-2 --makefile-install-rule $(srcdir)/$(schema_DATA)
+	GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $(srcdir)/$(schema_DATA)
 endif
 
 uninstall-local:
 if GCONF_SCHEMAS_INSTALL
-	-GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) gconftool-2 --makefile-uninstall-rule $(srcdir)/$(schema_DATA)
+	GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-uninstall-rule $(srcdir)/$(schema_DATA)
 endif

Modified: gnucash/branches/2.0/src/gnome/schemas/Makefile.am
===================================================================
--- gnucash/branches/2.0/src/gnome/schemas/Makefile.am	2006-08-09 09:42:36 UTC (rev 14623)
+++ gnucash/branches/2.0/src/gnome/schemas/Makefile.am	2006-08-09 09:44:37 UTC (rev 14624)
@@ -22,10 +22,10 @@
 install-data-local:
 if GCONF_SCHEMAS_INSTALL
 	-mkdir -p $(DESTDIR)$(GCONF_SCHEMA_CONFIG_SOURCE_DIRONLY)
-	-GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) gconftool-2 --makefile-install-rule $(srcdir)/$(schema_DATA)
+	GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $(srcdir)/$(schema_DATA)
 endif
 
 uninstall-local:
 if GCONF_SCHEMAS_INSTALL
-	-GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) gconftool-2 --makefile-uninstall-rule $(srcdir)/$(schema_DATA)
+	GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-uninstall-rule $(srcdir)/$(schema_DATA)
 endif

Modified: gnucash/branches/2.0/src/gnome-utils/schemas/Makefile.am
===================================================================
--- gnucash/branches/2.0/src/gnome-utils/schemas/Makefile.am	2006-08-09 09:42:36 UTC (rev 14623)
+++ gnucash/branches/2.0/src/gnome-utils/schemas/Makefile.am	2006-08-09 09:44:37 UTC (rev 14624)
@@ -12,10 +12,10 @@
 install-data-local:
 if GCONF_SCHEMAS_INSTALL
 	-mkdir -p $(DESTDIR)$(GCONF_SCHEMA_CONFIG_SOURCE_DIRONLY)
-	-GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) gconftool-2 --makefile-install-rule $(srcdir)/$(schema_DATA)
+	GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $(srcdir)/$(schema_DATA)
 endif
 
 uninstall-local:
 if GCONF_SCHEMAS_INSTALL
-	-GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) gconftool-2 --makefile-uninstall-rule $(srcdir)/$(schema_DATA)
+	GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-uninstall-rule $(srcdir)/$(schema_DATA)
 endif

Modified: gnucash/branches/2.0/src/import-export/hbci/schemas/Makefile.am
===================================================================
--- gnucash/branches/2.0/src/import-export/hbci/schemas/Makefile.am	2006-08-09 09:42:36 UTC (rev 14623)
+++ gnucash/branches/2.0/src/import-export/hbci/schemas/Makefile.am	2006-08-09 09:44:37 UTC (rev 14624)
@@ -12,10 +12,10 @@
 install-data-local:
 if GCONF_SCHEMAS_INSTALL
 	-mkdir -p $(DESTDIR)$(GCONF_SCHEMA_CONFIG_SOURCE_DIRONLY)
-	-GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) gconftool-2 --makefile-install-rule $(srcdir)/$(schema_DATA)
+	GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $(srcdir)/$(schema_DATA)
 endif
 
 uninstall-local:
 if GCONF_SCHEMAS_INSTALL
-	-GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) gconftool-2 --makefile-uninstall-rule $(srcdir)/$(schema_DATA)
+	GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-uninstall-rule $(srcdir)/$(schema_DATA)
 endif

Modified: gnucash/branches/2.0/src/import-export/schemas/Makefile.am
===================================================================
--- gnucash/branches/2.0/src/import-export/schemas/Makefile.am	2006-08-09 09:42:36 UTC (rev 14623)
+++ gnucash/branches/2.0/src/import-export/schemas/Makefile.am	2006-08-09 09:44:37 UTC (rev 14624)
@@ -12,10 +12,10 @@
 install-data-local:
 if GCONF_SCHEMAS_INSTALL
 	-mkdir -p $(DESTDIR)$(GCONF_SCHEMA_CONFIG_SOURCE_DIRONLY)
-	-GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) gconftool-2 --makefile-install-rule $(srcdir)/$(schema_DATA)
+	GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $(srcdir)/$(schema_DATA)
 endif
 
 uninstall-local:
 if GCONF_SCHEMAS_INSTALL
-	-GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) gconftool-2 --makefile-uninstall-rule $(srcdir)/$(schema_DATA)
+	GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-uninstall-rule $(srcdir)/$(schema_DATA)
 endif