diff --git a/ChangeLog b/ChangeLog
index bb7ad4a..2a3a9c0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2009-04-11  Bruno Haible  <bruno@clisp.org>
+
+	* configure.ac: Move the statements for WOE32 and WINDRES.
+
 2009-03-26  Bruno Haible  <bruno@clisp.org>
 
 	* Version 1.13 released.
diff --git a/configure.ac b/configure.ac
index ba76b1f..e12e99c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -83,6 +83,19 @@
 dnl sets the RC variable to a program that compiles Windows resource files.
 LT_LANG([Windows Resource])
 
+dnl On mingw and Cygwin, we can activate special Makefile rules which add
+dnl version information to the executables.
+case "$host_os" in
+  mingw* | cygwin*) is_woe32=yes ;;
+  *) is_woe32=no ;;
+esac
+WOE32=$is_woe32
+AC_SUBST([WOE32])
+if test $WOE32 = yes; then
+  dnl Check for a program that compiles Windows resource files.
+  AC_CHECK_TOOL([WINDRES], [windres])
+fi
+
 gl_VISIBILITY
 AM_ICONV
 AM_GNU_GETTEXT([external], [need-ngettext])
@@ -172,19 +185,6 @@
 fi
 AC_SUBST([DLL_VARIABLE])
 
-dnl On mingw and Cygwin, we can activate special Makefile rules which add
-dnl version information to the executables.
-case "$host_os" in
-  mingw* | cygwin*) is_woe32=yes ;;
-  *) is_woe32=no ;;
-esac
-WOE32=$is_woe32
-AC_SUBST([WOE32])
-if test $WOE32 = yes; then
-  dnl Check for a program that compiles Windows resource files.
-  AC_CHECK_TOOL([WINDRES], [windres])
-fi
-
 AH_BOTTOM([
 /* On Windows, variables that may be in a DLL must be marked specially.  */
 #if defined _MSC_VER && defined _DLL