r14860 - gnucash/trunk - Also allow user-defined overrides for g-wrap. Necessary if build-time g-wrap is different from the run-time one during cross-compile.

[Christian Stimming]

Author: cstim
Date: 2006-09-18 15:10:31 -0400 (Mon, 18 Sep 2006)
New Revision: 14860
Trac: http://svn.gnucash.org/trac/changeset/14860

Modified:
   gnucash/trunk/configure.in
   gnucash/trunk/packaging/win32/install.sh
Log:
Also allow user-defined overrides for g-wrap. Necessary if build-time g-wrap is different from the run-time one during cross-compile.

Modified: gnucash/trunk/configure.in
===================================================================
--- gnucash/trunk/configure.in	2006-09-18 16:16:23 UTC (rev 14859)
+++ gnucash/trunk/configure.in	2006-09-18 19:10:31 UTC (rev 14860)
@@ -292,9 +292,6 @@
 ### --------------------------------------------------------------------------
 ### G-wrap (libraries and executable)
 
-G_WRAP_COMPILE_ARGS=""
-G_WRAP_LINK_ARGS=""
-
 AM_GUILE_VERSION_CHECK(1.6.0, , , [AC_MSG_ERROR([
 
   guile does not appear to be installed correctly, or is not in the
@@ -324,11 +321,15 @@
 
 # Find out what the g-wrap compile and link flags are.
 AC_MSG_CHECKING(for g-wrap compile args)
-G_WRAP_COMPILE_ARGS=`${G_WRAP_CONFIG} --c-compile-args guile`
+if test "x$G_WRAP_COMPILE_ARGS" = "x" ; then
+  G_WRAP_COMPILE_ARGS=`${G_WRAP_CONFIG} --c-compile-args guile`
+fi
 AC_MSG_RESULT($G_WRAP_COMPILE_ARGS)
 
 AC_MSG_CHECKING(for g-wrap link args)
-G_WRAP_LINK_ARGS=`${G_WRAP_CONFIG} --c-link-args guile`
+if test "x$G_WRAP_LINK_ARGS" = "x" ; then
+  G_WRAP_LINK_ARGS=`${G_WRAP_CONFIG} --c-link-args guile`
+fi
 # Dear g-wrap: adding -L/usr/lib is very silly.  Do not do this.
 G_WRAP_LINK_ARGS=`echo ${G_WRAP_LINK_ARGS} | sed -e 's|-L/usr/lib ||'`
 AC_MSG_RESULT($G_WRAP_LINK_ARGS)

Modified: gnucash/trunk/packaging/win32/install.sh
===================================================================
--- gnucash/trunk/packaging/win32/install.sh	2006-09-18 16:16:23 UTC (rev 14859)
+++ gnucash/trunk/packaging/win32/install.sh	2006-09-18 19:10:31 UTC (rev 14860)
@@ -735,6 +735,8 @@
 	export GUILE_INCS="${GUILE_CPPFLAGS}"
 	export BUILD_GUILE=yes
 	export name_build_guile=/usr/bin/guile-config
+	export G_WRAP_COMPILE_ARGS="-I${GWRAP_DIR}/include"
+	export G_WRAP_LINK_ARGS="-L${GWRAP_DIR} -lgwrap-guile-runtime -lgwrap-core-runtime -lffi"
     else
 	if grep -q "GUILE_LOAD_PATH.*:" configure.in; then
         cp configure.in configure.in.bak