r15076 - gnucash/trunk/packaging/win32 - Some win32 package updates:

Andreas Köhler andi5 at cvs.gnucash.org
Wed Nov 1 17:43:01 EST 2006


Author: andi5
Date: 2006-11-01 17:43:00 -0500 (Wed, 01 Nov 2006)
New Revision: 15076
Trac: http://svn.gnucash.org/trac/changeset/15076

Added:
   gnucash/trunk/packaging/win32/goffice-0.3.2-patch.diff
Modified:
   gnucash/trunk/packaging/win32/custom.sh
   gnucash/trunk/packaging/win32/install.sh
Log:
Some win32 package updates:
- Updated versions: MinGW, GLib, ATK, Pango, GTK+, Gail, LibGnome,
                    LibGSF, Glade, SVN
- Move autotools up in the chain (guile1.8 will need that)
- Stick with GOffice 0.3.0 (newer version need code changes), but
  provide patch for 0.3.2
- Other minor install.sh improvements


Modified: gnucash/trunk/packaging/win32/custom.sh
===================================================================
--- gnucash/trunk/packaging/win32/custom.sh	2006-11-01 22:42:08 UTC (rev 15075)
+++ gnucash/trunk/packaging/win32/custom.sh	2006-11-01 22:43:00 UTC (rev 15076)
@@ -46,7 +46,7 @@
 
 DTK_URL="$SF_MIRROR/mingw/msysDTK-1.0.1.exe"
 
-MINGW_URL="$SF_MIRROR/mingw/MinGW-5.0.2.exe"
+MINGW_URL="$SF_MIRROR/mingw/MinGW-5.0.3.exe"
 MINGW_DIR=$GLOBAL_DIR\\mingw
 
 UNZIP_URL="$SF_MIRROR/gnuwin32/unzip-5.51-1.exe"
@@ -66,6 +66,11 @@
 ACTIVE_PERL_URL="http://downloads.activestate.com/ActivePerl/Windows/5.6/ActivePerl-5.6.1.638-MSWin32-x86.zip"
 ACTIVE_PERL_DIR=$GLOBAL_DIR\\active-perl
 
+AUTOCONF_URL="http://ftp.gnu.org/gnu/autoconf/autoconf-2.60.tar.bz2"
+AUTOMAKE_URL="http://ftp.gnu.org/gnu/automake/automake-1.9.6.tar.bz2"
+LIBTOOL_URL="http://ftp.gnu.org/gnu/libtool/libtool-1.5.22.tar.gz"
+AUTOTOOLS_DIR=$GLOBAL_DIR\\autotools
+
 GUILE_URL="http://ftp.gnu.org/pub/gnu/guile/guile-1.6.8.tar.gz"
 SLIB_URL="http://swiss.csail.mit.edu/ftpdir/scm/OLD/slib3a3.zip"
 GUILE_DIR=$GLOBAL_DIR\\guile
@@ -86,40 +91,40 @@
 GETTEXT_URL="$GTK_MIRROR/glib/2.12/win32/dependencies/gettext-0.14.5.zip"
 GETTEXT_DEV_URL="$GTK_MIRROR/glib/2.12/win32/dependencies/gettext-dev-0.14.5.zip"
 LIBICONV_URL="$GTK_MIRROR/glib/2.12/win32/dependencies/libiconv-1.9.1.bin.woe32.zip"
-GLIB_URL="$GNOME_WIN32_URL/glib/2.12/glib-2.12.3.zip"
-GLIB_DEV_URL="$GNOME_WIN32_URL/glib/2.12/glib-dev-2.12.3.zip"
-LIBJPEG_URL="$GNOME_MIRROR/platform/2.13/2.13.92/win32/dependencies/libjpeg-6b-4.zip"
+GLIB_URL="$GNOME_WIN32_URL/glib/2.12/glib-2.12.4.zip"
+GLIB_DEV_URL="$GNOME_WIN32_URL/glib/2.12/glib-dev-2.12.4.zip"
+LIBJPEG_URL="$GNOME_MIRROR/platform/2.16/2.16.0/win32/dependencies/libjpeg-6b-4.zip"
 LIBPNG_URL="$GTK_MIRROR/gtk/v2.10/win32/dependencies/libpng-1.2.8-bin.zip"
 ZLIB_URL="$GTK_MIRROR/gtk/v2.10/win32/dependencies/zlib123-dll.zip"
 PKG_CONFIG_URL="$GTK_MIRROR/gtk/v2.10/win32/dependencies/pkg-config-0.20.zip"
