Weekly catch-up

[wxWidgets.git] / wx-config.in

diff --git a/wx-config.in b/wx-config.in
index 7c9760b9039783cd398924e6cb465a3621ac17f0..d6e090754ce182964882156df3bb53dfcd4b28eb 100755 (executable)
--- a/wx-config.in
+++ b/wx-config.in
@@ -7,12 +7,15 @@ CC="@CC@"
 CXX="@CXX@"
 LD="@SHARED_LD@"
 cross_compiling=@cross_compiling@
 CXX="@CXX@"
 LD="@SHARED_LD@"
 cross_compiling=@cross_compiling@

+target=@host_alias@
+static_flag=@STATIC_FLAG@

 
 usage()
 {
     cat <<EOF
 
 usage()
 {
     cat <<EOF

-Usage: wx-config [--prefix[=DIR]] [--exec-prefix[=DIR]] [--version]
-                 [--libs] [--gl-libs] [--cppflags] [--cflags] [--cxxflags]
+Usage: wx-config [--prefix[=DIR]] [--exec-prefix[=DIR]] [--version] [--static]
+                 [--libs] [--gl-libs]
+                 [--cppflags] [--cflags] [--cxxflags] [--ldflags] [--rezflags]

                  [--cc] [--cxx] [--ld]
 
 wx-config returns configuration information about the installed
                  [--cc] [--cxx] [--ld]
 
 wx-config returns configuration information about the installed


@@ -27,14 +30,22 @@ EOF
 
 cppflags()
 {
 
 cppflags()
 {

-    if test "${cross_compiling}" != "yes" \
-            -a @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
         includes=-I@includedir@
     fi
     then
         includes=-I@includedir@
     fi

+

     includes="-I@libdir@/wx/include/@TOOLCHAIN_NAME@ $includes"
     includes="-I@libdir@/wx/include/@TOOLCHAIN_NAME@ $includes"

-    echo $includes @WXDEBUG_DEFINE@ @TOOLCHAIN_DEFS@ @WXCONFIG_INCLUDE@
+
+    if test $static_flag = yes ; then
+        echo $includes @WXDEBUG_DEFINE@ @TOOLCHAIN_DEFS@ @WXCONFIG_INCLUDE@ @WX_LARGEFILE_FLAGS@
+    else
+        echo $includes @WXDEBUG_DEFINE@ @TOOLCHAIN_DEFS@ @TOOLCHAIN_DLL_DEFS@ @WXCONFIG_INCLUDE@ @WX_LARGEFILE_FLAGS@
+    fi

 }
 
 if test $# -eq 0; then
 }
 
 if test $# -eq 0; then


@@ -67,6 +78,9 @@ while test $# -gt 0; do
     --version)
       echo @WX_MAJOR_VERSION_NUMBER@.@WX_MINOR_VERSION_NUMBER@.@WX_RELEASE_NUMBER@
       ;;
     --version)
       echo @WX_MAJOR_VERSION_NUMBER@.@WX_MINOR_VERSION_NUMBER@.@WX_RELEASE_NUMBER@
       ;;

+    --static)
+      static_flag=yes
+      ;;

     --cppflags)
       cppflags
       ;;
     --cppflags)
       cppflags
       ;;


@@ -76,16 +90,34 @@ while test $# -gt 0; do
     --cxxflags)
       echo `cppflags` @CODE_GEN_FLAGS@ @CODE_GEN_FLAGS_CXX@
       ;;
     --cxxflags)
       echo `cppflags` @CODE_GEN_FLAGS@ @CODE_GEN_FLAGS_CXX@
       ;;

+    --ldflags)
+      echo @LDFLAGS_EXE@
+      ;;
+    --rezflags)
+      echo @LIBWXMACRESWXCONFIG@
+      ;;

     --libs)
     --libs)

-      if test "${cross_compiling}" != "yes" \
-              -a @libdir@ != /usr/lib ;
+      if test "@libdir@" != "/usr/lib" \
+              -a \( "${cross_compiling}" != "yes" \
+                    -o "@libdir@" != "/usr/${target}/lib" \) ;

       then
           libs="-L@libdir@"
       fi
       then
           libs="-L@libdir@"
       fi

-      echo $libs @WXCONFIG_LIBS@ @EXTRA_LIBS@
+
+      if test $static_flag = yes ; then
+          echo "$libs @LDFLAGS@ @WXCONFIG_RPATH@ @libdir@/@WXCONFIG_LIBS_STATIC@ @LIBS@ @DMALLOC_LIBS@"
+      else
+          echo $libs @LDFLAGS@ @WXCONFIG_RPATH@ @WXCONFIG_LIBS@ @DMALLOC_LIBS@
+      fi
+

       ;;
     --gl-libs)
       ;;
     --gl-libs)

-      echo @WXCONFIG_LIBS_GL@
+      if test $static_flag = yes -a "x" != "x@WXCONFIG_LIBS_STATIC_GL@" ; then
+          gllibs="@libdir@/@WXCONFIG_LIBS_STATIC_GL@"
+      else
+          gllibs="@WXCONFIG_LIBS_GL@"
+      fi
+      echo @LDFLAGS_GL@ "$gllibs"

       ;;
     --cc)
       echo $CC
       ;;
     --cc)
       echo $CC