X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/2fff5f0811df871262c511b360f12d6808c107db..8a68d8b6c13323ad187062b0be009f6d22af77f0:/wx-config.in diff --git a/wx-config.in b/wx-config.in index 5d3313d394..a93c4af969 100755 --- a/wx-config.in +++ b/wx-config.in @@ -36,18 +36,22 @@ while test $# -gt 0; do echo $exec_prefix ;; --version) - echo 2.01 + echo @WX_MAJOR_VERSION_NUMBER@.@WX_MINOR_VERSION_NUMBER@.@WX_RELEASE_NUMBER@ snapshot 9 ;; --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@ @WXDEBUG_DEFINE@ - + echo $includes @WXDEBUG_DEFINE@ @TOOLKIT_DEF@ @TOOLKIT_INCLUDE@ ;; --libs) - echo -L@libdir@ @THREADS_LINK@ @WX_LINK@ @DL_LIBRARY@ @GUI_TK_LIBRARY@ @EXTRA_LINK@ @JPEG_LINK@ + if test @libdir@ != /usr/lib ; then + libs="-L@libdir@" + fi + echo $libs -l@WX_LIBRARY@ @EXTRA_LIBS@ ;; *) echo "${usage}" 1>&2