Warning fix.

[wxWidgets.git] / wx-config.in

diff --git a/wx-config.in b/wx-config.in
index f1a8a541b5faa93db2d0bdd64362b1d6756753de..65b263f8422f094a23ecc804ce5f699401500bee 100755 (executable)
--- a/wx-config.in
+++ b/wx-config.in
@@ -9,6 +9,7 @@
 WX_MAJOR_VERSION_NUMBER="@WX_MAJOR_VERSION_NUMBER@"
 WX_MINOR_VERSION_NUMBER="@WX_MINOR_VERSION_NUMBER@"
 WX_RELEASE_NUMBER="@WX_RELEASE_NUMBER@"
+WX_SUBRELEASE_NUMBER="@WX_SUBRELEASE_NUMBER@"
 release="@WX_MAJOR_VERSION_NUMBER@.@WX_MINOR_VERSION_NUMBER@"
 is_monolithic="@MONOLITHIC@"
 cross_compiling="@cross_compiling@"
@@ -149,7 +150,7 @@ usage()
 Usage: wx-config [--prefix[=DIR]] [--exec-prefix[=DIR]] [--inplace]
                  [--toolkit=TOOLKIT] [--unicode[=yes|no]] [--debug[=yes|no]]
                  [--universal[=yes|no]] [--host=HOST]
-                 [--version[=VERSION]] [--release]
+                 [--version[=VERSION]] [--version-full] [--release]
                  [--list] [--basename] [--static] [--libs] [--gl-libs]
                  [--cppflags] [--cflags] [--cxxflags] [--ldflags] [--rezflags]
                  [--cc] [--cxx] [--ld] [LIBRARIES]
@@ -214,7 +215,7 @@ cppflags()
         flags="$flags -DwxUSE_GUI=0"
     fi
 
-    echo "$flags${WXCONFIG_INCLUDE} ${WX_LARGEFILE_FLAGS} ${GCC_PRAGMA_FLAGS}"
+    echo "$flags ${WXCONFIG_INCLUDE} ${WX_LARGEFILE_FLAGS} ${GCC_PRAGMA_FLAGS}"
 }
 
 if test $# -eq 0; then
@@ -247,16 +248,20 @@ else
 fi
 
 # determine if at least one gui lib was used:
-nogui_flag="yes"
-for i in $libs_list; do
-  case $i in
-      base|net)
-        ;;
-      *)
-        nogui_flag="no"
-        ;;
-  esac
-done
+if test "$is_monolithic" = "0" ; then
+  nogui_flag="yes"
+  for i in $libs_list; do
+    case $i in
+        base|net)
+          ;;
+        *)
+          nogui_flag="no"
+          ;;
+    esac
+  done
+else
+  nogui_flag="no"
+fi
 
 
 # handle options:
@@ -292,6 +297,9 @@ while test $# -gt 0; do
     --version)
       echo ${WX_MAJOR_VERSION_NUMBER}.${WX_MINOR_VERSION_NUMBER}.${WX_RELEASE_NUMBER}
       ;;
+    --version-full)
+      echo ${WX_MAJOR_VERSION_NUMBER}.${WX_MINOR_VERSION_NUMBER}.${WX_RELEASE_NUMBER}.${WX_SUBRELEASE_NUMBER}
+      ;;
     --release)
       echo $release
       ;;