-// If we are building with ./configure, we trust the zlib path is
-// given as a -I option.
-#if defined(__WXMSW__) && !defined(HAVE_CONFIG_H)
+// If we are building with configure (defines __WX_SETUP_H__),
+// we trust the zlib path is given as a -I option.
+#if defined(__WXMSW__) && !defined(__WX_SETUP_H__)