documented fs_zip bugfix

[wxWidgets.git] / wx-config.in

diff --git a/wx-config.in b/wx-config.in
index 7155c416073d673240d8a61933900d68a3dcb5e5..a89e5cf8b1db8cc74b1171f23cb59a48394455e0 100755 (executable)
--- a/wx-config.in
+++ b/wx-config.in
@@ -3,9 +3,12 @@
 prefix=@prefix@
 exec_prefix=@exec_prefix@
 exec_prefix_set=no
 prefix=@prefix@
 exec_prefix=@exec_prefix@
 exec_prefix_set=no

+CC="@CC@"
+CXX="@CXX@"
+LD="@SHARED_LD@"

 
 usage="\
 
 usage="\

-Usage: wx-config [--prefix[=DIR]] [--exec-prefix[=DIR]] [--version] [--libs] [--cflags]"
+Usage: wx-config [--prefix[=DIR]] [--exec-prefix[=DIR]] [--version] [--libs] [--cflags] [--cc] [--cxx] [--ld]"

 
 if test $# -eq 0; then
       echo "${usage}" 1>&2
 
 if test $# -eq 0; then
       echo "${usage}" 1>&2


@@ -36,7 +39,7 @@ while test $# -gt 0; do
       echo $exec_prefix
       ;;
     --version)
       echo $exec_prefix
       ;;
     --version)

-      echo @WX_MAJOR_VERSION_NUMBER@.@WX_MINOR_VERSION_NUMBER@
+      echo @WX_MAJOR_VERSION_NUMBER@.@WX_MINOR_VERSION_NUMBER@.@WX_RELEASE_NUMBER@

       ;;
     --cflags)
       if test @includedir@ != /usr/include ; then
       ;;
     --cflags)
       if test @includedir@ != /usr/include ; then


@@ -44,14 +47,23 @@ while test $# -gt 0; do
           includes=-I@includedir@
         fi
       fi
           includes=-I@includedir@
         fi
       fi

-      includes="$includes -I@datadir@/include -I@datadir@/@PACKAGE@/include"
-      echo $includes @WXDEBUG_DEFINE@ @TOOLKIT_DEF@ @TOOLKIT_INCLUDE@
+      includes="$includes -I@libdir@/wx/include"
+      echo $includes -D__USE_WXCONFIG__ @CODE_GEN_FLAGS@ @WXDEBUG_DEFINE@ @TOOLKIT_DEF@ @WXCONFIG_INCLUDE@

       ;;
     --libs)
       if test @libdir@ != /usr/lib ; then
         libs="-L@libdir@"
       fi
       ;;
     --libs)
       if test @libdir@ != /usr/lib ; then
         libs="-L@libdir@"
       fi

-      echo $libs -lwx_@WX_LIBRARY@ @EXTRA_LIBS@
+      echo $libs -l@WX_LIBRARY@ @EXTRA_LIBS@
+      ;;
+    --cc)
+      echo $CC
+      ;;
+    --cxx)
+      echo $CXX
+      ;;
+    --ld)
+      echo $LD

       ;;
     *)
       echo "${usage}" 1>&2
       ;;
     *)
       echo "${usage}" 1>&2