From e72d156c0352e27dff0c541f8bdb3febb041de9b Mon Sep 17 00:00:00 2001 From: Derek Atkins Date: Fri, 9 Dec 2005 18:28:42 +0000 Subject: [PATCH] Some changes to get code to compile on Solaris. * configure.in: g-wrap 1.9.6 can define the module-dir as share/guile/site -- we want to make sure to get rid of the /site when computing the libdir from this. Otherwise the runtime will fail to find the g-wrap runtime libraries. * src/gnome-utils/gnc-currency-edit.c: * src/business/business-gnome/business-urls.c: include to compile on Solaris. git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@12154 57a11ea4-9604-0410-9ed3-97b8803252fd --- ChangeLog | 10 ++++++++++ configure.in | 2 +- src/business/business-gnome/business-urls.c | 1 + src/gnome-utils/gnc-currency-edit.c | 1 + 4 files changed, 13 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 72654cb37f..9350c1a7e8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,13 @@ +2005-12-09 Derek Atkins + + * configure.in: g-wrap 1.9.6 can define the module-dir as + share/guile/site -- we want to make sure to get rid of + the /site when computing the libdir from this. Otherwise + the runtime will fail to find the g-wrap runtime libraries. + * src/gnome-utils/gnc-currency-edit.c: + * src/business/business-gnome/business-urls.c: + include to compile on Solaris. + 2005-12-08 Christian Stimming * src/report/standard-reports/income-statement.scm, *.scm: diff --git a/configure.in b/configure.in index 67906ec87b..9896d15520 100644 --- a/configure.in +++ b/configure.in @@ -242,7 +242,7 @@ AC_MSG_RESULT($G_WRAP_LINK_ARGS) AC_MSG_CHECKING(for g-wrap module directory) G_WRAP_MODULE_DIR=`${G_WRAP_CONFIG} --guile-module-directory` -G_WRAP_LIB_DIR=`echo $G_WRAP_MODULE_DIR | sed -e 's|share/guile|lib|'` +G_WRAP_LIB_DIR=`echo $G_WRAP_MODULE_DIR | sed -e 's|share/guile.*$|lib|'` AC_MSG_RESULT($G_WRAP_MODULE_DIR) AC_GWRAP_CHECK_GUILE($G_WRAP_MODULE_DIR) diff --git a/src/business/business-gnome/business-urls.c b/src/business/business-gnome/business-urls.c index 1e45dbcb5a..42d581d164 100644 --- a/src/business/business-gnome/business-urls.c +++ b/src/business/business-gnome/business-urls.c @@ -26,6 +26,7 @@ #include #include +#include /* index() on Solaris */ #include "gnc-html.h" #include "gnc-ui-util.h" diff --git a/src/gnome-utils/gnc-currency-edit.c b/src/gnome-utils/gnc-currency-edit.c index bd31f8b537..134290b176 100644 --- a/src/gnome-utils/gnc-currency-edit.c +++ b/src/gnome-utils/gnc-currency-edit.c @@ -59,6 +59,7 @@ #include #include +#include /* for index() on Solaris */ #include #include