fixes to help win64

win hates out of order -l flags, so make sure gsf is after goffice

win has trouble with indirect deps, so explicitly include gmodule

Author: jcupitt

ChangeLog

@@ -1,5 +1,6 @@
 started 8.3.1 on 19/5/16
 - disable debug by default, thanks Benjamin
+- configure changes to help win64
 
 started 8.3.0 on 28/3/16
 - move path search stuff into _convert from _magick

configure.ac

@@ -154,7 +154,7 @@ rm -f conftest.l $LEX_OUTPUT_ROOT.c
 # gtk before 2.4.9 crashes with the way we use combobox :-(
 # vips before 7.30 used "vips-x.y" as the pkg name
 PKG_CHECK_MODULES(REQUIRED_PACKAGES, 
-  gthread-2.0 gtk+-2.0 >= 2.4.9 libxml-2.0 vips >= 7.30)
+  gmodule-2.0 gthread-2.0 gtk+-2.0 >= 2.4.9 libxml-2.0 vips >= 7.30)
 IP_CFLAGS="$REQUIRED_PACKAGES_CFLAGS $IP_CFLAGS"
 IP_LIBS="$REQUIRED_PACKAGES_LIBS $IP_LIBS"
 
@@ -248,10 +248,24 @@ if test "x$with_fftw3" != "xno"; then
   IP_LIBS="$FFTW3_LIBS $IP_LIBS"
 fi
 
+# goffice needs libgsf to save plots to files
+AC_ARG_WITH([libgsf], AS_HELP_STRING([--without-libgsf], [build without libgsf (default: test)]))
+
+if test "x$with_libgsf" != "xno"; then
+  PKG_CHECK_MODULES(LIBGSF, libgsf-1,
+    [AC_DEFINE(HAVE_LIBGSF,1,[define if you have libgsf installed.])
+     with_libgsf=yes
+    ],
+    [AC_MSG_WARN([libgsf not found; disabling save plot to file])
+     with_libgsf=no
+    ])
+  IP_CFLAGS="$LIBGSF_CFLAGS $LIBGSF_INCLUDES $IP_CFLAGS"
+  IP_LIBS="$LIBGSF_LIBS $IP_LIBS"
+fi
+
 # optional ... use libgoffice to draw plots
 # pretty basic functionality, really, but we need to be able to build without
 # it for testing
-# libgoffice 0.6.x is too buggy, build 0.7.x to get the 0.8 package
 AC_ARG_WITH([libgoffice], AS_HELP_STRING([--without-libgoffice], [build without libgoffice (default: test)]))
 
 if test "x$with_libgoffice" != "xno"; then
@@ -266,21 +280,6 @@ if test "x$with_libgoffice" != "xno"; then
   IP_LIBS="$LIBGOFFICE_LIBS $IP_LIBS"
 fi
 
-# use libgsf to save goffice plots to files
-AC_ARG_WITH([libgsf], AS_HELP_STRING([--without-libgsf], [build without libgsf (default: test)]))
-
-if test "x$with_libgsf" != "xno"; then
-  PKG_CHECK_MODULES(LIBGSF, libgsf-1,
-    [AC_DEFINE(HAVE_LIBGSF,1,[define if you have libgsf installed.])
-     with_libgsf=yes
-    ],
-    [AC_MSG_WARN([libgsf not found; disabling save plot to file])
-     with_libgsf=no
-    ])
-  IP_CFLAGS="$LIBGSF_CFLAGS $LIBGSF_INCLUDES $IP_CFLAGS"
-  IP_LIBS="$LIBGSF_LIBS $IP_LIBS"
-fi
-
 # optional ... use libgvc to draw graphs of workspace dependencies
 AC_ARG_WITH([libgvc], AS_HELP_STRING([--without-libgvc], [build without libgvc (default: test)]))