Fix reference ids and update Mac requirements in the introduction page.

[wxWidgets.git] / wx-config.in

diff --git a/wx-config.in b/wx-config.in
index 8439e7eaf1c8fddc6f0536c3ae03d0f09d9d0054..b06d0e065ff0684f56d6e402f82c6f79175968e7 100755 (executable)
--- a/wx-config.in
+++ b/wx-config.in
@@ -72,7 +72,8 @@ usage()
   list  below.  The  --optional-libs parameter should be followed by  a list
   of  libs that should be linked to, but only if they are available.
 
-  Available libraries in this build are : @BUILT_WX_LIBS@
+  Available libraries in this build are:
+  @BUILT_WX_LIBS@
 
 EOF
 
@@ -309,12 +310,6 @@ check_yesno_option unicode chartype unicode ansi
 check_yesno_option debug debugtype debug release
 check_yesno_option static linkage '-static'
 
-# Display error for unknown input parameters
-if [ $input_parameters ]; then
-    decho "Extra unknown input parameters : $input_parameters"
-    exit 1
-fi
-
 # Dump everything we just read in debug mode.
 if [ -n "$WXDEBUG" ]; then
 
@@ -805,7 +800,8 @@ if not user_mask_fits "$this_config" ; then
                 decho "--> $prefix/bin/$_last_chance $_legacy_args"
             fi
 
-            export WXCONFIG_DELEGATED=yes
+            WXCONFIG_DELEGATED=yes
+            export WXCONFIG_DELEGATED
             $prefix/bin/$_last_chance $_legacy_args
             exit
 
@@ -844,7 +840,8 @@ EOF
                 decho "--> $wxconfdir/$best_delegate $*"
             fi
 
-            export WXCONFIG_DELEGATED=yes
+            WXCONFIG_DELEGATED=yes
+            export WXCONFIG_DELEGATED
             $wxconfdir/$best_delegate $*
             exit
         fi
@@ -866,7 +863,8 @@ EOF
         decho "--> $wxconfdir/`find_eligible_delegates $configmask` $*"
     fi
 
-    export WXCONFIG_DELEGATED=yes
+    WXCONFIG_DELEGATED=yes
+    export WXCONFIG_DELEGATED
     $wxconfdir/`find_eligible_delegates $configmask` $*
     exit
 fi
@@ -1191,7 +1189,7 @@ fi
 if is_installed; then
     _include_cppflags="-I${includedir}/wx-@WX_RELEASE@@WX_FLAVOUR@"
 else
-    _include_cppflags="-I${includedir} -I${prefix}/contrib/include"
+    _include_cppflags="-I${includedir}"
 fi
 
 _cppflags=`echo "-I${libdir}/wx/include/@TOOLCHAIN_FULLNAME@" $_include_cppflags "@WXCONFIG_CPPFLAGS@" $_gui_cppflags`
@@ -1268,7 +1266,6 @@ if [ -n "$output_option_rescomp" ]; then
                            "@WXCONFIG_RESFLAGS@"
         else
             echo "@RESCOMP@ --include-dir ${includedir}" \
-                           "--include-dir ${prefix}/contrib/include" \
                            "@WXCONFIG_RESFLAGS@"
         fi
         ;;