Use memcmp instead of that wxString hack

[wxWidgets.git] / wx-config.in

diff --git a/wx-config.in b/wx-config.in
index a960ca8945fce111cd3ed273c02a173bfea3bdda..6c0f4262a83177b3a32f693d58cc65912d4feb59 100755 (executable)
--- a/wx-config.in
+++ b/wx-config.in
@@ -36,18 +36,22 @@ while test $# -gt 0; do
       echo $exec_prefix
       ;;
     --version)
-      echo 1.99
+      echo @WX_MAJOR_VERSION_NUMBER@.@WX_MINOR_VERSION_NUMBER@.@WX_RELEASE_NUMBER@
       ;;
     --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"
-      echo $includes -D@TOOLKIT_DEF@ @GUI_TK_INCLUDE@ @WXDEBUG_DEFINE@
-
+      echo $includes @WXDEBUG_DEFINE@ @TOOLKIT_DEF@ @TOOLKIT_INCLUDE@
       ;;
     --libs)
-      echo -L@libdir@ -lwx_gtk_1_0 @DL_LIBRARY@ @GUI_TK_LIBRARY@ @THREADS_LINK@ @EXTRA_LINK@
+      if test @libdir@ != /usr/lib ; then
+        libs="-L@libdir@"
+      fi
+      echo $libs -l@WX_LIBRARY@ @EXTRA_LIBS@
       ;;
     *)
       echo "${usage}" 1>&2