r15572 - gnucash/trunk/packaging/win32 - Fix and activate installation of ktoblzcheck on win32.
Christian Stimming
cstim at cvs.gnucash.org
Mon Feb 12 05:53:22 EST 2007
Author: cstim
Date: 2007-02-12 05:53:20 -0500 (Mon, 12 Feb 2007)
New Revision: 15572
Trac: http://svn.gnucash.org/trac/changeset/15572
Modified:
gnucash/trunk/packaging/win32/custom.sh
gnucash/trunk/packaging/win32/install.sh
Log:
Fix and activate installation of ktoblzcheck on win32.
Modified: gnucash/trunk/packaging/win32/custom.sh
===================================================================
--- gnucash/trunk/packaging/win32/custom.sh 2007-02-12 05:04:13 UTC (rev 15571)
+++ gnucash/trunk/packaging/win32/custom.sh 2007-02-12 10:53:20 UTC (rev 15572)
@@ -185,7 +185,7 @@
GWENHYWFAR_URL="$SF_MIRROR/gwenhywfar/gwenhywfar-2.5.3.tar.gz"
GWENHYWFAR_DIR=$GLOBAL_DIR\\gwenhywfar
-KTOBLZCHECK="$SF_MIRROR/ktoblzcheck/ktoblzcheck-1.12.tar.gz"
+KTOBLZCHECK_URL="$SF_MIRROR/ktoblzcheck/ktoblzcheck-1.12.tar.gz"
# ktoblzcheck is being installed into GWENHYWFAR_DIR
AQBANKING_URL="$SF_MIRROR/aqbanking/aqbanking-2.2.7.tar.gz"
@@ -222,7 +222,7 @@
add_step inst_libofx
## Online banking:
add_step inst_gwenhywfar
-#add_step inst_ktoblzcheck
+add_step inst_ktoblzcheck
add_step inst_aqbanking
##
if test x$cross_compile != xyes ; then
Modified: gnucash/trunk/packaging/win32/install.sh
===================================================================
--- gnucash/trunk/packaging/win32/install.sh 2007-02-12 05:04:13 UTC (rev 15571)
+++ gnucash/trunk/packaging/win32/install.sh 2007-02-12 10:53:20 UTC (rev 15572)
@@ -19,6 +19,8 @@
register_env_var GUILE_CPPFLAGS " "
register_env_var GUILE_LDFLAGS " "
register_env_var INTLTOOL_PERL " "
+register_env_var KTOBLZCHECK_CPPFLAGS " "
+register_env_var KTOBLZCHECK_LDFLAGS " "
register_env_var PATH ":"
register_env_var PKG_CONFIG ":" ""
register_env_var PKG_CONFIG_PATH ":"
@@ -719,12 +721,14 @@
assert_one_dir $TMP_UDIR/ktoblzcheck-*
qpushd $TMP_UDIR/ktoblzcheck-*
./configure \
- --prefix=$_GWENHYWFAR_UDIR
+ --prefix=${_GWENHYWFAR_UDIR}
make
make check
make install
qpopd
fi
+ add_to_env "-I${_GWENHYWFAR_UDIR}/include" KTOBLZCHECK_CPPFLAGS
+ add_to_env "-L${_GWENHYWFAR_UDIR}/lib" KTOBLZCHECK_LDFLAGS
${PKG_CONFIG} --exists ktoblzcheck || die "Ktoblzcheck not installed correctly"
}
@@ -767,15 +771,16 @@
wget_unpacked $AQBANKING_URL $DOWNLOAD_DIR $TMP_DIR
assert_one_dir $TMP_UDIR/aqbanking-*
qpushd $TMP_UDIR/aqbanking-*
+ _AQ_CPPFLAGS="-I${_LIBOFX_UDIR}/include ${KTOBLZCHECK_CPPFLAGS}"
+ _AQ_LDFLAGS="-L${_LIBOFX_UDIR}/lib ${KTOBLZCHECK_LDFLAGS}"
if test x$aqbanking_with_qt = xyes; then
inst_qt4
_QTDIR=`unix_path ${QTDIR}`
- _AQ_LDFLAGS="-L${_LIBOFX_UDIR}/lib"
./configure \
--with-gwen-dir=${_GWENHYWFAR_UDIR} \
--with-frontends="cbanking qbanking" \
--with-backends="aqdtaus aqhbci aqofxconnect" \
- CPPFLAGS="-I${_LIBOFX_UDIR}/include" \
+ CPPFLAGS="${_AQ_CPPFLAGS}" \
LDFLAGS="${_AQ_LDFLAGS}" \
qt3_libs="-L${_QTDIR}/lib -L${_QTDIR}/bin -lQtCore4 -lQtGui4 -lQt3Support4" \
qt3_includes="-I${_QTDIR}/include -I${_QTDIR}/include/Qt -I${_QTDIR}/include/QtCore -I${_QTDIR}/include/QtGui -I${_QTDIR}/include/Qt3Support" \
@@ -783,12 +788,11 @@
make qt4-port
make clean
else
- _AQ_LDFLAGS="-L${_LIBOFX_UDIR}/lib"
./configure \
--with-gwen-dir=${_GWENHYWFAR_UDIR} \
--with-frontends="cbanking" \
--with-backends="aqdtaus aqhbci aqofxconnect" \
- CPPFLAGS="-I${_LIBOFX_UDIR}/include" \
+ CPPFLAGS="${_AQ_CPPFLAGS}" \
LDFLAGS="${_AQ_LDFLAGS}" \
--prefix=${_AQBANKING_UDIR}
fi
@@ -863,8 +867,8 @@
${LIBOFX_OPTIONS} \
${AQBANKING_OPTIONS} \
--enable-binreloc \
- CPPFLAGS="${AUTOTOOLS_CPPFLAGS} ${REGEX_CPPFLAGS} ${GNOME_CPPFLAGS} ${GUILE_CPPFLAGS} -D_WIN32" \
- LDFLAGS="${AUTOTOOLS_LDFLAGS} ${REGEX_LDFLAGS} ${GNOME_LDFLAGS} ${GUILE_LDFLAGS}" \
+ CPPFLAGS="${AUTOTOOLS_CPPFLAGS} ${REGEX_CPPFLAGS} ${GNOME_CPPFLAGS} ${GUILE_CPPFLAGS} ${KTOBLZCHECK_CPPFLAGS} -D_WIN32" \
+ LDFLAGS="${AUTOTOOLS_LDFLAGS} ${REGEX_LDFLAGS} ${GNOME_LDFLAGS} ${GUILE_LDFLAGS} ${KTOBLZCHECK_LDFLAGS}" \
PKG_CONFIG_PATH="${PKG_CONFIG_PATH}"
# Windows DLLs don't need relinking
More information about the gnucash-changes
mailing list