fixes for RPM generation after Ron's changes

[wxWidgets.git] / wx-config.in

diff --git a/wx-config.in b/wx-config.in
index a89e5cf8b1db8cc74b1171f23cb59a48394455e0..7c9760b9039783cd398924e6cb465a3621ac17f0 100755 (executable)
--- a/wx-config.in
+++ b/wx-config.in
@@ -6,13 +6,39 @@ exec_prefix_set=no
 CC="@CC@"
 CXX="@CXX@"
 LD="@SHARED_LD@"
+cross_compiling=@cross_compiling@
 
-usage="\
-Usage: wx-config [--prefix[=DIR]] [--exec-prefix[=DIR]] [--version] [--libs] [--cflags] [--cc] [--cxx] [--ld]"
+usage()
+{
+    cat <<EOF
+Usage: wx-config [--prefix[=DIR]] [--exec-prefix[=DIR]] [--version]
+                 [--libs] [--gl-libs] [--cppflags] [--cflags] [--cxxflags]
+                 [--cc] [--cxx] [--ld]
+
+wx-config returns configuration information about the installed
+version of wxWindows. 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.
+EOF
+
+    exit $1
+}
+
+cppflags()
+{
+    if test "${cross_compiling}" != "yes" \
+            -a @includedir@ != /usr/include \
+            -a @includedir@ != /usr/include/c++ ;
+    then
+        includes=-I@includedir@
+    fi
+    includes="-I@libdir@/wx/include/@TOOLCHAIN_NAME@ $includes"
+    echo $includes @WXDEBUG_DEFINE@ @TOOLCHAIN_DEFS@ @WXCONFIG_INCLUDE@
+}
 
 if test $# -eq 0; then
-      echo "${usage}" 1>&2
-      exit 1
+    usage 1 1>&2
 fi
 
 while test $# -gt 0; do
@@ -41,20 +67,25 @@ while test $# -gt 0; do
     --version)
       echo @WX_MAJOR_VERSION_NUMBER@.@WX_MINOR_VERSION_NUMBER@.@WX_RELEASE_NUMBER@
       ;;
+    --cppflags)
+      cppflags
+      ;;
     --cflags)
-      if test @includedir@ != /usr/include ; then
-        if test @includedir@ != /usr/include/c++ ; then
-          includes=-I@includedir@
-        fi
-      fi
-      includes="$includes -I@libdir@/wx/include"
-      echo $includes -D__USE_WXCONFIG__ @CODE_GEN_FLAGS@ @WXDEBUG_DEFINE@ @TOOLKIT_DEF@ @WXCONFIG_INCLUDE@
+      echo `cppflags` @CODE_GEN_FLAGS@
+      ;;
+    --cxxflags)
+      echo `cppflags` @CODE_GEN_FLAGS@ @CODE_GEN_FLAGS_CXX@
       ;;
     --libs)
-      if test @libdir@ != /usr/lib ; then
-        libs="-L@libdir@"
+      if test "${cross_compiling}" != "yes" \
+              -a @libdir@ != /usr/lib ;
+      then
+          libs="-L@libdir@"
       fi
-      echo $libs -l@WX_LIBRARY@ @EXTRA_LIBS@
+      echo $libs @WXCONFIG_LIBS@ @EXTRA_LIBS@
+      ;;
+    --gl-libs)
+      echo @WXCONFIG_LIBS_GL@
       ;;
     --cc)
       echo $CC
@@ -66,8 +97,7 @@ while test $# -gt 0; do
       echo $LD
       ;;
     *)
-      echo "${usage}" 1>&2
-      exit 1
+      usage 1 1>&2
       ;;
   esac
   shift