From 44a5856d5ec4612f71a4466106e311e205f37032 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Tue, 14 May 2002 11:09:53 +0000 Subject: [PATCH] wanted to fix zlib include path but it turned out to be already ok so I just added a comment saying why should it be left like this git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@15554 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- configure.in | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/configure.in b/configure.in index a4ddb8cc1f..0b260b85d2 100644 --- a/configure.in +++ b/configure.in @@ -4760,8 +4760,16 @@ fi dnl all -I options we must pass to the compiler -INCLUDES="-I\${top_builddir}/lib/wx/include/${TOOLCHAIN_NAME} -I\${top_srcdir}/include \ -$REGEX_INCLUDE $ZLIB_INCLUDE $PNG_INCLUDE $JPEG_INCLUDE $TIFF_INCLUDE $TOOLKIT_INCLUDE" +dnl +dnl note that the order is somewhat important, in particular the ZLIB_INCLUDE +dnl and other stuff for the built in libraries should come first to avoid +dnl including the system headers with the same name (it is particularly +dnl important for zlib because XFree 4.2.0 has its own, horribly old and +dnl incompatible, zlib.h) and the wxWindows headers should come first anyhow +INCLUDES="-I\${top_builddir}/lib/wx/include/${TOOLCHAIN_NAME} \ +-I\${top_srcdir}/include \ +$REGEX_INCLUDE $ZLIB_INCLUDE $PNG_INCLUDE $JPEG_INCLUDE $TIFF_INCLUDE \ +$TOOLKIT_INCLUDE" dnl wxGTK does not need TOOLKIT includes in wx-config if test "$wxUSE_GTK" = 1; then -- 2.47.2