From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Tue, 14 Mar 2000 17:09:45 +0000 (+0000)
Subject: removed -Icontrib from src/make.env, use APPEXTRADEFS for such things instead
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/8461a0598cfc7adbae539ce2e8f0e6b717bff313?ds=sidebyside

removed -Icontrib from src/make.env, use APPEXTRADEFS for such things instead


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

diff --git a/configure b/configure
index 0bb1b0b499..3205d0024a 100755
--- a/configure
+++ b/configure
@@ -13731,7 +13731,7 @@ fi
 
 LD_LIBS="\${top_builddir}/lib/${WX_LIBRARY_NAME_STATIC} $EXTRA_LIBS"
 
-INCLUDES="-I. -I\${top_builddir}/include -I\${top_srcdir}/include -I\${top_srcdir}/contrib/include $ZLIB_INCLUDE $PNG_INCLUDE $JPEG_INCLUDE $TIFF_INCLUDE $TOOLKIT_INCLUDE"
+INCLUDES="-I. -I\${top_builddir}/include -I\${top_srcdir}/include $ZLIB_INCLUDE $PNG_INCLUDE $JPEG_INCLUDE $TIFF_INCLUDE $TOOLKIT_INCLUDE"
 
 if test "$GXX" = yes ; then
         CXXWARNINGS="-Wall"
diff --git a/configure.in b/configure.in
index 9e61439306..f97b4b45c3 100644
--- a/configure.in
+++ b/configure.in
@@ -3534,7 +3534,7 @@ dnl makefile system without libtool
 LD_LIBS="\${top_builddir}/lib/${WX_LIBRARY_NAME_STATIC} $EXTRA_LIBS"
 
 dnl all -I options we must pass to the compiler
-INCLUDES="-I. -I\${top_builddir}/include -I\${top_srcdir}/include -I\${top_srcdir}/contrib/include $ZLIB_INCLUDE $PNG_INCLUDE $JPEG_INCLUDE $TIFF_INCLUDE $TOOLKIT_INCLUDE"
+INCLUDES="-I. -I\${top_builddir}/include -I\${top_srcdir}/include $ZLIB_INCLUDE $PNG_INCLUDE $JPEG_INCLUDE $TIFF_INCLUDE $TOOLKIT_INCLUDE"
 
 dnl C/C++ compiler options used to compile wxWindows
 if test "$GXX" = yes ; then
diff --git a/src/make.env.in b/src/make.env.in
index 289b3bf062..e727bacff9 100644
--- a/src/make.env.in
+++ b/src/make.env.in
@@ -20,7 +20,7 @@ TOOLKITDIR = @TOOLKIT_DIR@
 WXLIB = @WX_LIBRARY_NAME_STATIC@
 WXSHLIB = @WX_LIBRARY_NAME_SHARED@
 
-EXTRADEFS="-DwxINSTALL_PREFIX=\"@prefix@\""
+EXTRADEFS="-DwxINSTALL_PREFIX=\"@prefix@\"" $(APPEXTRADEFS)
 
 ########################### VERSION #################################