-CAIRO_URL="$GTK_MIRROR/gtk/v2.8/win32/cairo-1.2.4.zip"
-CAIRO_DEV_URL="$GTK_MIRROR/gtk/v2.8/win32/cairo-dev-1.2.4.zip"
+CAIRO_URL="$GNOME_MIRROR/platform/2.16/2.16.0/win32/dependencies/cairo-1.2.4.zip"
+CAIRO_DEV_URL="$GNOME_MIRROR/platform/2.16/2.16.0/win32/dependencies/cairo-dev-1.2.4.zip"
 FONTCONFIG_URL="$GTK_MIRROR/gtk/v2.8/win32/dependencies/fontconfig-2.2.2-20040412.zip"
 FONTCONFIG_DEV_URL="$GTK_MIRROR/gtk/v2.8/win32/dependencies/fontconfig-dev-2.2.2-20040412.zip"
 FREETYPE_URL="$GTK_MIRROR/gtk/v2.8/win32/dependencies/freetype-2.1.10.zip"
 FREETYPE_DEV_URL="$SF_MIRROR/gnuwin32/freetype-2.1.10-lib.zip"
-ATK_URL="$GNOME_WIN32_URL/atk/1.12/atk-1.12.2.zip"
-ATK_DEV_URL="$GNOME_WIN32_URL/atk/1.12/atk-dev-1.12.2.zip"
-PANGO_URL="$GNOME_WIN32_URL/pango/1.14/pango-1.14.3.zip"
-PANGO_DEV_URL="$GNOME_WIN32_URL/pango/1.14/pango-dev-1.14.3.zip"
+ATK_URL="$GNOME_WIN32_URL/atk/1.12/atk-1.12.3.zip"
+ATK_DEV_URL="$GNOME_WIN32_URL/atk/1.12/atk-dev-1.12.3.zip"
+PANGO_URL="$GNOME_WIN32_URL/pango/1.14/pango-1.14.5.zip"
+PANGO_DEV_URL="$GNOME_WIN32_URL/pango/1.14/pango-dev-1.14.5.zip"
 LIBART_LGPL_URL="$GNOME_WIN32_URL/libart_lgpl/2.3/libart_lgpl-2.3.17.zip"
 LIBART_LGPL_DEV_URL="$GNOME_WIN32_URL/libart_lgpl/2.3/libart_lgpl-dev-2.3.17.zip"
-GTK_URL="$GNOME_WIN32_URL/gtk+/2.10/gtk+-2.10.3.zip"
-GTK_DEV_URL="$GNOME_WIN32_URL/gtk+/2.10/gtk+-dev-2.10.3.zip"
+GTK_URL="$GNOME_WIN32_URL/gtk+/2.10/gtk+-2.10.6.zip"
+GTK_DEV_URL="$GNOME_WIN32_URL/gtk+/2.10/gtk+-dev-2.10.6.zip"
 INTLTOOL_URL="$GNOME_WIN32_URL/intltool/0.35/intltool-0.35.0.zip"
 ORBIT2_URL="$GNOME_WIN32_URL/ORBit2/2.14/ORBit2-2.14.2.zip"
 ORBIT2_DEV_URL="$GNOME_WIN32_URL/ORBit2/2.14/ORBit2-dev-2.14.2.zip"
