versioned symbols no longer contain toolkit name, only WX(unicode)(build)_(release)

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

diff --git a/configure b/configure
index ddc192f1bbbbd274e403a9e076bee4242bcc7d4d..3ddc4de288533810f1c01d36d0c1ad4b20a1eaf2 100755 (executable)
--- a/configure
+++ b/configure
@@ -25143,7 +25143,7 @@ if test "$wxUSE_DEBUG_FLAG" = "yes"; then
     BUILD=debug
 fi
 
-WX_VERSION_TAG=`echo WX${TOOLKIT_DIR}${TOOLKIT_VERSION}${WIDGET_SET}${lib_unicode_suffix}${lib_debug_suffix}_${WX_RELEASE} | tr "[a-z]" "[A-Z]"`
+WX_VERSION_TAG=`echo WX${lib_unicode_suffix}${lib_debug_suffix}_${WX_RELEASE} | tr "[a-z]" "[A-Z]"`
 
 TOOLCHAIN_NAME="${TOOLKIT_DIR}${TOOLKIT_VERSION}${WIDGET_SET}${lib_unicode_suffix}${lib_debug_suffix}-${WX_RELEASE}"
 TOOLCHAIN_NAME_GL="${TOOLKIT_DIR}${TOOLKIT_VERSION}${WIDGET_SET}${lib_unicode_suffix}${lib_debug_suffix}_gl-${WX_RELEASE}"

diff --git a/configure.in b/configure.in
index d61bbcf3fd74830ed1a8b1c5e09c7c9a698f285e..7c5b95b390f5c39134cd7505a06e8218e7ed1a23 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -3001,7 +3001,7 @@ if test "$wxUSE_DEBUG_FLAG" = "yes"; then
     BUILD=debug
 fi
 
-WX_VERSION_TAG=`echo WX${TOOLKIT_DIR}${TOOLKIT_VERSION}${WIDGET_SET}${lib_unicode_suffix}${lib_debug_suffix}_${WX_RELEASE} | tr "[[a-z]]" "[[A-Z]]"`
+WX_VERSION_TAG=`echo WX${lib_unicode_suffix}${lib_debug_suffix}_${WX_RELEASE} | tr "[[a-z]]" "[[A-Z]]"`
 
 TOOLCHAIN_NAME="${TOOLKIT_DIR}${TOOLKIT_VERSION}${WIDGET_SET}${lib_unicode_suffix}${lib_debug_suffix}-${WX_RELEASE}"
 TOOLCHAIN_NAME_GL="${TOOLKIT_DIR}${TOOLKIT_VERSION}${WIDGET_SET}${lib_unicode_suffix}${lib_debug_suffix}_gl-${WX_RELEASE}"