Removed USING_CONFIGURE define. As VZ pointed out, checking HAVE_CONFIG_H

is enough to find out wether we're building with configure.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@3030 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/acconfig.h b/acconfig.h
index cefc7c90ff9191d53c5621a9388512720b7ea627..b3df8c6f0ddfbb7008c4b156069cea53350cab08 100644 (file)
--- a/acconfig.h
+++ b/acconfig.h
@@ -5,8 +5,6 @@
 #ifndef __GTKSETUPH__
 #define __GTKSETUPH__
 
 #ifndef __GTKSETUPH__
 #define __GTKSETUPH__
 

-#define USING_CONFIGURE
-

 #ifdef __GNUG__
     #pragma interface
 #endif
 #ifdef __GNUG__
     #pragma interface
 #endif

diff --git a/src/common/zstream.cpp b/src/common/zstream.cpp
index 8e444b4b5f6effe4c615249ac30b0b89f3634080..bf1a80fd61bf5fd3bb4365366b16b3c93cad3dc9 100644 (file)
--- a/src/common/zstream.cpp
+++ b/src/common/zstream.cpp
@@ -29,8 +29,9 @@
 
 // When using configure, the path must be "zlib.h" I don't know
 // what other ports (wxMac, wxMotif without configure) need here.
 
 // When using configure, the path must be "zlib.h" I don't know
 // what other ports (wxMac, wxMotif without configure) need here.

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

    #include "..\zlib\zlib.h"
 #else
    #include "zlib.h"
    #include "..\zlib\zlib.h"
 #else
    #include "zlib.h"