From 31ac8012e4a8912138e660b73d9b521709cfeec7 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Fri, 28 Oct 2022 01:05:11 +0200 Subject: [PATCH] Remove Unicode option support from wx-config and wxwin.m4 Keep the option itself, but hardcode its value. --- build/cmake/config.cmake | 1 - configure | 6 +--- configure.in | 6 +--- wx-config.in | 8 +++-- wxwin.m4 | 74 ++++++++++++---------------------------- 5 files changed, 30 insertions(+), 65 deletions(-) diff --git a/build/cmake/config.cmake b/build/cmake/config.cmake index 5197df82cb..02d2ba0a35 100644 --- a/build/cmake/config.cmake +++ b/build/cmake/config.cmake @@ -106,7 +106,6 @@ function(wx_write_config) else() set(SHARED 0) endif() - set(WX_CHARTYPE unicode) set(lib_unicode_suffix u) if(CMAKE_CROSSCOMPILING) set(cross_compiling yes) diff --git a/configure b/configure index 71a481543b..609753031f 100755 --- a/configure +++ b/configure @@ -650,7 +650,6 @@ WXCONFIG_CFLAGS WX_CFLAGS WXCONFIG_CPPFLAGS WX_CPPFLAGS -WX_CHARTYPE WX_SUBVERSION WX_VERSION WX_RELEASE @@ -32283,8 +32282,6 @@ else fi -WX_CHARTYPE="unicode" - WX_FLAVOUR=${WX_FLAVOUR:+-$WX_FLAVOUR} WX_LIB_FLAVOUR=`echo $WX_FLAVOUR | tr '-' '_'` @@ -32297,7 +32294,7 @@ WX_VERSION_TAG=`echo WXU${WX_LIB_FLAVOUR}_${WX_RELEASE} | tr '[a-z]' '[A-Z]'` TOOLCHAIN_NAME="${TOOLKIT_DIR}${TOOLKIT_VERSION}${WIDGET_SET}u${WX_LIB_FLAVOUR}-${WX_RELEASE}${HOST_SUFFIX}" -TOOLCHAIN_FULLNAME="${HOST_PREFIX}${TOOLKIT_DIR}${TOOLKIT_VERSION}${WIDGET_SET}-${WX_CHARTYPE}${config_linkage_component}-${WX_RELEASE}${WX_FLAVOUR}" +TOOLCHAIN_FULLNAME="${HOST_PREFIX}${TOOLKIT_DIR}${TOOLKIT_VERSION}${WIDGET_SET}-unicode${config_linkage_component}-${WX_RELEASE}${WX_FLAVOUR}" if test "$wxUSE_OSX_COCOA" = 1; then @@ -43775,7 +43772,6 @@ SAMPLES_SUBDIRS="`echo $SAMPLES_SUBDIRS | tr -s ' ' | tr ' ' '\n' | sort | uniq - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${MAKE-make} sets \$(MAKE)" >&5 diff --git a/configure.in b/configure.in index 1f0afc4759..3e68b66f9c 100644 --- a/configure.in +++ b/configure.in @@ -3563,9 +3563,6 @@ else fi -dnl This variable only exists for compatibility and will be removed soon. -WX_CHARTYPE="unicode" - WX_FLAVOUR=${WX_FLAVOUR:+-$WX_FLAVOUR} WX_LIB_FLAVOUR=`echo $WX_FLAVOUR | tr '-' '_'` @@ -3578,7 +3575,7 @@ WX_VERSION_TAG=`echo WXU${WX_LIB_FLAVOUR}_${WX_RELEASE} | tr '[[a-z]]' '[[A-Z]]' TOOLCHAIN_NAME="${TOOLKIT_DIR}${TOOLKIT_VERSION}${WIDGET_SET}u${WX_LIB_FLAVOUR}-${WX_RELEASE}${HOST_SUFFIX}" -TOOLCHAIN_FULLNAME="${HOST_PREFIX}${TOOLKIT_DIR}${TOOLKIT_VERSION}${WIDGET_SET}-${WX_CHARTYPE}${config_linkage_component}-${WX_RELEASE}${WX_FLAVOUR}" +TOOLCHAIN_FULLNAME="${HOST_PREFIX}${TOOLKIT_DIR}${TOOLKIT_VERSION}${WIDGET_SET}-unicode${config_linkage_component}-${WX_RELEASE}${WX_FLAVOUR}" dnl library link name dnl These just save us from exporting lib_{unicode,flavour}_suffix. @@ -8043,7 +8040,6 @@ AC_SUBST(WIDGET_SET) AC_SUBST(WX_RELEASE) AC_SUBST(WX_VERSION) AC_SUBST(WX_SUBVERSION) -AC_SUBST(WX_CHARTYPE) dnl both versions of all the usual flags variables: WX_FLAGS which are used for dnl building the library itself, and WXCONFIG_-prefixed variants which diff --git a/wx-config.in b/wx-config.in index e3f7d115bb..9050779e54 100755 --- a/wx-config.in +++ b/wx-config.in @@ -60,7 +60,8 @@ usage() NOTE: Usage of --debug and --query-debugtype are only relevant if you have any versions prior to 2.9 installed and use the --version option to - select an earlier version. + select an earlier version. Similarly, usage of --unicode is only relevant + if a version prior to 3.3 is used, as all later ones always use Unicode. If multiple builds of wxWidgets are available, you can use the options --prefix, --host, --toolkit, --unicode, --static, --universal, --version @@ -144,6 +145,9 @@ wxconfig_input_options="prefix exec_prefix utility $wxconfig_schema" # Notice that this includes "debug" but it is done only for compatibility, this # options (i.e. --debug[=yes] or --debug=no) is completely ignored as there is # no distinction between debug and release builds in wx any more +# +# For "unicode", the situation is similar except that specifying --unicode=no +# will always fail with this wxWidgets version. wxconfig_yesno_options="universal unicode debug static" # Boolean options that do something or not. @@ -415,7 +419,7 @@ is_cross && target="@host_alias@" this_host="${target:+${target}}" this_toolkit="@TOOLKIT_DIR@@TOOLKIT_VERSION@" this_widgetset="@WIDGET_SET@" -this_chartype="@WX_CHARTYPE@" +this_chartype="unicode" this_debugtype="release" this_flavour="@WX_FLAVOUR@" this_version="@WX_RELEASE@" diff --git a/wxwin.m4 b/wxwin.m4 index 3aa27d2c2a..fc44451d6d 100644 --- a/wxwin.m4 +++ b/wxwin.m4 @@ -63,7 +63,7 @@ dnl CFLAGS="$CFLAGS $WX_CFLAGS_ONLY" dnl dnl LIBS="$LIBS $WX_LIBS" dnl -dnl If you want to support standard --enable-debug/unicode/shared options, you +dnl If you want to support standard --enable-debug/shared options, you dnl may do the following: dnl dnl ... @@ -71,14 +71,13 @@ dnl AC_CANONICAL_TARGET dnl dnl # define configure options dnl WX_CONFIG_OPTIONS -dnl WX_STANDARD_OPTIONS([debug,unicode,shared,toolkit,wxshared]) +dnl WX_STANDARD_OPTIONS([debug,shared,toolkit,wxshared]) dnl dnl # basic configure checks dnl ... dnl -dnl # we want to always have DEBUG==WX_DEBUG and UNICODE==WX_UNICODE +dnl # we want to always have DEBUG==WX_DEBUG dnl WX_DEBUG=$DEBUG -dnl WX_UNICODE=$UNICODE dnl dnl WX_CONVERT_STANDARD_OPTIONS_TO_WXCONFIG_FLAGS dnl WX_CONFIG_CHECK([2.8.0], [wxWin=1],,[html,core,net,base],[$WXCONFIG_FLAGS]) @@ -168,8 +167,7 @@ dnl of wxWidgets libraries to link against if they are available. dnl WX-OPTIONAL-LIBS is supported on version 2.9.0 and later. dnl dnl Example use: -dnl WX_CONFIG_CHECK([2.6.0], [wxWin=1], [wxWin=0], [html,core,net] -dnl [--unicode --debug]) +dnl WX_CONFIG_CHECK([2.6.0], [wxWin=1], [wxWin=0], [html,core,net], [--debug]) dnl --------------------------------------------------------------------------- dnl @@ -485,16 +483,13 @@ dnl wxWidgets rule. dnl E.g. for output-var=='lib', name=='test', prefix='mine', sets dnl the $lib variable to: dnl 'mine_gtk2ud_test-2.8' -dnl if WX_PORT=gtk2, WX_UNICODE=1, WX_DEBUG=1 and WX_RELEASE=28 +dnl if WX_PORT=gtk2, WX_DEBUG=1 and WX_RELEASE=28 dnl --------------------------------------------------------------------------- AC_DEFUN([WX_LIKE_LIBNAME], [ - wx_temp="$2""_""$WX_PORT" + wx_temp="$2""_""$WX_PORT""u" - dnl add the [u][d] string - if test "$WX_UNICODE" = "1"; then - wx_temp="$wx_temp""u" - fi + dnl add the "d" suffix if necessary if test "$WX_DEBUG" = "1"; then wx_temp="$wx_temp""d" fi @@ -572,29 +567,26 @@ dnl --------------------------------------------------------------------------- dnl WX_STANDARD_OPTIONS([options-to-add]) dnl dnl Adds to the configure script one or more of the following options: -dnl --enable-[debug|unicode|shared|wxshared|wxdebug] +dnl --enable-[debug|shared|wxshared|wxdebug] dnl --with-[gtk|msw|x11|mac|dfb] dnl --with-wxversion -dnl Then checks for their presence and eventually set the DEBUG, UNICODE, SHARED, +dnl Then checks for their presence and eventually set the DEBUG, SHARED, dnl PORT, WX_SHARED, WX_DEBUG, variables to one of the "yes", "no", "auto" values. dnl -dnl Note that e.g. UNICODE != WX_UNICODE; the first is the value of the -dnl --enable-unicode option (in boolean format) while the second indicates -dnl if wxWidgets was built in Unicode mode (and still is in boolean format). +dnl Note that e.g. DEBUG != WX_DEBUG; the first is the value of the +dnl --enable-debug option (in boolean format) while the second indicates +dnl if wxWidgets was built in debug mode (and still is in boolean format). dnl --------------------------------------------------------------------------- AC_DEFUN([WX_STANDARD_OPTIONS], [ dnl the following lines will expand to WX_ARG_ENABLE_YESNOAUTO calls if and only if - dnl the $1 argument contains respectively the debug,unicode or shared options. + dnl the $1 argument contains respectively the debug or shared options. dnl be careful here not to set debug flag if only "wxdebug" was specified ifelse(regexp([$1], [\bdebug]), [-1],, [WX_ARG_ENABLE_YESNOAUTO([debug], [DEBUG], [Build in debug mode], [auto])]) - ifelse(index([$1], [unicode]), [-1],, - [WX_ARG_ENABLE_YESNOAUTO([unicode], [UNICODE], [Build in Unicode mode], [auto])]) - ifelse(regexp([$1], [\bshared]), [-1],, [WX_ARG_ENABLE_YESNOAUTO([shared], [SHARED], [Build as shared library], [auto])]) @@ -629,9 +621,9 @@ AC_DEFUN([WX_STANDARD_OPTIONS], ]) dnl ****** IMPORTANT ******* - dnl Unlike for the UNICODE setting, you can build your program in - dnl shared mode against a static build of wxWidgets. Thus we have the - dnl following option which allows these mixtures. E.g. + dnl You can build your program in shared mode against a static build + dnl of wxWidgets. Thus we have the following option which allows + dnl these mixtures. E.g. dnl dnl ./configure --disable-shared --with-wxshared dnl @@ -646,10 +638,6 @@ AC_DEFUN([WX_STANDARD_OPTIONS], dnl build of wxWidgets. This is not possible (you would mix PIC and non PIC code) ! dnl A check for this combination of options is in WX_DETECT_STANDARD_OPTION_VALUES dnl (where we know what 'auto' should be expanded to). - dnl - dnl If you try to build something in ANSI mode against a UNICODE build - dnl of wxWidgets or in RELEASE mode against a DEBUG build of wxWidgets, - dnl then at best you'll get ton of linking errors ! dnl ************************ ifelse(index([$1], [wxshared]), [-1],, @@ -706,7 +694,6 @@ AC_DEFUN([WX_STANDARD_OPTIONS], if test "$WX_DEBUG_CONFIGURE" = "1"; then echo "[[dbg]] DEBUG: $DEBUG, WX_DEBUG: $WX_DEBUG" - echo "[[dbg]] UNICODE: $UNICODE, WX_UNICODE: $WX_UNICODE" echo "[[dbg]] SHARED: $SHARED, WX_SHARED: $WX_SHARED" echo "[[dbg]] TOOLKIT: $TOOLKIT, WX_TOOLKIT: $WX_TOOLKIT" echo "[[dbg]] VERSION: $VERSION, WX_RELEASE: $WX_RELEASE" @@ -717,7 +704,7 @@ AC_DEFUN([WX_STANDARD_OPTIONS], dnl --------------------------------------------------------------------------- dnl WX_CONVERT_STANDARD_OPTIONS_TO_WXCONFIG_FLAGS dnl -dnl Sets the WXCONFIG_FLAGS string using the SHARED,DEBUG,UNICODE variable values +dnl Sets the WXCONFIG_FLAGS string using the SHARED,DEBUG variable values dnl which were specified. dnl Thus this macro needs to be called only once all options have been set. dnl --------------------------------------------------------------------------- @@ -735,13 +722,6 @@ AC_DEFUN([WX_CONVERT_STANDARD_OPTIONS_TO_WXCONFIG_FLAGS], WXCONFIG_FLAGS="$WXCONFIG_FLAGS""--debug=no " fi - dnl The user should have set WX_UNICODE=UNICODE - if test "$WX_UNICODE" = "1" ; then - WXCONFIG_FLAGS="$WXCONFIG_FLAGS""--unicode=yes " - elif test "$WX_UNICODE" = "0" ; then - WXCONFIG_FLAGS="$WXCONFIG_FLAGS""--unicode=no " - fi - if test -n "$TOOLKIT" ; then WXCONFIG_FLAGS="$WXCONFIG_FLAGS""--toolkit=$TOOLKIT " fi @@ -799,11 +779,10 @@ dnl --------------------------------------------------------------------------- dnl WX_DETECT_STANDARD_OPTION_VALUES dnl dnl Detects the values of the following variables: -dnl 1) WX_RELEASE -dnl 2) WX_UNICODE -dnl 3) WX_DEBUG -dnl 4) WX_SHARED (and also WX_STATIC) -dnl 5) WX_PORT +dnl - WX_RELEASE +dnl - WX_DEBUG +dnl - WX_SHARED (and also WX_STATIC) +dnl - WX_PORT dnl from the previously selected wxWidgets build; this macro in fact must be dnl called *after* calling the WX_CONFIG_CHECK macro. dnl @@ -845,9 +824,7 @@ AC_DEFUN([WX_DETECT_STANDARD_OPTION_VALUES], STATIC=1 fi - dnl Now set the WX_UNICODE, WX_DEBUG, WX_STATIC variables - _WX_SELECTEDCONFIG_CHECKFOR([UNICODE], [unicode], - [if wxWidgets was built with UNICODE enabled]) + dnl Now set the WX_DEBUG, WX_STATIC variables _WX_SELECTEDCONFIG_CHECKFOR([DEBUG], [debug], [if wxWidgets was built in DEBUG mode]) _WX_SELECTEDCONFIG_CHECKFOR([STATIC], [static], @@ -860,7 +837,6 @@ AC_DEFUN([WX_DETECT_STANDARD_OPTION_VALUES], WX_SHARED=1 fi - AC_SUBST(WX_UNICODE) AC_SUBST(WX_DEBUG) AC_SUBST(WX_SHARED) @@ -915,7 +891,6 @@ AC_DEFUN([WX_DETECT_STANDARD_OPTION_VALUES], if test "$WX_DEBUG_CONFIGURE" = "1"; then echo "[[dbg]] Values of all WX_* options after final detection:" echo "[[dbg]] WX_DEBUG: $WX_DEBUG" - echo "[[dbg]] WX_UNICODE: $WX_UNICODE" echo "[[dbg]] WX_SHARED: $WX_SHARED" echo "[[dbg]] WX_RELEASE: $WX_RELEASE" echo "[[dbg]] WX_PORT: $WX_PORT" @@ -940,9 +915,6 @@ AC_DEFUN([WX_DETECT_STANDARD_OPTION_VALUES], dnl now we can finally update the options to their final values if they dnl were not already set - if test -z "$UNICODE" ; then - UNICODE=$WX_UNICODE - fi if test -z "$SHARED" ; then SHARED=$WX_SHARED fi @@ -1001,7 +973,6 @@ AC_DEFUN([WX_STANDARD_OPTIONS_SUMMARY_MSG], echo " The wxWidgets build which will be used by $PACKAGE_NAME $PACKAGE_VERSION" echo " has the following settings:" WX_BOOLOPT_SUMMARY([WX_DEBUG], [" - DEBUG build"], [" - RELEASE build"]) - WX_BOOLOPT_SUMMARY([WX_UNICODE], [" - UNICODE mode"], [" - ANSI mode"]) WX_BOOLOPT_SUMMARY([WX_SHARED], [" - SHARED mode"], [" - STATIC mode"]) echo " - VERSION: $WX_VERSION" echo " - PORT: $WX_PORT" @@ -1029,7 +1000,6 @@ AC_DEFUN([WX_STANDARD_OPTIONS_SUMMARY_MSG_BEGIN], echo " Configuration for $PACKAGE_NAME $PACKAGE_VERSION successfully completed." echo " Summary of main configuration settings for $PACKAGE_NAME:" WX_BOOLOPT_SUMMARY([DEBUG], [" - DEBUG build"], [" - RELEASE build"]) - WX_BOOLOPT_SUMMARY([UNICODE], [" - UNICODE mode"], [" - ANSI mode"]) WX_BOOLOPT_SUMMARY([SHARED], [" - SHARED mode"], [" - STATIC mode"]) ])