mirror of
https://github.com/Gnucash/gnucash.git
synced 2025-02-25 18:55:30 -06:00
Find absolute path of gconftool-2 during configure. Make gconftool rules to
fail if gconftool-2 could not be found. bug#349851. BP git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@14607 57a11ea4-9604-0410-9ed3-97b8803252fd
This commit is contained in:
parent
af935b5178
commit
7ca685e5a9
@ -1,5 +1,9 @@
|
||||
2006-08-08 Christian Stimming <stimming@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.
|
||||
|
||||
|
@ -469,6 +469,9 @@ AM_CONDITIONAL(GNC_HAVE_GUILE_WWW, test "${gnc_have_guile_www}" = yes)
|
||||
### 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)
|
||||
|
||||
|
@ -12,10 +12,10 @@ CLEANFILES = $(schema_DATA)
|
||||
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
|
||||
|
@ -12,10 +12,10 @@ CLEANFILES = $(schema_DATA)
|
||||
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
|
||||
|
@ -22,10 +22,10 @@ CLEANFILES = $(schema_DATA)
|
||||
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
|
||||
|
@ -12,10 +12,10 @@ CLEANFILES = $(schema_DATA)
|
||||
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
|
||||
|
@ -12,10 +12,10 @@ CLEANFILES = $(schema_DATA)
|
||||
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
|
||||
|
Loading…
Reference in New Issue
Block a user