diff --git a/configure.ac b/configure.ac
index 45a693d2a0b54ec4befc3c3a1f77a2b75b6275e1..57a5c24b4faaf6437d42b10c191e1553ee99f4c8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -357,28 +357,19 @@ else
     AC_PATH_TOOL([AR],[ar])
     AC_PATH_TOOL([RANLIB],[ranlib])
     AC_PATH_TOOL([OBJDUMP],[objdump])
-    AC_PATH_TOOL([Windres],[windres])
+    AC_PATH_TOOL([WindresCmd],[windres])
     AC_PATH_TOOL([Genlib],[genlib])
 
-    HAVE_GENLIB=False
     if test "$HostOS" = "mingw32"; then
-        AC_CHECK_TARGET_TOOL([Windres],[windres])
+        AC_CHECK_TARGET_TOOL([WindresCmd],[windres])
         AC_CHECK_TARGET_TOOL([OBJDUMP],[objdump])
 
         if test "$Genlib" != ""; then
             GenlibCmd="$(cygpath -m $Genlib)"
-            HAVE_GENLIB=True
         fi
     fi
 fi
 
-if test "$HostOS" = "mingw32"; then
-    WindresCmd="$Windres"
-    AC_SUBST([WindresCmd])
-    AC_SUBST([GenlibCmd])
-    AC_SUBST([HAVE_GENLIB])
-fi
-
 FP_ICONV
 FP_GMP
 FP_CURSES
diff --git a/distrib/configure.ac.in b/distrib/configure.ac.in
index 5095af3ac2ffc81f51a67312cf2a6d49570a08b1..d1493fff45915b94b6e0c3cb890e073e174c46d0 100644
--- a/distrib/configure.ac.in
+++ b/distrib/configure.ac.in
@@ -107,13 +107,6 @@ if test "$HostOS" = "mingw32" -a "$EnableDistroToolchain" = "NO"; then
   FP_SETUP_WINDOWS_TOOLCHAIN([$hardtop/mingw/], [\$\$topdir/../mingw/])
 fi
 
-if test "$HostOS" = "mingw32"; then
-    WindresCmd="$Windres"
-    AC_SUBST([WindresCmd])
-    AC_SUBST([GenlibCmd])
-    AC_SUBST([HAVE_GENLIB])
-fi
-
 dnl ** Which gcc to use?
 dnl --------------------------------------------------------------
 AC_PROG_CC([gcc clang])
diff --git a/m4/fp_setup_windows_toolchain.m4 b/m4/fp_setup_windows_toolchain.m4
index ac79f2977dd48ddff8e192054d4f253f52a67a05..7efd1fd57bbb0164f5d5e9d95b1bc04b6d824461 100644
--- a/m4/fp_setup_windows_toolchain.m4
+++ b/m4/fp_setup_windows_toolchain.m4
@@ -132,7 +132,7 @@ AC_DEFUN([FP_SETUP_WINDOWS_TOOLCHAIN],[
     RANLIB="${mingwbin}llvm-ranlib.exe"
     OBJDUMP="${mingwbin}llvm-objdump.exe"
     DLLTOOL="${mingwbin}llvm-dlltool.exe"
-    Windres="${mingwbin}llvm-windres.exe"
+    WindresCmd="${mingwbin}llvm-windres.exe"
 
     # N.B. LLD does not support -r
     MergeObjsCmd=""