reverted my previous change to WINVER - it is already defined elsewhere

[wxWidgets.git] / wx-config.in

diff --git a/wx-config.in b/wx-config.in
index 21b379e1b5d2dc6b9c517c5b3b7447a65969c351..478a243796988e239bb5052a31b740885f94dcf6 100755 (executable)
--- a/wx-config.in
+++ b/wx-config.in
@@ -3,13 +3,40 @@
 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: wx-config [--prefix[=DIR]] [--exec-prefix[=DIR]] [--version] [--libs] [--cflags]"
+usage()
+{
+    cat <<EOF
+Usage: wx-config [--prefix[=DIR]] [--exec-prefix[=DIR]] [--version]
+                 [--libs] [--cppflags] [--cflags] [--cxxflags]
+                 [--cc] [--cxx] [--ld]
+
+wx-config returns configuration information about the installed
+version of wxWindows. It may be used to query its version and
+installation directories and also retrieve the C and C++ compilers
+and linker which were used for its building and the corresponding
+flags.
+EOF
+
+    exit $1
+}
+
+cppflags()
+{
+    if test @includedir@ != /usr/include ; then
+        if test @includedir@ != /usr/include/c++ ; then
+            includes=-I@includedir@
+        fi
+    fi
+    includes="$includes -I@libdir@/wx/include -D__USE_WXCONFIG__"
+    echo $includes @WXDEBUG_DEFINE@ @TOOLKIT_DEF@ @WXCONFIG_INCLUDE@
+}

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

-      echo "${usage}" 1>&2
-      exit 1
+      usage 1 1>&2

 fi
 
 while test $# -gt 0; do
 fi
 
 while test $# -gt 0; do


@@ -36,20 +63,34 @@ while test $# -gt 0; do
       echo $exec_prefix
       ;;
     --version)
       echo $exec_prefix
       ;;
     --version)

-      echo @WXGTK_VERSION@
+      echo @WX_MAJOR_VERSION_NUMBER@.@WX_MINOR_VERSION_NUMBER@.@WX_RELEASE_NUMBER@
+      ;;
+    --cppflags)
+      cppflags

       ;;
     --cflags)
       ;;
     --cflags)

-      if test @includedir@ != /usr/include ; then
-        includes=-I@includedir@
-      fi
-      echo $includes -D@TOOLKIT_DEF@ @GUI_TK_INCLUDE@
+      echo `cppflags` @CODE_GEN_FLAGS@
+      ;;
+    --cxxflags)
+      echo `cppflags` @CODE_GEN_FLAGS@ @CODE_GEN_FLAGS_CXX@

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

-      echo -L@libdir@ -lwx_gtk -ldl @GUI_TK_LIBRARY@ @THREADS_LINK@ @EXTRA_LINK@
+      if test @libdir@ != /usr/lib ; then
+        libs="-L@libdir@"
+      fi
+      echo $libs -l@WX_LIBRARY@ @EXTRA_LIBS@
+      ;;
+    --cc)
+      echo $CC
+      ;;
+    --cxx)
+      echo $CXX
+      ;;
+    --ld)
+      echo $LD

       ;;
     *)
       ;;
     *)

-      echo "${usage}" 1>&2
-      exit 1
+      usage 1 1>&2

       ;;
   esac
   shift
       ;;
   esac
   shift