added aclocal.m4 to dist target. Bad Things happen if it's missing

[wxWidgets.git] / wx-config.in

diff --git a/wx-config.in b/wx-config.in
index 7c9760b9039783cd398924e6cb465a3621ac17f0..c52a0b11a44ef64efc15f4bc3018a3c88bca67cf 100755 (executable)
--- a/wx-config.in
+++ b/wx-config.in
@@ -7,12 +7,13 @@ CC="@CC@"
 CXX="@CXX@"
 LD="@SHARED_LD@"
 cross_compiling=@cross_compiling@
+target=@host_alias@
 
 usage()
 {
     cat <<EOF
 Usage: wx-config [--prefix[=DIR]] [--exec-prefix[=DIR]] [--version]
-                 [--libs] [--gl-libs] [--cppflags] [--cflags] [--cxxflags]
+                 [--libs] [--gl-libs] [--cppflags] [--cflags] [--cxxflags] [--rezflags]
                  [--cc] [--cxx] [--ld]
 
 wx-config returns configuration information about the installed
@@ -27,9 +28,10 @@ EOF
 
 cppflags()
 {
-    if test "${cross_compiling}" != "yes" \
-            -a @includedir@ != /usr/include \
-            -a @includedir@ != /usr/include/c++ ;
+    if test "@includedir@" != "/usr/include" \
+            -a "@includedir@" != "/usr/include/c++" \
+            -a \( "${cross_compiling}" != "yes" \
+                  -o "@includedir@" != "/usr/${target}/include" \) ;
     then
         includes=-I@includedir@
     fi
@@ -76,9 +78,13 @@ while test $# -gt 0; do
     --cxxflags)
       echo `cppflags` @CODE_GEN_FLAGS@ @CODE_GEN_FLAGS_CXX@
       ;;
+    --rezflags)
+      echo @LIBWXMACRESWXCONFIG@
+      ;;
     --libs)
-      if test "${cross_compiling}" != "yes" \
-              -a @libdir@ != /usr/lib ;
+      if test "@libdir@" != "/usr/lib" \
+              -a \( "${cross_compiling}" != "yes" \
+                    -o "@libdir@" != "/usr/${target}/lib" \) ;
       then
           libs="-L@libdir@"
       fi