-GAIL_URL="$GNOME_WIN32_URL/gail/1.9/gail-1.9.2.zip"
-GAIL_DEV_URL="$GNOME_WIN32_URL/gail/1.9/gail-dev-1.9.2.zip"
-POPT_URL="$GNOME_MIRROR/platform/2.13/2.13.92/win32/dependencies/popt-1.10.2-tml-20050828.zip"
-POPT_DEV_URL="$GNOME_MIRROR/platform/2.13/2.13.92/win32/dependencies/popt-dev-1.10.2-tml-20050828.zip"
+GAIL_URL="$GNOME_WIN32_URL/gail/1.9/gail-1.9.3.zip"
+GAIL_DEV_URL="$GNOME_WIN32_URL/gail/1.9/gail-dev-1.9.3.zip"
+POPT_URL="$GNOME_MIRROR/platform/2.16/2.16.0/win32/dependencies/popt-1.10.2-tml-20050828.zip"
+POPT_DEV_URL="$GNOME_MIRROR/platform/2.16/2.16.0/win32/dependencies/popt-dev-1.10.2-tml-20050828.zip"
 GCONF_URL="$GNOME_WIN32_URL/GConf/2.14/GConf-2.14.0.zip"
 GCONF_DEV_URL="$GNOME_WIN32_URL/GConf/2.14/GConf-dev-2.14.0.zip"
 LIBBONOBO_URL="$GNOME_WIN32_URL/libbonobo/2.16/libbonobo-2.16.0.zip"
 LIBBONOBO_DEV_URL="$GNOME_WIN32_URL/libbonobo/2.16/libbonobo-dev-2.16.0.zip"
 GNOME_VFS_URL="$GNOME_WIN32_URL/gnome-vfs/2.14/gnome-vfs-2.14.2.zip"
 GNOME_VFS_DEV_URL="$GNOME_WIN32_URL/gnome-vfs/2.14/gnome-vfs-dev-2.14.2.zip"
-LIBGNOME_URL="$GNOME_WIN32_URL/libgnome/2.16/libgnome-2.16.0.zip"
+LIBGNOME_URL="$GNOME_WIN32_URL/libgnome/2.16/libgnome-2.16.0-1.zip"
 LIBGNOME_DEV_URL="$GNOME_WIN32_URL/libgnome/2.16/libgnome-dev-2.16.0.zip"
 LIBGNOMECANVAS_URL="$GNOME_WIN32_URL/libgnomecanvas/2.14/libgnomecanvas-2.14.0.zip"
 LIBGNOMECANVAS_DEV_URL="$GNOME_WIN32_URL/libgnomecanvas/2.14/libgnomecanvas-dev-2.14.0.zip"
@@ -140,22 +145,18 @@
 SWIG_URL="$SF_MIRROR/swig/swigwin-1.3.29.zip"
 SWIG_DIR=$GLOBAL_DIR\\swig
 
-AUTOCONF_URL="http://ftp.gnu.org/gnu/autoconf/autoconf-2.60.tar.bz2"
-AUTOMAKE_URL="http://ftp.gnu.org/gnu/automake/automake-1.9.6.tar.bz2"
-LIBTOOL_URL="http://ftp.gnu.org/gnu/libtool/libtool-1.5.22.tar.gz"
-AUTOTOOLS_DIR=$GLOBAL_DIR\\autotools
-
-LIBGSF_URL="$GNOME_MIRROR/sources/libgsf/1.14/libgsf-1.14.1.tar.bz2"
+LIBGSF_URL="$GNOME_MIRROR/sources/libgsf/1.14/libgsf-1.14.2.tar.bz2"
 LIBGSF_DIR=$GLOBAL_DIR\\libgsf
 
+# do not update this if you are unwilling to hack gnc-html-graph-gog.c
 GOFFICE_URL="$GNOME_MIRROR/sources/goffice/0.3/goffice-0.3.0.tar.bz2"
 GOFFICE_DIR=$GLOBAL_DIR\\goffice
 GOFFICE_PATCH=`pwd`/goffice-0.3.0-patch.diff
 
