r21793 - gnucash/trunk/packaging/win32 - Revert r21789 - not needed as r21791 adds required include flags in a better way.
Christian Stimming
cstim at code.gnucash.org
Thu Dec 29 16:36:35 EST 2011
Author: cstim
Date: 2011-12-29 16:36:35 -0500 (Thu, 29 Dec 2011)
New Revision: 21793
Trac: http://svn.gnucash.org/trac/changeset/21793
Modified:
gnucash/trunk/packaging/win32/install-impl.sh
Log:
Revert r21789 - not needed as r21791 adds required include flags in a better way.
Modified: gnucash/trunk/packaging/win32/install-impl.sh
===================================================================
--- gnucash/trunk/packaging/win32/install-impl.sh 2011-12-29 20:20:46 UTC (rev 21792)
+++ gnucash/trunk/packaging/win32/install-impl.sh 2011-12-29 21:36:35 UTC (rev 21793)
@@ -1139,15 +1139,8 @@
then
echo "libxslt already installed in $_LIBXSLT_UDIR. skipping."
else
- if [ "$CROSS_COMPILE" = "yes" ]; then
- _MORE_CPPFLAGS="-I${_LIBXSLT_UDIR}/iconv-1.9.2.win32/include"
- _MORE_LDFLAGS="-L${_LIBXSLT_UDIR}/lib"
- wget_unpacked ${LIBXSLT_ICONV_URL} ${DOWNLOAD_DIR} ${LIBXSLT_DIR}
- wget_unpacked ${LIBXSLT_ZLIB_URL} ${DOWNLOAD_DIR} ${LIBXSLT_DIR}
- else
- _MORE_CPPFLAGS=""
- _MORE_LDFLAGS=""
- fi
+ #wget_unpacked ${LIBXSLT_ICONV_URL} ${DOWNLOAD_DIR} ${LIBXSLT_DIR}
+ #wget_unpacked ${LIBXSLT_ZLIB_URL} ${DOWNLOAD_DIR} ${LIBXSLT_DIR}
wget_unpacked $LIBXSLT_SRC_URL $DOWNLOAD_DIR $TMP_DIR
assert_one_dir $TMP_UDIR/libxslt-*
@@ -1157,8 +1150,8 @@
--prefix=${_LIBXSLT_UDIR} \
--with-python=no \
--with-libxml-prefix=${_GNOME_UDIR} \
- CPPFLAGS="-I${_GNOME_UDIR}/include ${GNUTLS_CPPFLAGS} ${_MORE_CPPFLAGS}" \
- LDFLAGS="-L${_GNOME_UDIR}/lib ${GNUTLS_LDFLAGS} ${_MORE_LD_FLAGS}"
+ CPPFLAGS="-I${_GNOME_UDIR}/include ${GNUTLS_CPPFLAGS}" \
+ LDFLAGS="-L${_GNOME_UDIR}/lib ${GNUTLS_LDFLAGS}"
make
make install
qpopd
More information about the gnucash-changes
mailing list