the sample now builds in Unicode mode

[wxWidgets.git] / wx-config.in

diff --git a/wx-config.in b/wx-config.in
index f0380ce4312856d3d222e8a3989fab65f0a833cb..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@
 LD="@SHARED_LD@"
 cross_compiling=@cross_compiling@
 target=@host_alias@

-static_flag=no
+static_flag=@STATIC_FLAG@

 
 usage()
 {
 
 usage()
 {


@@ -32,6 +32,7 @@ cppflags()
 {
     if test "@includedir@" != "/usr/include" \
             -a "@includedir@" != "/usr/include/c++" \
 {
     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
             -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
     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
     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
 }
 
     fi
 }
 


@@ -104,9 +105,9 @@ while test $# -gt 0; do
       fi
 
       if test $static_flag = yes ; then
       fi
 
       if test $static_flag = yes ; then

-          echo "$libs @LDFLAGS@ @libdir@/@WXCONFIG_LIBS_STATIC@ @LIBS@ @DMALLOC_LIBS@"
+          echo "$libs @LDFLAGS@ @WXCONFIG_RPATH@ @libdir@/@WXCONFIG_LIBS_STATIC@ @LIBS@ @DMALLOC_LIBS@"

       else
       else

-          echo $libs @LDFLAGS@ @WXCONFIG_LIBS@ @DMALLOC_LIBS@
+          echo $libs @LDFLAGS@ @WXCONFIG_RPATH@ @WXCONFIG_LIBS@ @DMALLOC_LIBS@

       fi
 
       ;;
       fi
 
       ;;