From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Sat, 8 May 2004 08:57:44 +0000 (+0000)
Subject: add -Icontrib/include when using --inplace
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/127e9080f171d2142673984a4a30d077caae711f

add -Icontrib/include when using --inplace


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

diff --git a/wx-config.in b/wx-config.in
index 82b7a8aac6..d052b469eb 100755
--- a/wx-config.in
+++ b/wx-config.in
@@ -14,7 +14,7 @@ is_monolithic="@MONOLITHIC@"
 cross_compiling="@cross_compiling@"
 target="@host_alias@"
 static_flag="@STATIC_FLAG@"
-
+inplace_flag="no"
 
 # Misc configuration variables:
 
@@ -232,6 +232,13 @@ cppflags()
 
     includes="-I${libdir}/wx/include/${TOOLCHAIN_NAME}$includes"
 
+    # in inplace case we need to also add path to contrib headers -- do it
+    # unconditionnally as they might be used and we have no way of knowing if
+    # they really are
+    if test $inplace_flag = yes ; then
+        includes="$includes -I${prefix}/contrib/include"
+    fi
+
     if test $static_flag = yes ; then
         echo $includes ${WXDEBUG_DEFINE} ${TOOLCHAIN_DEFS} ${WXCONFIG_INCLUDE} ${WX_LARGEFILE_FLAGS}
     else
@@ -254,6 +261,7 @@ while test $# -gt 0; do
       prefix=`makeabs $srcdir`
       exec_prefix=`makeabs $builddir`
       exec_prefix_set=yes
+      inplace_flag=yes
       update_prefixes
       ;;
     --prefix=*)