[goffice] compilation: fix backend selection.

[Morten Welinder <mortenw src gnome org>]

commit 8d3642d8fd629cabefbc8883685d0524c8d3e52e
Author: Morten Welinder <terra gnome org>
Date:   Wed Mar 16 20:58:01 2011 -0400

    compilation: fix backend selection.

 ChangeLog    |    4 ++++
 configure.in |   54 +++++++++++++++++++++++++++---------------------------
 2 files changed, 31 insertions(+), 27 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 982f7fc..933fb38 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2011-03-16  Morten Welinder  <terra gnome org>
+
+	* configure.in: Fix backend selection by testing for win32 first.
+
 2011-03-16  Jean Brefort  <jean brefort normalesup org>
 
 	* goffice/gtk/go-gtk-compat.h: fix gtk_widget_send_focus_change
diff --git a/configure.in b/configure.in
index fa37f6f..05b8f41 100644
--- a/configure.in
+++ b/configure.in
@@ -135,6 +135,33 @@ fi
 
 AM_CONDITIONAL(GOFFICE_WITH_LASEM, $goffice_with_lasem)
 
+dnl *****************************
+AC_MSG_CHECKING([for Win32 platform])
+with_win32=no
+with_native_win32=no
+case $host_os in
+  mingw* | pw32* | cygwin*)
+    with_win32=yes
+    GOFFICE_PLUGIN_LDFLAGS="-Wl,--enable-runtime-pseudo-reloc,--export-all-symbols $GOFFICE_PLUGIN_LDFLAGS"
+    ;;
+esac
+AC_MSG_RESULT($with_win32)
+AM_CONDITIONAL(WITH_WIN32, test $with_win32 = yes)
+
+AC_MSG_CHECKING([for Win32 platform with no Cygwin])
+case $host_os in
+  mingw* | pw32*)
+    with_native_win32=yes
+    AC_ARG_VAR(WINDRES, [The windres executable (used by win32 builds only).])
+    AC_CHECK_TOOL(WINDRES, windres)
+    AC_ARG_VAR(LIBEXE, [The lib.exe executable (used by win32 builds only).])
+    AC_CHECK_PROG(LIBEXE, lib.exe, yes, no)
+    ;;
+esac
+AC_MSG_RESULT($with_native_win32)
+AM_CONDITIONAL(WITH_NATIVE_WIN32, test $with_native_win32 = yes)
+AM_CONDITIONAL(HAVE_LIBEXE, test x$LIBEXE = xyes)
+
 dnl ***********************************
 dnl Which conf backend should be used?
 dnl ***********************************
@@ -262,33 +289,6 @@ fi
 unset xrender_libs
 
 dnl *****************************
-AC_MSG_CHECKING([for Win32 platform])
-with_win32=no
-with_native_win32=no
-case $host_os in
-  mingw* | pw32* | cygwin*)
-    with_win32=yes
-    GOFFICE_PLUGIN_LDFLAGS="-Wl,--enable-runtime-pseudo-reloc,--export-all-symbols $GOFFICE_PLUGIN_LDFLAGS"
-    ;;
-esac
-AC_MSG_RESULT($with_win32)
-AM_CONDITIONAL(WITH_WIN32, test $with_win32 = yes)
-
-AC_MSG_CHECKING([for Win32 platform with no Cygwin])
-case $host_os in
-  mingw* | pw32*)
-    with_native_win32=yes
-    AC_ARG_VAR(WINDRES, [The windres executable (used by win32 builds only).])
-    AC_CHECK_TOOL(WINDRES, windres)
-    AC_ARG_VAR(LIBEXE, [The lib.exe executable (used by win32 builds only).])
-    AC_CHECK_PROG(LIBEXE, lib.exe, yes, no)
-    ;;
-esac
-AC_MSG_RESULT($with_native_win32)
-AM_CONDITIONAL(WITH_NATIVE_WIN32, test $with_native_win32 = yes)
-AM_CONDITIONAL(HAVE_LIBEXE, test x$LIBEXE = xyes)
-
-dnl *****************************
 dnl FIXME: perhaps declare with AC_ARG_VAR?
 dnl	   If we use the initial value of a variable, we have to make it precious.
 dnl