diff --git a/aclocal.m4 b/aclocal.m4
index 0d3d3c767..44421f6c6 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -64,17 +64,22 @@ fi
 # Combined check for several flavors of Microsoft Windows so
 # their "issues" can be dealt with
 AC_DEFUN([AX_WIN32],
-[AC_CYGWIN
-AC_MINGW32
-WIN32=no
-AC_MSG_CHECKING([for Microsoft Windows])
-if test "$CYGWIN" = "yes" -o "$MINGW32" = "yes"
-then
-    WIN32=yes
-fi
+[AC_MSG_CHECKING([for Microsoft Windows])
+AC_REQUIRE([AC_CANONICAL_HOST]) []dnl
+case $host_os in
+     *cygwin*) MINGW32=no;  WIN32=yes;;
+
+      *mingw*) MINGW32=yes; WIN32=yes;;
+
+            *) MINGW32=no;  WIN32=no;;
+esac
 AC_SUBST(MINGW32)
 AC_SUBST(WIN32)
 AC_MSG_RESULT($WIN32)
+if test $WIN32 = yes; then
+AC_MSG_CHECKING([for MinGW])
+AC_MSG_RESULT($MINGW32)
+fi
 ])# AX_WIN32
 
 # AX_LD_EXTRALIBS
diff --git a/configure.in b/configure.in
index ff001db97..7f599e03d 100644
--- a/configure.in
+++ b/configure.in
@@ -122,6 +122,6 @@ AX_C_UNDERSCORES_TRAILING
 #######################
 
 # XXX disable tgt-fpga for the moment
-AC_CONFIG_SUBDIRS(vvp vpi tgt-stub tgt-null tgt-vvp tgt-vhdl libveriuser cadpli)
+AC_CONFIG_SUBDIRS(vvp vpi tgt-stub tgt-vvp tgt-vhdl libveriuser cadpli)
 
 AC_OUTPUT(Makefile ivlpp/Makefile driver/Makefile driver-vpi/Makefile tgt-null/Makefile tgt-verilog/Makefile tgt-pal/Makefile)
diff --git a/vpi/configure.in b/vpi/configure.in
index 9b671d539..276b72356 100644
--- a/vpi/configure.in
+++ b/vpi/configure.in
@@ -29,8 +29,6 @@ AC_SUBST(EXEEXT)
 # Combined check for Microsoft-related bogosities; sets WIN32 if found
 AX_WIN32
 
-AX_CPP_IDENT
-
 AC_CHECK_HEADERS(malloc.h inttypes.h)
 
 AC_CHECK_LIB(z, gzwrite)