Another typo in ocnfigure.in

[wxWidgets.git] / wx-config.in

diff --git a/wx-config.in b/wx-config.in
index c7cd055f1108a33bd1925fee58c19f68e72a97aa..884eb80b1abd016ecb21f006c496e19abba2d7e6 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 1.99
+      echo @WX_MAJOR_VERSION_NUMBER@.@WX_MINOR_VERSION_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
       fi

-      includes="$includes -I@libdir@/wx/include"
-      echo $includes -D@TOOLKIT_DEF@ @GUI_TK_INCLUDE@ @OPTIMISE@ @PROFILE@ @WXDEBUG@ @WXDEBUG_DEFINE@
-
+      includes="$includes -I@datadir@/@PACKAGE@/include"
+      echo $includes @WXDEBUG_DEFINE@ @TOOLKIT_DEF@ @TOOLKIT_INCLUDE@

       ;;
     --libs)
       ;;
     --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 -lwx_@WX_LIBRARY@ @EXTRA_LIBS@

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