precompiled headers changed

[wxWidgets.git] / wx-config.in

diff --git a/wx-config.in b/wx-config.in
index 5a9593fde0df5effdb313fb8843ad5c99505813d..00633b799238c7b8989aac39ea90a3a2580d9b77 100755 (executable)
--- a/wx-config.in
+++ b/wx-config.in
@@ -29,6 +29,7 @@ update_prefixes
 
 CC="@CC@"
 GCC="@GCC@"
 
 CC="@CC@"
 GCC="@GCC@"

+GCC_SEARCHES_USR_LOCAL_INCLUDE="@GCC_SEARCHES_USR_LOCAL_INCLUDE@"

 CXX="@CXX@"
 LD="@SHARED_LD@"
 srcdir="@top_srcdir@"
 CXX="@CXX@"
 LD="@SHARED_LD@"
 srcdir="@top_srcdir@"


@@ -66,6 +67,7 @@ ldlibs_core="@EXTRALIBS_GUI@"
 ldlibs_xml="@EXTRALIBS_XML@"
 ldlibs_html="@EXTRALIBS_HTML@"
 ldlibs_odbc="@EXTRALIBS_ODBC@"
 ldlibs_xml="@EXTRALIBS_XML@"
 ldlibs_html="@EXTRALIBS_HTML@"
 ldlibs_odbc="@EXTRALIBS_ODBC@"

+ldlibs_adv="@EXTRALIBS_SDL@"

 
 ldflags_gl="@LDFLAGS_GL@"
 ldlibs_gl="@OPENGL_LIBS@"
 
 ldflags_gl="@LDFLAGS_GL@"
 ldlibs_gl="@OPENGL_LIBS@"


@@ -167,14 +169,14 @@ Usage: wx-config [--prefix[=DIR]] [--exec-prefix[=DIR]] [--version] [--release]
                  [--cc] [--cxx] [--ld]
 
 wx-config returns configuration information about the installed
                  [--cc] [--cxx] [--ld]
 
 wx-config returns configuration information about the installed

-version of wxWindows. It may be used to query its version and
+version of wxWidgets. It may be used to query its version and

 installation directories and also retrieve the C and C++ compilers
 and linker which were used for its building and the corresponding
 flags.
 
 Ordinarily it should be installed to the appropriate system location
 along with the headers and library files, but it is also possible to
 installation directories and also retrieve the C and C++ compilers
 and linker which were used for its building and the corresponding
 flags.
 
 Ordinarily it should be installed to the appropriate system location
 along with the headers and library files, but it is also possible to

-use it to enable builds with an uninstalled wxWindows version for
+use it to enable builds with an uninstalled wxWidgets version for

 package building and bleeding edge developers.  To do so, use it like
 this:
 
 package building and bleeding edge developers.  To do so, use it like
 this:
 


@@ -183,10 +185,11 @@ this:
 Note that any other options supplied must come *after* the prefix
 specification for it to take effect.
 
 Note that any other options supplied must come *after* the prefix
 specification for it to take effect.
 

---static must come before --libs and --gl-libs.
+--static must come before --cppflags, --cflags, --cxxflags,
+--libs and --gl-libs.

 
 --libs can take optional argument that contains comma-separated list of
 
 --libs can take optional argument that contains comma-separated list of

-wxWindows libraries to link against. This list can include both core
+wxWidgets libraries to link against. This list can include both core

 and contrib libraries.
 
 --gl-libs option is deprecated, used --libs=gl instead.
 and contrib libraries.
 
 --gl-libs option is deprecated, used --libs=gl instead.


@@ -204,10 +207,13 @@ cppflags()
     # the ANSI-fied versions of them in its private directory which is searched
     # after all the directories on the cmd line.
     #
     # 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: again,
-    # it shouldn't be specified with gcc which looks there by default anyhow
-    # and gives warnings (at least 3.1 does) if it is specified explicitly --
-    # but this -I switch *is* needed for the other compilers
+    # 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
     #
     # 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


@@ -215,7 +221,7 @@ cppflags()
     # this when/if anybody complains about it
     if test "${includedir}" != "/usr/include" \
             -a "${includedir}" != "/usr/include/c++" \
     # this when/if anybody complains about it
     if test "${includedir}" != "/usr/include" \
             -a "${includedir}" != "/usr/include/c++" \

-            -a \( "${GCC}" != "yes" \
+            -a \( "${GCC_SEARCHES_USR_LOCAL_INCLUDE}" != "yes" \

                   -o "${includedir}" != "/usr/local/include" \) \
             -a \( "${cross_compiling}" != "yes" \
                   -o "${includedir}" != "/usr/${target}/include" \) ;
                   -o "${includedir}" != "/usr/local/include" \) \
             -a \( "${cross_compiling}" != "yes" \
                   -o "${includedir}" != "/usr/${target}/include" \) ;


@@ -292,7 +298,7 @@ while test $# -gt 0; do
       echo ${LDFLAGS_EXE}
       ;;
     --rezflags)
       echo ${LDFLAGS_EXE}
       ;;
     --rezflags)

-      echo ${MACRESWXCONFIG}
+      echo `eval echo ${MACRESWXCONFIG}`

       ;;
 
     --libs*)
       ;;
 
     --libs*)