Now uses #define __WX_SETUP_H__ to signify that we're using configure

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

diff --git a/acconfig.h b/acconfig.h
index b3df8c6f0ddfbb7008c4b156069cea53350cab08..72918fca307fa33d8c2116e0421551e1ec33e1fc 100644 (file)
--- a/acconfig.h
+++ b/acconfig.h
@@ -2,8 +2,10 @@
 /*                                                                         */
 /* Version: $Id$                                                           */
 
 /*                                                                         */
 /* Version: $Id$                                                           */
 

-#ifndef __GTKSETUPH__
-#define __GTKSETUPH__
+/* This define (__WX_SETUP_H__) is used both to insure setup.h is included 
+ * only once and to indicate that we are building using configure. */
+#ifndef __WX_SETUP_H__
+#define __WX_SETUP_H__

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


@@ -611,4 +613,4 @@
 
 @BOTTOM@
 
 
 @BOTTOM@
 

-#endif /* __GTKSETUPH__ */
+#endif /* __WX_SETUP_H__ */

diff --git a/src/common/zstream.cpp b/src/common/zstream.cpp
index ac6f482ae0bdfdeed446798dc8017641137e1529..8ccb8710db3fe5e622d065a4742c6609a0fcf3d5 100644 (file)
--- a/src/common/zstream.cpp
+++ b/src/common/zstream.cpp
@@ -29,9 +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 we are building with ./configure, we trust the zlib path is 
-// given as a -I option. (confusingly configure defines __GTKSETUPH__)
-#if defined(__WXMSW__) && !defined(__GTKSETUPH__)
+// 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__)

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