moved proplist documentation to main book

[wxWidgets.git] / wx-config.in

diff --git a/wx-config.in b/wx-config.in
index aea16be3b10f933a2dfd9dff2e98cbc1e2defa5d..16ad73e222059c8e73d9c63d8129ada6a68571ee 100755 (executable)
--- a/wx-config.in
+++ b/wx-config.in
@@ -36,18 +36,22 @@ while test $# -gt 0; do
       echo $exec_prefix
       ;;
     --version)
       echo $exec_prefix
       ;;
     --version)

-      echo 2.1.0
+      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

-        includes=-I@includedir@
+        if test @includedir@ != /usr/include/c++ ; then
+          includes=-I@includedir@
+        fi

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

-      echo $includes -D@TOOLKIT_DEF@ @WXDEBUG_DEFINE@
-
+      echo $includes @WXDEBUG_DEFINE@ @TOOLKIT_DEF@

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

-      echo -L@libdir@ @THREADS_LINK@ @WX_LINK@ @DL_LIBRARY@ @GUI_TK_LIBRARY@ @EXTRA_LINK@ @JPEG_LINK@ @WCHAR_LINK@
+      if test @libdir@ != /usr/lib ; then
+        libs="-L@libdir@"
+      fi
+      echo $libs -l@WX_LIBRARY@ @EXTRA_LIBS@

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