Win32: Update libxslt version, but it needs its own copy of libxml2.dll.

Apparently the gnome-provided libxml2 has the DLL filename libxml2-2.dll,
but the binary from xmlsoft.org still has the filename libxml2.dll.

git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@18690 57a11ea4-9604-0410-9ed3-97b8803252fd
This commit is contained in:
Christian Stimming 2010-02-19 22:12:28 +00:00
parent 89e197771a
commit 8345fff2c6
2 changed files with 6 additions and 1 deletions

View File

@ -153,7 +153,8 @@ set_default MINGW_UTILS_DIR $TOOLS_DIR
set_default EXETYPE_SCRIPT `pwd`/exetype.pl
set_default EXETYPE_DIR $TOOLS_DIR
set_default LIBXSLT_URL "http://xmlsoft.org/sources/win32/oldreleases/libxslt-1.1.23+.win32.zip"
set_default LIBXSLT_URL "http://xmlsoft.org/sources/win32/libxslt-1.1.26.win32.zip"
set_default LIBXSLT_LIBXML2_URL "http://xmlsoft.org/sources/win32/libxml2-2.7.6.win32.zip"
set_default LIBXSLT_DIR $GLOBAL_DIR\\libxslt
set_default LIBXML2_URL "$GNOME_WIN32_DEPS_URL/libxml2_2.7.4-1_win32.zip"

View File

@ -499,10 +499,14 @@ function inst_libxslt() {
else
[ "$CROSS_COMPILE" = "yes" ] && die "xsltproc unavailable"
wget_unpacked $LIBXSLT_URL $DOWNLOAD_DIR $LIBXSLT_DIR
wget_unpacked $LIBXSLT_LIBXML2_URL $DOWNLOAD_DIR $LIBXSLT_DIR
qpushd $_LIBXSLT_UDIR
mv libxslt-* mydir
cp -r mydir/* .
rm -rf mydir
mv libxml2-* mydir
cp -r mydir/* .
rm -rf mydir
qpopd
quiet which xsltproc || die "libxslt not installed correctly"
fi