r20615 - gnucash/trunk/packaging/win32 - Win32 build: Revert r20614 libxml2 version update because the win build seems to stop due to bad linker flags in libxml-2.0.pc.

[Christian Stimming]

Author: cstim
Date: 2011-05-10 07:05:18 -0400 (Tue, 10 May 2011)
New Revision: 20615
Trac: http://svn.gnucash.org/trac/changeset/20615

Modified:
   gnucash/trunk/packaging/win32/defaults.sh
   gnucash/trunk/packaging/win32/install-impl.sh
Log:
Win32 build: Revert r20614 libxml2 version update because the win build seems to stop due to bad linker flags in libxml-2.0.pc.

Also, fix the pkgconfig files unconditionally.

Modified: gnucash/trunk/packaging/win32/defaults.sh
===================================================================
--- gnucash/trunk/packaging/win32/defaults.sh	2011-05-08 20:05:43 UTC (rev 20614)
+++ gnucash/trunk/packaging/win32/defaults.sh	2011-05-10 11:05:18 UTC (rev 20615)
@@ -215,7 +215,7 @@
 #LIBXSLT_VERSION=1.1.26
 set_default LIBXSLT_SRC_URL "${XSLT_BASE_URL}/libxslt-${LIBXSLT_VERSION}.tar.bz2"
 set_default LIBXSLT_MAKEFILE_PATCH "`pwd`/libxslt-1.1.22.Makefile.in.patch"
-LIBXML2_VERSION="2.6.30"
+LIBXML2_VERSION="2.6.27"
 set_default LIBXML2_SRC_URL "${XML2_BASE_URL}/libxml2-${LIBXML2_VERSION}.tar.bz2"
 set_default LIBXSLT_ICONV_URL "${XMLSOFT_URL}/iconv-1.9.2.win32.zip"
 set_default LIBXSLT_ZLIB_URL "${XMLSOFT_URL}/zlib-1.2.3.win32.zip"

Modified: gnucash/trunk/packaging/win32/install-impl.sh
===================================================================
--- gnucash/trunk/packaging/win32/install-impl.sh	2011-05-08 20:05:43 UTC (rev 20614)
+++ gnucash/trunk/packaging/win32/install-impl.sh	2011-05-10 11:05:18 UTC (rev 20615)
@@ -485,7 +485,7 @@
         quiet ${PKG_CONFIG} --atleast-version=${GTK_VERSION} gtk+-2.0 &&
         quiet ${PKG_CONFIG} --atleast-version=${CAIRO_VERSION} cairo &&
         quiet ${PKG_CONFIG} --atleast-version=${PIXMAN_VERSION} pixman-1 &&
-        quiet ${PKG_CONFIG} --atleast-version=${LIBXML2_VERSION} libxml-2.0 &&
+        quiet ${PKG_CONFIG} --exact-version=${LIBXML2_VERSION} libxml-2.0 &&
         quiet intltoolize --version
     then
         echo "gnome packages installed in $_GNOME_UDIR.  skipping."
@@ -590,14 +590,6 @@
             rm -rf $TMP_UDIR/gtk-doc-*
         qpopd
 
-        if [ "$CROSS_COMPILE" = "yes" ]; then
-            qpushd $_GNOME_UDIR/lib/pkgconfig
-                perl -pi.bak -e"s!^prefix=.*\$!prefix=$_GNOME_UDIR!" *.pc
-                #perl -pi.bak -e's!^Libs: !Libs: -L\${prefix}/bin !' *.pc
-            qpopd
-        fi
-
-
         if quiet ${PKG_CONFIG} --exact-version=${PIXMAN_VERSION} pixman-1 ; then
             echo "Pixman already compiled+installed"
         else
@@ -634,13 +626,18 @@
             rm -rf ${TMP_UDIR}/libxml2-*
         fi
 
+        qpushd $_GNOME_UDIR/lib/pkgconfig
+            perl -pi.bak -e"s!^prefix=.*\$!prefix=$_GNOME_UDIR!" *.pc
+            #perl -pi.bak -e's!^Libs: !Libs: -L\${prefix}/bin !' *.pc
+        qpopd
+
         quiet gconftool-2 --version &&
         quiet ${PKG_CONFIG} --exists gconf-2.0 libgnome-2.0 libgnomeui-2.0 &&
         quiet ${PKG_CONFIG} --atleast-version=${GCONF_VERSION} gconf-2.0 &&
         quiet ${PKG_CONFIG} --atleast-version=${GTK_VERSION} gtk+-2.0 &&
         quiet ${PKG_CONFIG} --atleast-version=${CAIRO_VERSION} cairo &&
         quiet ${PKG_CONFIG} --atleast-version=${PIXMAN_VERSION} pixman-1 &&
-        quiet ${PKG_CONFIG} --atleast-version=${LIBXML2_VERSION} libxml-2.0 &&
+        quiet ${PKG_CONFIG} --exact-version=${LIBXML2_VERSION} libxml-2.0 &&
         quiet intltoolize --version || die "gnome not installed correctly"
     fi
     [ ! -d $_GNOME_UDIR/share/aclocal ] || add_to_env "-I $_GNOME_UDIR/share/aclocal" ACLOCAL_FLAGS