src/common/strconv.cpps/wcslen/wxWcslen/g

[wxWidgets.git] / wx-config.in

diff --git a/wx-config.in b/wx-config.in
index 7ce8e5c361b8c95b651f9b81b9a2a88f10f645c6..d6e090754ce182964882156df3bb53dfcd4b28eb 100755 (executable)
--- a/wx-config.in
+++ b/wx-config.in
@@ -8,7 +8,7 @@ CXX="@CXX@"
 LD="@SHARED_LD@"
 cross_compiling=@cross_compiling@
 target=@host_alias@
-static_flag=no
+static_flag=@STATIC_FLAG@
 
 usage()
 {
@@ -32,6 +32,7 @@ cppflags()
 {
     if test "@includedir@" != "/usr/include" \
             -a "@includedir@" != "/usr/include/c++" \
+            -a "@includedir@" != "/usr/local/include" \
             -a \( "${cross_compiling}" != "yes" \
                   -o "@includedir@" != "/usr/${target}/include" \) ;
     then
@@ -41,9 +42,9 @@ cppflags()
     includes="-I@libdir@/wx/include/@TOOLCHAIN_NAME@ $includes"
 
     if test $static_flag = yes ; then
-        echo $includes @WXDEBUG_DEFINE@ @TOOLCHAIN_DEFS@ @WXCONFIG_INCLUDE@
+        echo $includes @WXDEBUG_DEFINE@ @TOOLCHAIN_DEFS@ @WXCONFIG_INCLUDE@ @WX_LARGEFILE_FLAGS@
     else
-        echo $includes @WXDEBUG_DEFINE@ @TOOLCHAIN_DEFS@ @TOOLCHAIN_DLL_DEFS@ @WXCONFIG_INCLUDE@
+        echo $includes @WXDEBUG_DEFINE@ @TOOLCHAIN_DEFS@ @TOOLCHAIN_DLL_DEFS@ @WXCONFIG_INCLUDE@ @WX_LARGEFILE_FLAGS@
     fi
 }