-GLADE_URL="$GNOME_MIRROR/sources/glade3/3.0/glade3-3.0.1.tar.bz2"
+GLADE_URL="$GNOME_MIRROR/sources/glade3/3.0/glade3-3.0.2.tar.bz2"
 GLADE_DIR=$GLOBAL_DIR\\glade
 
-SVN_URL="http://subversion.tigris.org/files/documents/15/32856/svn-1.3.2-setup.exe"
+SVN_URL="http://subversion.tigris.org/files/documents/15/34093/svn-1.4.0-setup.exe"
 SVN_DIR=$GLOBAL_DIR\\svn
 
 # There is no reason to ever need to comment these out!
@@ -172,6 +173,7 @@
 if test x$cross_compile != xyes ; then
  add_step inst_active_perl
 fi
+add_step inst_autotools
 add_step inst_guile
 if test x$cross_compile != xyes ; then
  add_step inst_openssl
@@ -181,7 +183,6 @@
 add_step inst_expat
 add_step inst_gnome
 add_step inst_swig
-add_step inst_autotools
 add_step inst_libgsf
 add_step inst_goffice
 #add_step inst_glade

Copied: gnucash/trunk/packaging/win32/goffice-0.3.2-patch.diff (from rev 15058, gnucash/trunk/packaging/win32/goffice-0.3.0-patch.diff)
===================================================================
--- gnucash/trunk/packaging/win32/goffice-0.3.0-patch.diff	2006-10-26 20:45:33 UTC (rev 15058)
+++ gnucash/trunk/packaging/win32/goffice-0.3.2-patch.diff	2006-11-01 22:43:00 UTC (rev 15076)
@@ -0,0 +1,91 @@
+diff -Nur goffice-0.3.2-old/goffice/Makefile.am goffice-0.3.2/goffice/Makefile.am
+--- goffice-0.3.2-old/goffice/Makefile.am	Tue Sep 19 16:06:53 2006
++++ goffice-0.3.2/goffice/Makefile.am	Mon Oct 30 15:47:16 2006
+@@ -31,7 +31,8 @@
+ libgoffice_0_la_DEPENDENCIES = goffice.def
+ libgoffice_0_la_LDFLAGS += -no-undefined -export-symbols goffice.def
+ if WITH_NATIVE_WIN32
+-libgoffice_0_la_LIBADD += -luuid -lhtmlhelp -lurlmon
++libgoffice_0_la_LDFLAGS += -no-undefined
++libgoffice_0_la_LIBADD += -luuid
+ endif
+ endif
+ 
+@@ -76,7 +77,7 @@
+ 	data/local.def drawing/local.def graph/local.def \
+ 	gtk/local.def ms-compat/local.def utils/local.def
+ 	echo EXPORTS > $@ && \
+-	cat $^ | sort >> $@
++	cat $^ | sort | sed '/^go_doc_mark_not_modified$$/d;/^go_plugin_init$$/d;/^go_plugin_shutdown$$/d' >> $@
+ 
+ if HAVE_LIBEXE
+ goffice_mslibdir = $(DESTDIR)$(libdir)
+diff -Nur goffice-0.3.2-old/goffice-win32.mk goffice-0.3.2/goffice-win32.mk
+--- goffice-0.3.2-old/goffice-win32.mk	Tue Sep 19 16:06:52 2006
++++ goffice-0.3.2/goffice-win32.mk	Mon Oct 30 15:50:27 2006
+@@ -16,7 +16,7 @@
+ 	  fi; \
+ 	done; \
+ 	cat $(top_builddir)/goffice/goffice-config.h $$hdrs_list | \
+-		sed -e 's/^#[ \t]*include[ \t]\+.*$$//g' | \
++		sed -e 's/^#[ 	]*include[ 	]\+.*$$//g' | \
+ 		$(CPP) $(AM_CPPFLAGS) "-DGO_VAR_DECL=__declspec(dllexport)" -P - > xgen-localdef.1 && \
+ 	perl $(top_srcdir)/dumpdef.pl \
+ 		xgen-localdef.1 > xgen-localdef.2 \
+diff -Nur goffice-0.3.2-old/gtk-doc.m4 goffice-0.3.2/gtk-doc.m4
+--- goffice-0.3.2-old/gtk-doc.m4	Thu Jan  1 00:00:00 1970
++++ goffice-0.3.2/gtk-doc.m4	Mon Oct 30 15:47:16 2006
+@@ -0,0 +1,53 @@
++dnl -*- mode: autoconf -*-
++
++# serial 1
++
++dnl Usage:
++dnl   GTK_DOC_CHECK([minimum-gtk-doc-version])
++AC_DEFUN([GTK_DOC_CHECK],
++[
++  AC_BEFORE([AC_PROG_LIBTOOL],[$0])dnl setup libtool first
++  AC_BEFORE([AM_PROG_LIBTOOL],[$0])dnl setup libtool first
++  dnl for overriding the documentation installation directory
++  AC_ARG_WITH(html-dir,
++    AC_HELP_STRING([--with-html-dir=PATH], [path to installed docs]),,
++    [with_html_dir='${datadir}/gtk-doc/html'])
++  HTML_DIR="$with_html_dir"
++  AC_SUBST(HTML_DIR)
++
++  dnl enable/disable documentation building
++  AC_ARG_ENABLE(gtk-doc,
++    AC_HELP_STRING([--enable-gtk-doc],
++                   [use gtk-doc to build documentation [default=no]]),,
++    enable_gtk_doc=no)
++
++  have_gtk_doc=no
++  if test x$enable_gtk_doc = xyes; then
++    if test -z "$PKG_CONFIG"; then
++      AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
++    fi
++    if test "$PKG_CONFIG" != "no" && $PKG_CONFIG --exists gtk-doc; then
++      have_gtk_doc=yes
++    fi
++
++  dnl do we want to do a version check?
++ifelse([$1],[],,
++    [gtk_doc_min_version=$1
++    if test "$have_gtk_doc" = yes; then
++      AC_MSG_CHECKING([gtk-doc version >= $gtk_doc_min_version])
++      if $PKG_CONFIG --atleast-version $gtk_doc_min_version gtk-doc; then
++        AC_MSG_RESULT(yes)
++      else
++        AC_MSG_RESULT(no)
++        have_gtk_doc=no
++      fi
++    fi
++])
++    if test "$have_gtk_doc" != yes; then
++      enable_gtk_doc=no
++    fi
++  fi
++
++  AM_CONDITIONAL(ENABLE_GTK_DOC, test x$enable_gtk_doc = xyes)
++  AM_CONDITIONAL(GTK_DOC_USE_LIBTOOL, test -n "$LIBTOOL")
++])

