1. configre/makefiles changes

[wxWidgets.git] / wx-config.in

diff --git a/wx-config.in b/wx-config.in
index 884eb80b1abd016ecb21f006c496e19abba2d7e6..b1e5374d879d3697b1a532e191d55aa0cb84aeb7 100755 (executable)
--- a/wx-config.in
+++ b/wx-config.in
@@ -3,9 +3,12 @@
 prefix=@prefix@
 exec_prefix=@exec_prefix@
 exec_prefix_set=no
+CC="@CC@"
+CXX="@CXX@"
+LD="@SHARED_LD@"
 
 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
@@ -36,7 +39,7 @@ while test $# -gt 0; do
       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
@@ -44,14 +47,23 @@ while test $# -gt 0; do
           includes=-I@includedir@
         fi
       fi
-      includes="$includes -I@datadir@/@PACKAGE@/include"
-      echo $includes @WXDEBUG_DEFINE@ @TOOLKIT_DEF@ @TOOLKIT_INCLUDE@
+      includes="$includes -I@libdir@/wx/include"
+      echo $includes @CODE_GEN_FLAGS@ @WXDEBUG_DEFINE@ @TOOLKIT_DEF@ @TOOLKIT_INCLUDE@
       ;;
     --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