From 8fea558f9ac451cf736c60d355a713761e7e2761 Mon Sep 17 00:00:00 2001
From: Christian Stimming <stimming@tuhh.de>
Date: Mon, 16 Nov 2009 21:42:23 +0000
Subject: [PATCH] Bug #602069: Fix build on Solaris for different gmp header
 locations

Patch by Halton Huo:

Since solaris ship gmp header files under /usr/include/gmp rather than
/usr/include, so this bug only happens on those systems which does not ship gmp
headers into /usr/include.

Actually this is aware during configure time through "guile-config compile". My
GUILE_INCS is -I/usr/include/gmp. So adding GUILE_INCS for AM_CPPFLAGS in
src/gnc-module/Makefile.am will fix this bug.

git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@18415 57a11ea4-9604-0410-9ed3-97b8803252fd
---
 src/backend/sql/Makefile.am | 2 ++
 src/gnc-module/Makefile.am  | 6 ++++--
 src/html/Makefile.am        | 1 +
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/backend/sql/Makefile.am b/src/backend/sql/Makefile.am
index 9dd77ff50c..0886ed40ab 100644
--- a/src/backend/sql/Makefile.am
+++ b/src/backend/sql/Makefile.am
@@ -12,6 +12,7 @@ AM_CFLAGS = \
   -I${top_srcdir}/lib/libc\
   -I${top_srcdir}/src/libqof/qof \
   ${GLIB_CFLAGS} \
+  ${GUILE_INCS} \
   ${GCONF_CFLAGS} \
   ${WARN_CFLAGS}
 
@@ -45,6 +46,7 @@ noinst_HEADERS = \
 
 libgnc_backend_sql_la_LIBADD = \
    ${GLIB_LIBS} \
+   ${GUILE_LIBS} \
    ${GCONF_LIBS} \
    ${top_builddir}/src/engine/libgncmod-engine.la \
    ${top_builddir}/src/libqof/qof/libgnc-qof.la
diff --git a/src/gnc-module/Makefile.am b/src/gnc-module/Makefile.am
index 9397f46743..d1fc34efa0 100644
--- a/src/gnc-module/Makefile.am
+++ b/src/gnc-module/Makefile.am
@@ -4,7 +4,8 @@ AM_CPPFLAGS = \
    -I${top_srcdir}/lib/libc \
    -I${top_srcdir}/src \
    -I${top_srcdir}/src/core-utils \
-   ${GLIB_CFLAGS}
+   ${GLIB_CFLAGS} \
+   ${GUILE_INCS}
 
 lib_LTLIBRARIES = libgnc-module.la
 
@@ -13,7 +14,8 @@ libgnc_module_la_SOURCES = gnc-module.c swig-gnc-module.c
 libgnc_module_la_LIBADD = \
   ../core-utils/libgnc-core-utils.la \
   ${top_builddir}/lib/libc/libc-missing.la \
-  ${GLIB_LIBS}
+  ${GLIB_LIBS} \
+  ${GUILE_LIBS}
 
 gncmoddir = ${GNC_SHAREDIR}/guile-modules/gnucash
 gncmod_DATA = gnc-module.scm
diff --git a/src/html/Makefile.am b/src/html/Makefile.am
index 6fa60e5544..175973567a 100644
--- a/src/html/Makefile.am
+++ b/src/html/Makefile.am
@@ -14,6 +14,7 @@ AM_CPPFLAGS = \
   -I${top_srcdir}/lib/libc \
   ${QOF_CFLAGS} \
   ${GLIB_CFLAGS} \
+  ${GUILE_INCS} \
   ${GTK_CFLAGS} \
   ${GNOME_CFLAGS} \
   ${GOFFICE_CFLAGS}