X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/14885f0910b8641e8a011c8f3a1e3599e7260ef4..c04ec4965704643f498999fb5123e63330a3ee50:/wx-config.in

diff --git a/wx-config.in b/wx-config.in
index 3977e1037a..9e34fc5a08 100755
--- a/wx-config.in
+++ b/wx-config.in
@@ -29,7 +29,6 @@ update_prefixes
 
 CC="@CC@"
 GCC="@GCC@"
-GCC_SEARCHES_USR_LOCAL_INCLUDE="@GCC_SEARCHES_USR_LOCAL_INCLUDE@"
 CXX="@CXX@"
 LD="@SHARED_LD@"
 srcdir="@top_srcdir@"
@@ -144,29 +143,14 @@ get_ldflags_gui()
     echo $flags_to_ret
 }
 
-# return the absolute path prepending builddir to it if needed
-makeabs()
-{
-    path=$1
-    # TODO: this only works under Unix and even there it could be
-    #       enhanced to remove ".." and "."
-    if [ `echo $path | sed 's/^\(.\).*/\1/'` != "/" ]; then
-        if [ $path = "." ]; then
-            path=$builddir
-        else
-            path="$builddir/$path"
-        fi
-    fi
-
-    echo $path
-}
-
 usage()
 {
     cat <<EOF
 Usage: wx-config [--prefix[=DIR]] [--exec-prefix[=DIR]] [--inplace]
-                 [--version] [--release]
-                 [--basename] [--static] [--libs] [--gl-libs]
+                 [--toolkit=TOOLKIT] [--unicode[=yes|no]] [--debug[=yes|no]]
+                 [--universal[=yes|no]] [--host=HOST]
+                 [--version[=VERSION]] [--release]
+                 [--list] [--basename] [--static] [--libs] [--gl-libs]
                  [--cppflags] [--cflags] [--cxxflags] [--ldflags] [--rezflags]
                  [--cc] [--cxx] [--ld] [LIBRARIES]
 
@@ -197,6 +181,11 @@ in by default.
 
 --gl-libs option is deprecated, use "--libs gl" instead.
 
+If there are several different builds of wxWidgets installed in same prefix,
+you can use --host, --toolkit, --unicode, --debug, --universal and --version
+options to select one of them. Use --list option to show all available builds
+that match given criteria.
+
 EOF
 
     exit $1
@@ -204,41 +193,15 @@ EOF
 
 cppflags()
 {
-    # we should never specify -I/usr/include on the compiler command line: this
-    # is at best useless and at worst breaks compilation on the systems where
-    # the system headers are non-ANSI because gcc works around this by storing
-    # the ANSI-fied versions of them in its private directory which is searched
-    # after all the directories on the cmd line.
-    #
-    # the situation is a bit more complicated with -I/usr/local/include:
-    # it shouldn't be specified with some gcc installations which look there
-    # by default anyhow and give warnings (at least 3.1 does) if it is
-    # specified explicitly --
-    # but this -I switch *is* needed for other gcc installation and for
-    # the other compilers.
-    # So I put a suitable test into configure.in and reuse the result here.
-    #
-    # note that we assume that if we use GNU cc we also use GNU c++ and vice
-    # versa, i.e. this won't work (either for --cflags or --cxxflags) if GNU C
-    # compiler and non-GNU C++ compiler are used or vice versa -- we'll fix
-    # this when/if anybody complains about it
-    if test "${includedir}" != "/usr/include" \
-            -a "${includedir}" != "/usr/include/c++" \
-            -a \( "${GCC_SEARCHES_USR_LOCAL_INCLUDE}" != "yes" \
-                  -o "${includedir}" != "/usr/local/include" \) \
-            -a \( "${cross_compiling}" != "yes" \
-                  -o "${includedir}" != "/usr/${target}/include" \) ;
-    then
-        includes=" -I${includedir}"
-    fi
-
-    includes="-I${libdir}/wx/include/${TOOLCHAIN_NAME}$includes"
+    includes="-I${libdir}/wx/include/${TOOLCHAIN_NAME}"
 
     # in inplace case we need to also add path to contrib headers -- do it
     # unconditionally as they might be used and we have no way of knowing if
     # they really are
     if test $inplace_flag = yes ; then
-        includes="$includes -I${prefix}/contrib/include"
+        includes="$includes -I${prefix}/include -I${prefix}/contrib/include"
+    else
+        includes="$includes -I${includedir}/wx-${WX_MAJOR_VERSION_NUMBER}.${WX_MINOR_VERSION_NUMBER}"
     fi
 
     flags="$includes ${WXDEBUG_DEFINE} ${TOOLCHAIN_DEFS}"
@@ -305,11 +268,7 @@ while test $# -gt 0; do
 
   case $1 in
     --inplace)
-      prefix=`makeabs $srcdir`
-      exec_prefix=`makeabs $builddir`
-      exec_prefix_set=yes
       inplace_flag=yes
-      update_prefixes
       ;;
     --prefix=*)
       prefix=$optarg