IntenseFinance/gnucash
3
0
Fork 0
mirror of https://github.com/Gnucash/gnucash.git synced 2025-02-25 18:55:30 -06:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@14860 57a11ea4-9604-0410-9ed3-97b8803252fd
This commit is contained in:
Christian Stimming 2006-09-18 19:10:31 +00:00
parent 3eb57a841a
commit a9457c668d
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
configure.in
View File

@ -292,9 +292,6 @@ AC_SUBST(GUILE_LIBS)
### --------------------------------------------------------------------------
### 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 @@ AM_PATH_GWRAP(1.3.3, , [AC_MSG_ERROR([
# 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)

2
packaging/win32/install.sh
View File

@ -735,6 +735,8 @@ function inst_gnucash() {
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