AUDIT: r14607 - gnucash/trunk - Find absolute path of gconftool-2 during configure. Make gconftool rules to

[Christian Stimming]

Author: cstim
Date: 2006-08-08 05:39:12 -0400 (Tue, 08 Aug 2006)
New Revision: 14607
Trac: http://svn.gnucash.org/trac/changeset/14607

Modified:
   gnucash/trunk/ChangeLog
   gnucash/trunk/configure.in
   gnucash/trunk/src/business/business-gnome/schemas/Makefile.am
   gnucash/trunk/src/gnome-utils/schemas/Makefile.am
   gnucash/trunk/src/gnome/schemas/Makefile.am
   gnucash/trunk/src/import-export/hbci/schemas/Makefile.am
   gnucash/trunk/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.
BP



Modified: gnucash/trunk/ChangeLog
===================================================================
--- gnucash/trunk/ChangeLog	2006-08-08 08:57:50 UTC (rev 14606)
+++ gnucash/trunk/ChangeLog	2006-08-08 09:39:12 UTC (rev 14607)
@@ -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/trunk/configure.in
===================================================================
--- gnucash/trunk/configure.in	2006-08-08 08:57:50 UTC (rev 14606)
+++ gnucash/trunk/configure.in	2006-08-08 09:39:12 UTC (rev 14607)
@@ -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/trunk/src/business/business-gnome/schemas/Makefile.am
===================================================================
--- gnucash/trunk/src/business/business-gnome/schemas/Makefile.am	2006-08-08 08:57:50 UTC (rev 14606)
+++ gnucash/trunk/src/business/business-gnome/schemas/Makefile.am	2006-08-08 09:39:12 UTC (rev 14607)
@@ -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/trunk/src/gnome/schemas/Makefile.am
===================================================================
--- gnucash/trunk/src/gnome/schemas/Makefile.am	2006-08-08 08:57:50 UTC (rev 14606)
+++ gnucash/trunk/src/gnome/schemas/Makefile.am	2006-08-08 09:39:12 UTC (rev 14607)
@@ -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/trunk/src/gnome-utils/schemas/Makefile.am
===================================================================
--- gnucash/trunk/src/gnome-utils/schemas/Makefile.am	2006-08-08 08:57:50 UTC (rev 14606)
+++ gnucash/trunk/src/gnome-utils/schemas/Makefile.am	2006-08-08 09:39:12 UTC (rev 14607)
@@ -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/trunk/src/import-export/hbci/schemas/Makefile.am
===================================================================
--- gnucash/trunk/src/import-export/hbci/schemas/Makefile.am	2006-08-08 08:57:50 UTC (rev 14606)
+++ gnucash/trunk/src/import-export/hbci/schemas/Makefile.am	2006-08-08 09:39:12 UTC (rev 14607)
@@ -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/trunk/src/import-export/schemas/Makefile.am
===================================================================
--- gnucash/trunk/src/import-export/schemas/Makefile.am	2006-08-08 08:57:50 UTC (rev 14606)
+++ gnucash/trunk/src/import-export/schemas/Makefile.am	2006-08-08 09:39:12 UTC (rev 14607)
@@ -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