Modified: gnucash/trunk/packaging/win32/install.sh
===================================================================
--- gnucash/trunk/packaging/win32/install.sh	2006-11-01 22:42:08 UTC (rev 15075)
+++ gnucash/trunk/packaging/win32/install.sh	2006-11-01 22:43:00 UTC (rev 15076)
@@ -260,6 +260,49 @@
     quiet $INTLTOOL_PERL --help || die "ActivePerl not installed correctly"
 }
 
+function inst_autotools() {
+    setup Autotools
+    _AUTOTOOLS_UDIR=`unix_path $AUTOTOOLS_DIR`
+    add_to_env $_AUTOTOOLS_UDIR/bin PATH
+    if quiet autoconf --help && quiet automake --help
+    then
+        echo "autoconf/automake already installed.  skipping."
+    else
+        wget_unpacked $AUTOCONF_URL $DOWNLOAD_DIR $TMP_DIR
+        wget_unpacked $AUTOMAKE_URL $DOWNLOAD_DIR $TMP_DIR
+        qpushd $TMP_UDIR/autoconf-*
+            echo "building autoconf..."
+            ./configure --prefix=$_AUTOTOOLS_UDIR
+            make
+            make install
+        qpopd
+        qpushd $TMP_UDIR/automake-*
+            echo "building automake..."
+            ./configure --prefix=$_AUTOTOOLS_UDIR
+            make
+            make install
+        qpopd
+    fi
+    if quiet ${LIBTOOLIZE} --help 
+    then
+        echo "libtool/libtoolize already installed.  skipping."
+    else
+        wget_unpacked $LIBTOOL_URL $DOWNLOAD_DIR $TMP_DIR
+        qpushd $TMP_UDIR/libtool-*
+            echo "building libtool..."
+            ./configure ${HOST_XCOMPILE} --prefix=$_AUTOTOOLS_UDIR
+            make
+            make install
+        qpopd
+    fi
+    add_to_env -I$_AUTOTOOLS_UDIR/include AUTOTOOLS_CPPFLAGS
+    add_to_env -L$_AUTOTOOLS_UDIR/lib AUTOTOOLS_LDFLAGS
+    add_to_env "-I $_AUTOTOOLS_UDIR/share/aclocal" ACLOCAL_FLAGS
+    quiet autoconf --help &&
+    quiet automake --help &&
+    quiet ${LIBTOOLIZE} --help || die "autotools not installed correctly"
+}
+
 function inst_guile() {
     setup Guile
     _GUILE_WFSDIR=`win_fs_path $GUILE_DIR`
@@ -273,8 +316,10 @@
         echo "guile and slib already installed.  skipping."
     else
         smart_wget $GUILE_URL $DOWNLOAD_DIR
+        _GUILE_BALL=$LAST_FILE
         smart_wget $SLIB_URL $DOWNLOAD_DIR
-        tar -xzpf $DOWNLOAD_UDIR/guile-*.tar.gz -C $TMP_UDIR
+        _SLIB_BALL=$LAST_FILE
+        tar -xzpf $_GUILE_BALL -C $TMP_UDIR
         qpushd $TMP_UDIR/guile-*
             qpushd ice-9
                 cp boot-9.scm boot-9.scm.bak
@@ -319,7 +364,7 @@
         _GUILE_MAJOR=`echo $_GUILE_UDIR/share/guile/1.* | sed 's,.*/,,'`
 	_SLIB_DIR=$GUILE_DIR\\share\\guile\\$_GUILE_MAJOR
 	mkdir -p $_SLIB_DIR
-	unzip $DOWNLOAD_DIR/slib*.zip -d $_SLIB_DIR
+	unzip $_SLIB_BALL -d $_SLIB_DIR
 	qpushd $_SLIB_DIR/slib
 	    cp guile.init guile.init.bak
             sed '/lambda.*'"'"'unix/a\
@@ -555,49 +600,6 @@
     quiet swig -version || die "swig unavailable"
 }
 
