diff --git a/configure b/configure
index 742521dc4..0ca660911 100755
--- a/configure
+++ b/configure
@@ -5852,45 +5852,6 @@ _ACEOF
 
   LIBS="-lwsock32 $LIBS"
 
-fi
-
-      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -lcomdlg32" >&5
-$as_echo_n "checking for main in -lcomdlg32... " >&6; }
-if ${ac_cv_lib_comdlg32_main+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-lcomdlg32  $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-
-int
-main ()
-{
-return main ();
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_lib_comdlg32_main=yes
-else
-  ac_cv_lib_comdlg32_main=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_comdlg32_main" >&5
-$as_echo "$ac_cv_lib_comdlg32_main" >&6; }
-if test "x$ac_cv_lib_comdlg32_main" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_LIBCOMDLG32 1
-_ACEOF
-
-  LIBS="-lcomdlg32 $LIBS"
-
 fi
 
     else
@@ -5931,6 +5892,45 @@ _ACEOF
 
   LIBS="-lwsock32 $LIBS"
 
+fi
+
+      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -lcomdlg32" >&5
+$as_echo_n "checking for main in -lcomdlg32... " >&6; }
+if ${ac_cv_lib_comdlg32_main+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-lcomdlg32  $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+
+int
+main ()
+{
+return main ();
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_lib_comdlg32_main=yes
+else
+  ac_cv_lib_comdlg32_main=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_comdlg32_main" >&5
+$as_echo "$ac_cv_lib_comdlg32_main" >&6; }
+if test "x$ac_cv_lib_comdlg32_main" = xyes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_LIBCOMDLG32 1
+_ACEOF
+
+  LIBS="-lcomdlg32 $LIBS"
+
 fi
 
     fi
diff --git a/configure.in b/configure.in
index a367736f4..05f302000 100755
--- a/configure.in
+++ b/configure.in
@@ -681,9 +681,9 @@ then
       CC="${CC}  -mno-cygwin"
       CXX="${CXX}  -mno-cygwin"
       AC_CHECK_LIB(wsock32,main)
-      AC_CHECK_LIB(comdlg32,main)
     else
       AC_CHECK_LIB(wsock32,main)
+      AC_CHECK_LIB(comdlg32,main)
     fi
     EXTRA_LIBS_FOR_DLLS="\$(abs_top_builddir)/yap.dll $EXTRA_LIBS_FOR_DLLS"
     AC_CHECK_LIB(psapi,main)