Filter any arguments back to 2.4.2.6 syntax before

handing them on to a legacy wx-config.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29596 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/debian/control.in b/debian/control.in
index dcefbf9de6f4452ab3d7f8c75877cf1dcc537cbd..dcd6520dbe82858311086da4e5d5f942e2b9f6ed 100644 (file)
--- a/debian/control.in
+++ b/debian/control.in
@@ -69,7 +69,7 @@ Architecture: any
 Section: libs
 Depends: ${shlibs:Depends}
 Conflicts: wx-common
-Replaces: wx-common, wxwin2.4-headers
+Replaces: wx-common, wxwin2.4-headers, libwxgtk2.4-contrib-dev
 Provides: wx-common
 Description: wxWidgets Cross-platform C++ GUI toolkit (common support files)
  wxWidgets (formerly known as wxWindows) is a class library for C++ providing

diff --git a/wx-config.in b/wx-config.in
index 8e2f8f811fd7eb5a28232fff4b0c907a8c681627..e56926cdb521db92f224882e2ed29d9854b46e4b 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