Conditional compilation fix.

[wxWidgets.git] / wx-config.in

diff --git a/wx-config.in b/wx-config.in
index 579bcf0d63e16664c0a279fee5e1be39e0b937ec..f1a8a541b5faa93db2d0bdd64362b1d6756753de 100755 (executable)
--- 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@"
@@ -149,7 +148,8 @@ usage()
     cat <<EOF
 Usage: wx-config [--prefix[=DIR]] [--exec-prefix[=DIR]] [--inplace]
                  [--toolkit=TOOLKIT] [--unicode[=yes|no]] [--debug[=yes|no]]
-                 [--universal[=yes|no]] [--version[=VERSION]] [--release]
+                 [--universal[=yes|no]] [--host=HOST]
+                 [--version[=VERSION]] [--release]
                  [--list] [--basename] [--static] [--libs] [--gl-libs]
                  [--cppflags] [--cflags] [--cxxflags] [--ldflags] [--rezflags]
                  [--cc] [--cxx] [--ld] [LIBRARIES]
@@ -174,17 +174,18 @@ for it to take effect.
 --static must come before --cppflags, --cflags, --cxxflags,
 --libs and --gl-libs and --libs must come before the other ones.
 
---libs can take optional argument that contains comma-separated list of
-wxWidgets libraries to link against. This list can include both core
-and contrib libraries. Special value "std" stands for all libraries linked
-in by default.
+wx-config can take optional argument that contains comma- or space-separated
+list of wxWidgets libraries to compile and link against. This list can
+include both core and contrib libraries. Special value "std" stands for all
+libraries linked in by default. Examples: "wx-config --libs core,base"
+or "wx-config --cxxflags core,base".
 
 --gl-libs option is deprecated, use "--libs gl" instead.
 
 If there are several different builds of wxWidgets installed in same prefix,
-you can use --toolkit, --unicode, --debug, --universal and --version options
-to select one of them. Use --list option to show all available builds that
-match given criteria.
+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
 
@@ -193,41 +194,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}"