don't use non blocking sockets if wxApp::IsMainLoopRunnning() returns false (closes...

[wxWidgets.git] / wx-config.in

diff --git a/wx-config.in b/wx-config.in
index 8e2f8f811fd7eb5a28232fff4b0c907a8c681627..97bbf2076069efeac480f0115c213dab1181d120 100755 (executable)
--- a/wx-config.in
+++ b/wx-config.in
@@ -725,13 +725,30 @@ if ! user_mask_fits "$this_config" ; then
         _last_chance=$(find_best_legacy_config)
         if [ -n "$_last_chance" ]; then
 
+            for arg; do
+                case "$arg" in
+                    --prefix*|--exec-prefix*|               \
+                    --version|--release|--basename|         \
+                    --static|--libs|--gl_libs|              \
+                    --cppflags|--cflags|--cxxflags|         \
+                    --cc|--cxx|--ld|                        \
+                    --rezflags|--inplace)
+                        _legacy_args="$_legacy_args $arg"
+                        ;;
+                    
+                    --static|--static=y*|--static=Y*)
+                        _legacy_args="$_legacy_args --static"
+                        ;;
+                esac
+            done
+
             if [ -n "$WXDEBUG" ]; then
                 decho "  found a suitable legacy delegate: $_last_chance"
-                decho "--> $prefix/bin/$_last_chance $*"
+                decho "--> $prefix/bin/$_last_chance $_legacy_args"
             fi
 
             export WXCONFIG_DELEGATED=yes
-            $prefix/bin/$_last_chance $*
+            $prefix/bin/$_last_chance $_legacy_args
             exit
 
         else
@@ -940,22 +957,18 @@ if is_monolithic; then
 
 else    # MONOLITHIC = 0
 
-    # Import everything by default, and base if it was omitted.
+    # Import everything by default, expand std if specified, or add base if omitted.
     if [ -z "$wx_libs" ]; then
         wx_libs="@CORE_GUI_LIBS@ @CORE_BASE_LIBS@"
-    elif ! match_field base $wx_libs ; then
-        wx_libs="$wx_libs base"
-    fi
-
-    # Expand the magic library 'std' to the default set.
-    # Only add those not already specified to future-proof
-    # against changes to std which would otherwise break
-    # people's builds.
-    if match_field std $wx_libs; then
+    elif match_field std $wx_libs; then
+        # Bubble any libs that were already specified to the end
+        # of the list and ensure static linking order is retained.
         wx_libs=$(remove_field std $wx_libs)
         for i in @CORE_GUI_LIBS@ @CORE_BASE_LIBS@; do
-            match_field "$i" $wx_libs || wx_libs="$wx_libs $i"
+            wx_libs="$(remove_field $i $wx_libs) $i"
         done
+    elif ! match_field base $wx_libs ; then
+        wx_libs="$wx_libs base"
     fi
 
     using_gui=no