diff --git a/debian/control.in b/debian/control.in index dcefbf9de6..dcd6520dbe 100644 --- 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 8e2f8f811f..e56926cdb5 100755 --- 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