From 678d9f2a42faa84cf934bbb75a5b4414a094012e Mon Sep 17 00:00:00 2001 From: Harco de Hilster Date: Sat, 17 Jul 1999 21:53:06 +0000 Subject: [PATCH] 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 --- acconfig.h | 2 -- src/common/zstream.cpp | 5 +++-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/acconfig.h b/acconfig.h index cefc7c90ff..b3df8c6f0d 100644 --- a/acconfig.h +++ b/acconfig.h @@ -5,8 +5,6 @@ #ifndef __GTKSETUPH__ #define __GTKSETUPH__ -#define USING_CONFIGURE - #ifdef __GNUG__ #pragma interface #endif diff --git a/src/common/zstream.cpp b/src/common/zstream.cpp index 8e444b4b5f..bf1a80fd61 100644 --- 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. - -#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" -- 2.45.2