[Gnucash-changes] r11850 - gnucash/trunk - Pass the name of the
guile executable from configure to the makefiles
David Hampton
hampton at cvs.gnucash.org
Sat Nov 5 23:08:23 EST 2005
Author: hampton
Date: 2005-11-05 23:08:22 -0500 (Sat, 05 Nov 2005)
New Revision: 11850
Modified:
gnucash/trunk/ChangeLog
gnucash/trunk/configure.in
gnucash/trunk/src/app-utils/Makefile.am
gnucash/trunk/src/business/business-core/Makefile.am
gnucash/trunk/src/business/business-gnome/Makefile.am
gnucash/trunk/src/business/dialog-tax-table/Makefile.am
gnucash/trunk/src/core-utils/Makefile.am
gnucash/trunk/src/engine/Makefile.am
gnucash/trunk/src/gnc-module/Makefile.am
gnucash/trunk/src/gnc-module/test/mod-bar/Makefile.am
gnucash/trunk/src/gnc-module/test/mod-baz/Makefile.am
gnucash/trunk/src/gnc-module/test/mod-foo/Makefile.am
gnucash/trunk/src/gnome-utils/Makefile.am
gnucash/trunk/src/gnome/Makefile.am
gnucash/trunk/src/register/register-core/Makefile.am
gnucash/trunk/src/report/report-gnome/Makefile.am
Log:
Pass the name of the guile executable from configure to the makefiles
instead of hard-coding it. Requested by Peter O'Gorman to improve Mac
OS X support.
Modified: gnucash/trunk/ChangeLog
===================================================================
--- gnucash/trunk/ChangeLog 2005-11-06 03:07:21 UTC (rev 11849)
+++ gnucash/trunk/ChangeLog 2005-11-06 04:08:22 UTC (rev 11850)
@@ -1,5 +1,23 @@
2005-11-05 David Hampton <hampton at employees.org>
+ * configure.in:
+ * src/register/register-core/Makefile.am:
+ * src/core-utils/Makefile.am:
+ * src/gnc-module/test/mod-bar/Makefile.am:
+ * src/gnc-module/test/mod-baz/Makefile.am:
+ * src/gnc-module/test/mod-foo/Makefile.am:
+ * src/gnc-module/Makefile.am:
+ * src/report/report-gnome/Makefile.am:
+ * src/business/business-core/Makefile.am:
+ * src/business/business-gnome/Makefile.am:
+ * src/business/dialog-tax-table/Makefile.am:
+ * src/gnome-utils/Makefile.am:
+ * src/engine/Makefile.am:
+ * src/gnome/Makefile.am:
+ * src/app-utils/Makefile.am: Pass the name of the guile executable
+ from configure to the makefiles instead of hard-coding it.
+ Requested by Peter O'Gorman to improve Mac OS X support.
+
* src/gnome-utils/gnc-embedded-window.c:
* src/gnome-utils/gnc-embedded-window.h:
* src/gnome-utils/gnc-main-window.c:
Modified: gnucash/trunk/configure.in
===================================================================
--- gnucash/trunk/configure.in 2005-11-06 03:07:21 UTC (rev 11849)
+++ gnucash/trunk/configure.in 2005-11-06 04:08:22 UTC (rev 11850)
@@ -224,6 +224,7 @@
development packages? Gnucash requires at least version 1.6 to build.
])])
+AC_SUBST(GUILE)
AC_DEFINE_UNQUOTED(GNC_GUILE_MAJOR_VERSION, ${guile_major_version},
[Guile Major version number])
AC_DEFINE_UNQUOTED(GNC_GUILE_MINOR_VERSION, ${guile_minor_version},
Modified: gnucash/trunk/src/app-utils/Makefile.am
===================================================================
--- gnucash/trunk/src/app-utils/Makefile.am 2005-11-06 03:07:21 UTC (rev 11849)
+++ gnucash/trunk/src/app-utils/Makefile.am 2005-11-06 04:08:22 UTC (rev 11850)
@@ -140,7 +140,7 @@
gw-app-utils.scm gw-app-utils.c gw-app-utils.h: \
.scm-links gw-app-utils-spec.scm ${top_builddir}/config.status
- FLAVOR=gnome guile -c \
+ FLAVOR=gnome $(GUILE) -c \
"(set! %load-path (cons \"${G_WRAP_MODULE_DIR}\" %load-path)) \
(set! %load-path (cons \"${PWD}\" %load-path)) \
(set! %load-path (cons \"${top_builddir}/src/engine\" %load-path)) \
Modified: gnucash/trunk/src/business/business-core/Makefile.am
===================================================================
--- gnucash/trunk/src/business/business-core/Makefile.am 2005-11-06 03:07:21 UTC (rev 11849)
+++ gnucash/trunk/src/business/business-core/Makefile.am 2005-11-06 04:08:22 UTC (rev 11850)
@@ -101,7 +101,7 @@
gw-business-core.scm gw-business-core.c gw-business-core.h: \
.scm-links gw-business-core-spec.scm ${top_builddir}/config.status
- FLAVOR=gnome guile -c \
+ FLAVOR=gnome $(GUILE) -c \
"(set! %load-path (cons \"${G_WRAP_MODULE_DIR}\" %load-path)) \
(set! %load-path (cons \"${PWD}\" %load-path)) \
(set! %load-path (cons \"../../engine\" %load-path)) \
Modified: gnucash/trunk/src/business/business-gnome/Makefile.am
===================================================================
--- gnucash/trunk/src/business/business-gnome/Makefile.am 2005-11-06 03:07:21 UTC (rev 11849)
+++ gnucash/trunk/src/business/business-gnome/Makefile.am 2005-11-06 04:08:22 UTC (rev 11850)
@@ -118,7 +118,7 @@
gw-business-gnome.scm gw-business-gnome.c gw-business-gnome.h: \
.scm-links gw-business-gnome-spec.scm ${top_builddir}/config.status
- FLAVOR=gnome guile -c \
+ FLAVOR=gnome $(GUILE) -c \
"(set! %load-path (cons \"${G_WRAP_MODULE_DIR}\" %load-path)) \
(set! %load-path (cons \"${PWD}\" %load-path)) \
(set! %load-path (cons \"../business-core\" %load-path)) \
Modified: gnucash/trunk/src/business/dialog-tax-table/Makefile.am
===================================================================
--- gnucash/trunk/src/business/dialog-tax-table/Makefile.am 2005-11-06 03:07:21 UTC (rev 11849)
+++ gnucash/trunk/src/business/dialog-tax-table/Makefile.am 2005-11-06 04:08:22 UTC (rev 11850)
@@ -76,7 +76,7 @@
gw-dialog-tax-table.scm gw-dialog-tax-table.c gw-dialog-tax-table.h: \
.scm-links gw-dialog-tax-table-spec.scm ${top_builddir}/config.status
- FLAVOR=gnome guile -c \
+ FLAVOR=gnome $(GUILE) -c \
"(set! %load-path (cons \"${G_WRAP_MODULE_DIR}\" %load-path)) \
(set! %load-path (cons \"${PWD}\" %load-path)) \
(set! %load-path (cons \"../business-core\" %load-path)) \
Modified: gnucash/trunk/src/core-utils/Makefile.am
===================================================================
--- gnucash/trunk/src/core-utils/Makefile.am 2005-11-06 03:07:21 UTC (rev 11849)
+++ gnucash/trunk/src/core-utils/Makefile.am 2005-11-06 04:08:22 UTC (rev 11850)
@@ -59,7 +59,7 @@
gw-core-utils.scm gw-core-utils.h gw-core-utils.c gw-core-utils.html: \
gw-core-utils-spec.scm .scm-links ${top_builddir}/config.status
- FLAVOR=gnome guile -c \
+ FLAVOR=gnome $(GUILE) -c \
"(set! %load-path (cons \"${G_WRAP_MODULE_DIR}\" %load-path)) \
(primitive-load \"./gw-core-utils-spec.scm\") \
(gw:generate-wrapset \"gw-core-utils\")"
Modified: gnucash/trunk/src/engine/Makefile.am
===================================================================
--- gnucash/trunk/src/engine/Makefile.am 2005-11-06 03:07:21 UTC (rev 11849)
+++ gnucash/trunk/src/engine/Makefile.am 2005-11-06 04:08:22 UTC (rev 11850)
@@ -272,7 +272,7 @@
gw-engine.scm gw-engine.c gw-engine.h: \
.scm-links gw-engine-spec.scm ${top_builddir}/config.status
- FLAVOR=gnome guile -c \
+ FLAVOR=gnome $(GUILE) -c \
"(set! %load-path (cons \"${G_WRAP_MODULE_DIR}\" %load-path)) \
(set! %load-path (cons \"${PWD}\" %load-path)) \
(primitive-load \"./gw-engine-spec.scm\") \
@@ -280,7 +280,7 @@
gw-kvp.scm gw-kvp.c gw-kvp.h: \
.scm-links gw-kvp-spec.scm ${top_builddir}/config.status
- FLAVOR=gnome guile -c \
+ FLAVOR=gnome $(GUILE) -c \
"(set! %load-path (cons \"${G_WRAP_MODULE_DIR}\" %load-path)) \
(set! %load-path (cons \"${PWD}\" %load-path)) \
(primitive-load \"./gw-kvp-spec.scm\") \
Modified: gnucash/trunk/src/gnc-module/Makefile.am
===================================================================
--- gnucash/trunk/src/gnc-module/Makefile.am 2005-11-06 03:07:21 UTC (rev 11849)
+++ gnucash/trunk/src/gnc-module/Makefile.am 2005-11-06 04:08:22 UTC (rev 11850)
@@ -65,7 +65,7 @@
gw-gnc-module.scm gw-gnc-module.c gw-gnc-module.h: \
.scm-links gw-gnc-module-spec.scm ${top_builddir}/config.status
- FLAVOR=gnome guile -c \
+ FLAVOR=gnome $(GUILE) -c \
"(set! %load-path (cons \"${G_WRAP_MODULE_DIR}\" %load-path)) \
(primitive-load \"./gw-gnc-module-spec.scm\") \
(gw:generate-wrapset \"gw-gnc-module\")"
Modified: gnucash/trunk/src/gnc-module/test/mod-bar/Makefile.am
===================================================================
--- gnucash/trunk/src/gnc-module/test/mod-bar/Makefile.am 2005-11-06 03:07:21 UTC (rev 11849)
+++ gnucash/trunk/src/gnc-module/test/mod-bar/Makefile.am 2005-11-06 04:08:22 UTC (rev 11850)
@@ -24,7 +24,7 @@
gnucash/bar.scm
bar-gwrap.c bar-gwrap.h: bar-gwrap.scm ${top_builddir}/config.status
- FLAVOR=gnome guile -c \
+ FLAVOR=gnome $(GUILE) -c \
"(set! %load-path (cons \"${G_WRAP_MODULE_DIR}\" %load-path)) \
(primitive-load \"${srcdir}/bar-gwrap.scm\") \
(gw:generate-wrapset \"bar-gwrap\")"
Modified: gnucash/trunk/src/gnc-module/test/mod-baz/Makefile.am
===================================================================
--- gnucash/trunk/src/gnc-module/test/mod-baz/Makefile.am 2005-11-06 03:07:21 UTC (rev 11849)
+++ gnucash/trunk/src/gnc-module/test/mod-baz/Makefile.am 2005-11-06 04:08:22 UTC (rev 11850)
@@ -25,7 +25,7 @@
gnucash/baz.scm
baz-gwrap.c baz-gwrap.h: baz-gwrap.scm ${top_builddir}/config.status
- FLAVOR=gnome guile -c \
+ FLAVOR=gnome $(GUILE) -c \
"(set! %load-path (cons \"${G_WRAP_MODULE_DIR}\" %load-path)) \
(primitive-load \"${srcdir}/baz-gwrap.scm\") \
(gw:generate-wrapset \"baz-gwrap\")"
Modified: gnucash/trunk/src/gnc-module/test/mod-foo/Makefile.am
===================================================================
--- gnucash/trunk/src/gnc-module/test/mod-foo/Makefile.am 2005-11-06 03:07:21 UTC (rev 11849)
+++ gnucash/trunk/src/gnc-module/test/mod-foo/Makefile.am 2005-11-06 04:08:22 UTC (rev 11850)
@@ -24,7 +24,7 @@
gnucash/foo.scm
foo-gwrap.c foo-gwrap.h: foo-gwrap.scm ${top_builddir}/config.status
- FLAVOR=gnome guile -c \
+ FLAVOR=gnome $(GUILE) -c \
"(set! %load-path (cons \"${G_WRAP_MODULE_DIR}\" %load-path)) \
(primitive-load \"${srcdir}/foo-gwrap.scm\") \
(gw:generate-wrapset \"foo-gwrap\")"
Modified: gnucash/trunk/src/gnome/Makefile.am
===================================================================
--- gnucash/trunk/src/gnome/Makefile.am 2005-11-06 03:07:21 UTC (rev 11849)
+++ gnucash/trunk/src/gnome/Makefile.am 2005-11-06 04:08:22 UTC (rev 11850)
@@ -188,7 +188,7 @@
gw-gnc.scm gw-gnc.h gw-gnc.c gw-gnc.html: \
gw-gnc-spec.scm .scm-links ${top_builddir}/config.status
- FLAVOR=gnome guile -c \
+ FLAVOR=gnome $(GUILE) -c \
"(set! %load-path (cons \"${G_WRAP_MODULE_DIR}\" %load-path)) \
(set! %load-path (cons \"../engine\" %load-path)) \
(set! %load-path (cons \"../app-utils\" %load-path)) \
Modified: gnucash/trunk/src/gnome-utils/Makefile.am
===================================================================
--- gnucash/trunk/src/gnome-utils/Makefile.am 2005-11-06 03:07:21 UTC (rev 11849)
+++ gnucash/trunk/src/gnome-utils/Makefile.am 2005-11-06 04:08:22 UTC (rev 11850)
@@ -344,7 +344,7 @@
gw-gnome-utils.scm gw-gnome-utils.c gw-gnome-utils.h: \
.scm-links gw-gnome-utils-spec.scm ${top_builddir}/config.status
- FLAVOR=gnome guile -c \
+ FLAVOR=gnome $(GUILE) -c \
"(set! %load-path (cons \"${G_WRAP_MODULE_DIR}\" %load-path)) \
(set! %load-path (cons \"${PWD}\" %load-path)) \
(set! %load-path (cons \"${top_builddir}/src/engine\" %load-path)) \
Modified: gnucash/trunk/src/register/register-core/Makefile.am
===================================================================
--- gnucash/trunk/src/register/register-core/Makefile.am 2005-11-06 03:07:21 UTC (rev 11849)
+++ gnucash/trunk/src/register/register-core/Makefile.am 2005-11-06 04:08:22 UTC (rev 11850)
@@ -93,7 +93,7 @@
gw-register-core.scm gw-register-core.c gw-register-core.h: \
.scm-links gw-register-core-spec.scm ${top_builddir}/config.status
- FLAVOR=gnome guile -c \
+ FLAVOR=gnome $(GUILE) -c \
"(set! %load-path (cons \"${G_WRAP_MODULE_DIR}\" %load-path)) \
(set! %load-path (cons \"${PWD}\" %load-path)) \
(set! %load-path (cons \"${top_srcdir}/src/engine\" %load-path)) \
Modified: gnucash/trunk/src/report/report-gnome/Makefile.am
===================================================================
--- gnucash/trunk/src/report/report-gnome/Makefile.am 2005-11-06 03:07:21 UTC (rev 11849)
+++ gnucash/trunk/src/report/report-gnome/Makefile.am 2005-11-06 04:08:22 UTC (rev 11850)
@@ -95,7 +95,7 @@
gw-report-gnome.scm gw-report-gnome.c gw-report-gnome.h: \
.scm-links gw-report-gnome-spec.scm ${top_builddir}/config.status
- FLAVOR=gnome guile -c \
+ FLAVOR=gnome $(GUILE) -c \
"(set! %load-path (cons \"${G_WRAP_MODULE_DIR}\" %load-path)) \
(set! %load-path (cons \"${PWD}\" %load-path)) \
(set! %load-path (cons \"${top_builddir}/src/engine\" %load-path)) \
More information about the gnucash-changes
mailing list