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 0bb1b0b499e0270c71b25b8591344c715f5b6222..3205d0024a225199fb8599c5f5b4c2021eb968ef 100755 (executable)
--- a/configure
+++ b/configure
@@ -13731,7 +13731,7 @@ fi
 
 LD_LIBS="\${top_builddir}/lib/${WX_LIBRARY_NAME_STATIC} $EXTRA_LIBS"
 
 
 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"
 
 if test "$GXX" = yes ; then
         CXXWARNINGS="-Wall"

diff --git a/configure.in b/configure.in
index 9e614393063a3572c4b1625701fbe6979113dfb9..f97b4b45c3da216f8c3e5350f204a50a1e1331c7 100644 (file)
--- 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
 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
 
 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 289b3bf062add7be9220e115db0ba1e266a93d93..e727bacff93afc4ce095529dbcc49dad3fbefb61 100644 (file)
--- 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@
 
 WXLIB = @WX_LIBRARY_NAME_STATIC@
 WXSHLIB = @WX_LIBRARY_NAME_SHARED@
 

-EXTRADEFS="-DwxINSTALL_PREFIX=\"@prefix@\""
+EXTRADEFS="-DwxINSTALL_PREFIX=\"@prefix@\"" $(APPEXTRADEFS)

 
 ########################### VERSION #################################
 
 
 ########################### VERSION #################################