-function inst_autotools() {
-    setup Autotools
-    _AUTOTOOLS_UDIR=`unix_path $AUTOTOOLS_DIR`
-    add_to_env $_AUTOTOOLS_UDIR/bin PATH
-    if quiet autoconf --help && quiet automake --help
-    then
-        echo "autoconf/automake already installed.  skipping."
-    else
-        wget_unpacked $AUTOCONF_URL $DOWNLOAD_DIR $TMP_DIR
-        wget_unpacked $AUTOMAKE_URL $DOWNLOAD_DIR $TMP_DIR
-        qpushd $TMP_UDIR/autoconf-*
-            echo "building autoconf..."
-           ./configure --prefix=$_AUTOTOOLS_UDIR
-            make
-            make install
-        qpopd
-        qpushd $TMP_UDIR/automake-*
-            echo "building automake..."
-            ./configure --prefix=$_AUTOTOOLS_UDIR
-            make
-            make install
-        qpopd
-    fi
-    if quiet ${LIBTOOLIZE} --help 
-    then
-        echo "libtool/libtoolize already installed.  skipping."
-    else
-        wget_unpacked $LIBTOOL_URL $DOWNLOAD_DIR $TMP_DIR
-        qpushd $TMP_UDIR/libtool-*
-            echo "building libtool..."
-            ./configure ${HOST_XCOMPILE} --prefix=$_AUTOTOOLS_UDIR
-            make
-            make install
-        qpopd
-    fi
-    add_to_env -I$_AUTOTOOLS_UDIR/include AUTOTOOLS_CPPFLAGS
-    add_to_env -L$_AUTOTOOLS_UDIR/lib AUTOTOOLS_LDFLAGS
-    add_to_env "-I $_AUTOTOOLS_UDIR/share/aclocal" ACLOCAL_FLAGS
-    quiet autoconf --help &&
-    quiet automake --help &&
-    quiet ${LIBTOOLIZE} --help || die "autotools not installed correctly"
-}
-
 function inst_libgsf() {
     setup libGSF
     _LIBGSF_UDIR=`unix_path $LIBGSF_DIR`
@@ -609,9 +611,11 @@
     else
 	wget_unpacked $LIBGSF_URL $DOWNLOAD_DIR $TMP_DIR
 	qpushd $TMP_UDIR/libgsf-*
-	    ./configure ${HOST_XCOMPILE} --prefix=$_LIBGSF_UDIR \
-	    CPPFLAGS="${GNOME_CPPFLAGS}" \
-	    LDFLAGS="${GNOME_LDFLAGS}"
+	    ./configure ${HOST_XCOMPILE} \
+	        --prefix=$_LIBGSF_UDIR \
+	        --without-python \
+	        CPPFLAGS="${GNOME_CPPFLAGS}" \
+	        LDFLAGS="${GNOME_LDFLAGS}"
 	    make
 	    make install
 	qpopd
@@ -638,8 +642,8 @@
 	    automake
 	    autoconf
 	    ./configure ${HOST_XCOMPILE} --prefix=$_GOFFICE_UDIR \
-	    CPPFLAGS="${GNOME_CPPFLAGS}" \
-	    LDFLAGS="${GNOME_LDFLAGS}"
+	        CPPFLAGS="${GNOME_CPPFLAGS}" \
+	        LDFLAGS="${GNOME_LDFLAGS}"
 	    [ -f dumpdef.pl ] || cp -p ../libgsf-*/dumpdef.pl .
 	    make
 	    make install
@@ -759,7 +763,7 @@
 
     # Create a startup script that works without the msys shell
     qpushd ${_GNUCASH_WFSDIR}/bin
-    echo "set PATH=${GNUCASH_DIR}\\bin;${GNUCASH_DIR}\\lib\\bin;${GOFFICE_DIR}\\bin;${LIBGSF_DIR}\\bin;${GNOME_DIR}\\bin;${LIBXML2_DIR}\\bin;${GUILE_DIR}\\bin;${REGEX_DIR}\\bin;${AUTOTOOLS_DIR}\\bin" > gnucash.bat
+    echo "set PATH=${GNUCASH_DIR}\\bin;${GNUCASH_DIR}\\lib\\bin;${GOFFICE_DIR}\\bin;${LIBGSF_DIR}\\bin;${GNOME_DIR}\\bin;${LIBXML2_DIR}\\bin;${GUILE_DIR}\\bin;${REGEX_DIR}\\bin;${AUTOTOOLS_DIR}\\bin;%PATH%" > gnucash.bat
     echo "set GUILE_WARN_DEPRECATED=no" >> gnucash.bat
     echo "set GNC_MODULE_PATH=${GNUCASH_DIR}\\lib\\gnucash" >> gnucash.bat
     echo "set GUILE_LOAD_PATH=${GNUCASH_DIR}\\share\\gnucash\\guile-modules;${GNUCASH_DIR}\\share\\gnucash\\scm;%GUILE_LOAD_PATH%" >> gnucash.bat



More information about the gnucash-changes mailing list