diff -r f6ed423fab8b -r 49c33f0323e1 configure.ac
--- a/configure.ac	Fri Jan 01 12:46:59 2021 -0600
+++ b/configure.ac	Fri Jan 01 13:52:34 2021 -0600
@@ -2749,15 +2749,21 @@
   AC_MSG_RESULT()
   failed=0
   passed=0
-  found_libgdi32=0
+  #found_libgdi32=0
   AC_CHECK_HEADER([windows.h],[passed=`expr $passed + 1`],[failed=`expr $failed + 1`])
+  AC_CHECK_HEADER([winuser.h],[passed=`expr $passed + 1`],[failed=`expr $failed + 1`],[#include <windows.h>])
   AC_CHECK_HEADER([wingdi.h],[passed=`expr $passed + 1`],[failed=`expr $failed + 1`],[#include <windows.h>])
-  AC_CHECK_LIB([gdi32],[OpenClipboard],[found_libgdi32=`expr $found_libgdi32 + 1`],,)
-  if test $found_libgdi32 -gt 0
+  # For some reason MSYS2 and Cygwin i686 build fails library tests.
+  #AC_CHECK_LIB([gdi32],[OpenClipboard],[found_libgdi32=`expr $found_libgdi32 + 1`],,)
+  #if test $found_libgdi32 -gt 0
+  #then
+  #  passed=`expr $passed + 1`
+  #else
+  #  failed=`expr $failed + 1`
+  #fi
+  if test "$cygwin_build" = yes -o "$native_win32_build" = yes
   then
     passed=`expr $passed + 1`
-  else
-    failed=`expr $failed + 1`
   fi
   AC_MSG_CHECKING([if Windows GDI32 support is complete])
   if test $passed -gt 0
@@ -2767,7 +2773,7 @@
       AC_MSG_RESULT([no -- some components failed test])
       have_gdi32='no (failed tests)'
     else
-      LIB_GDI32='-lgdi32'
+      LIB_GDI32='-lgdi32 -luser32'
       LIBS="$LIB_GDI32 $LIBS"
       AC_DEFINE([HasWINGDI32],[1],[Define to use the Windows GDI32 library])
       AC_MSG_RESULT([yes])
