fixed bug with redoing the command when there was nothing to redo

[wxWidgets.git] / wx-config.in

diff --git a/wx-config.in b/wx-config.in
index c52a0b11a44ef64efc15f4bc3018a3c88bca67cf..d046f70d483cf1d4bd74e9eccba233dd70fe587d 100755 (executable)
--- a/wx-config.in
+++ b/wx-config.in
@@ -8,11 +8,12 @@ CXX="@CXX@"
 LD="@SHARED_LD@"
 cross_compiling=@cross_compiling@
 target=@host_alias@
+static_flag=no
 
 usage()
 {
     cat <<EOF
-Usage: wx-config [--prefix[=DIR]] [--exec-prefix[=DIR]] [--version]
+Usage: wx-config [--prefix[=DIR]] [--exec-prefix[=DIR]] [--version] [--static]
                  [--libs] [--gl-libs] [--cppflags] [--cflags] [--cxxflags] [--rezflags]
                  [--cc] [--cxx] [--ld]
 
@@ -35,8 +36,14 @@ cppflags()
     then
         includes=-I@includedir@
     fi
+
     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@
+    else
+        echo $includes @WXDEBUG_DEFINE@ @TOOLCHAIN_DEFS@ @TOOLCHAIN_DLL_DEFS@ @WXCONFIG_INCLUDE@
+    fi
 }
 
 if test $# -eq 0; then
@@ -69,6 +76,9 @@ while test $# -gt 0; do
     --version)
       echo @WX_MAJOR_VERSION_NUMBER@.@WX_MINOR_VERSION_NUMBER@.@WX_RELEASE_NUMBER@
       ;;
+    --static)
+      static_flag=yes
+      ;;
     --cppflags)
       cppflags
       ;;
@@ -88,7 +98,13 @@ while test $# -gt 0; do
       then
           libs="-L@libdir@"
       fi
-      echo $libs @WXCONFIG_LIBS@ @EXTRA_LIBS@
+
+      if test $static_flag = yes ; then
+          echo "$libs @LDFLAGS@ @WXCONFIG_LIBS@ @LIBS@ @DMALLOC_LIBS@"
+      else
+          echo $libs @LDFLAGS@ @WXCONFIG_LIBS@ @DMALLOC_LIBS@
+      fi
+
       ;;
     --gl-libs)
       echo @WXCONFIG_LIBS_GL@