Remove Unicode option support from wx-config and wxwin.m4
Keep the option itself, but hardcode its value.
This commit is contained in:
parent
c78b0d652b
commit
31ac8012e4
5 changed files with 30 additions and 65 deletions
|
|
@ -106,7 +106,6 @@ function(wx_write_config)
|
||||||
else()
|
else()
|
||||||
set(SHARED 0)
|
set(SHARED 0)
|
||||||
endif()
|
endif()
|
||||||
set(WX_CHARTYPE unicode)
|
|
||||||
set(lib_unicode_suffix u)
|
set(lib_unicode_suffix u)
|
||||||
if(CMAKE_CROSSCOMPILING)
|
if(CMAKE_CROSSCOMPILING)
|
||||||
set(cross_compiling yes)
|
set(cross_compiling yes)
|
||||||
|
|
|
||||||
6
configure
vendored
6
configure
vendored
|
|
@ -650,7 +650,6 @@ WXCONFIG_CFLAGS
|
||||||
WX_CFLAGS
|
WX_CFLAGS
|
||||||
WXCONFIG_CPPFLAGS
|
WXCONFIG_CPPFLAGS
|
||||||
WX_CPPFLAGS
|
WX_CPPFLAGS
|
||||||
WX_CHARTYPE
|
|
||||||
WX_SUBVERSION
|
WX_SUBVERSION
|
||||||
WX_VERSION
|
WX_VERSION
|
||||||
WX_RELEASE
|
WX_RELEASE
|
||||||
|
|
@ -32283,8 +32282,6 @@ else
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
|
||||||
WX_CHARTYPE="unicode"
|
|
||||||
|
|
||||||
WX_FLAVOUR=${WX_FLAVOUR:+-$WX_FLAVOUR}
|
WX_FLAVOUR=${WX_FLAVOUR:+-$WX_FLAVOUR}
|
||||||
WX_LIB_FLAVOUR=`echo $WX_FLAVOUR | tr '-' '_'`
|
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_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
|
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
|
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${MAKE-make} sets \$(MAKE)" >&5
|
||||||
|
|
|
||||||
|
|
@ -3563,9 +3563,6 @@ else
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
|
||||||
dnl This variable only exists for compatibility and will be removed soon.
|
|
||||||
WX_CHARTYPE="unicode"
|
|
||||||
|
|
||||||
WX_FLAVOUR=${WX_FLAVOUR:+-$WX_FLAVOUR}
|
WX_FLAVOUR=${WX_FLAVOUR:+-$WX_FLAVOUR}
|
||||||
WX_LIB_FLAVOUR=`echo $WX_FLAVOUR | tr '-' '_'`
|
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_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 library link name
|
||||||
dnl These just save us from exporting lib_{unicode,flavour}_suffix.
|
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_RELEASE)
|
||||||
AC_SUBST(WX_VERSION)
|
AC_SUBST(WX_VERSION)
|
||||||
AC_SUBST(WX_SUBVERSION)
|
AC_SUBST(WX_SUBVERSION)
|
||||||
AC_SUBST(WX_CHARTYPE)
|
|
||||||
|
|
||||||
dnl both versions of all the usual flags variables: WX_FLAGS which are used for
|
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
|
dnl building the library itself, and WXCONFIG_-prefixed variants which
|
||||||
|
|
|
||||||
|
|
@ -60,7 +60,8 @@ usage()
|
||||||
|
|
||||||
NOTE: Usage of --debug and --query-debugtype are only relevant if you
|
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
|
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
|
If multiple builds of wxWidgets are available, you can use the options
|
||||||
--prefix, --host, --toolkit, --unicode, --static, --universal, --version
|
--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
|
# 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
|
# 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
|
# 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"
|
wxconfig_yesno_options="universal unicode debug static"
|
||||||
|
|
||||||
# Boolean options that do something or not.
|
# Boolean options that do something or not.
|
||||||
|
|
@ -415,7 +419,7 @@ is_cross && target="@host_alias@"
|
||||||
this_host="${target:+${target}}"
|
this_host="${target:+${target}}"
|
||||||
this_toolkit="@TOOLKIT_DIR@@TOOLKIT_VERSION@"
|
this_toolkit="@TOOLKIT_DIR@@TOOLKIT_VERSION@"
|
||||||
this_widgetset="@WIDGET_SET@"
|
this_widgetset="@WIDGET_SET@"
|
||||||
this_chartype="@WX_CHARTYPE@"
|
this_chartype="unicode"
|
||||||
this_debugtype="release"
|
this_debugtype="release"
|
||||||
this_flavour="@WX_FLAVOUR@"
|
this_flavour="@WX_FLAVOUR@"
|
||||||
this_version="@WX_RELEASE@"
|
this_version="@WX_RELEASE@"
|
||||||
|
|
|
||||||
74
wxwin.m4
74
wxwin.m4
|
|
@ -63,7 +63,7 @@ dnl CFLAGS="$CFLAGS $WX_CFLAGS_ONLY"
|
||||||
dnl
|
dnl
|
||||||
dnl LIBS="$LIBS $WX_LIBS"
|
dnl LIBS="$LIBS $WX_LIBS"
|
||||||
dnl
|
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 may do the following:
|
||||||
dnl
|
dnl
|
||||||
dnl ...
|
dnl ...
|
||||||
|
|
@ -71,14 +71,13 @@ dnl AC_CANONICAL_TARGET
|
||||||
dnl
|
dnl
|
||||||
dnl # define configure options
|
dnl # define configure options
|
||||||
dnl WX_CONFIG_OPTIONS
|
dnl WX_CONFIG_OPTIONS
|
||||||
dnl WX_STANDARD_OPTIONS([debug,unicode,shared,toolkit,wxshared])
|
dnl WX_STANDARD_OPTIONS([debug,shared,toolkit,wxshared])
|
||||||
dnl
|
dnl
|
||||||
dnl # basic configure checks
|
dnl # basic configure checks
|
||||||
dnl ...
|
dnl ...
|
||||||
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_DEBUG=$DEBUG
|
||||||
dnl WX_UNICODE=$UNICODE
|
|
||||||
dnl
|
dnl
|
||||||
dnl WX_CONVERT_STANDARD_OPTIONS_TO_WXCONFIG_FLAGS
|
dnl WX_CONVERT_STANDARD_OPTIONS_TO_WXCONFIG_FLAGS
|
||||||
dnl WX_CONFIG_CHECK([2.8.0], [wxWin=1],,[html,core,net,base],[$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 WX-OPTIONAL-LIBS is supported on version 2.9.0 and later.
|
||||||
dnl
|
dnl
|
||||||
dnl Example use:
|
dnl Example use:
|
||||||
dnl WX_CONFIG_CHECK([2.6.0], [wxWin=1], [wxWin=0], [html,core,net]
|
dnl WX_CONFIG_CHECK([2.6.0], [wxWin=1], [wxWin=0], [html,core,net], [--debug])
|
||||||
dnl [--unicode --debug])
|
|
||||||
dnl ---------------------------------------------------------------------------
|
dnl ---------------------------------------------------------------------------
|
||||||
|
|
||||||
dnl
|
dnl
|
||||||
|
|
@ -485,16 +483,13 @@ dnl wxWidgets rule.
|
||||||
dnl E.g. for output-var=='lib', name=='test', prefix='mine', sets
|
dnl E.g. for output-var=='lib', name=='test', prefix='mine', sets
|
||||||
dnl the $lib variable to:
|
dnl the $lib variable to:
|
||||||
dnl 'mine_gtk2ud_test-2.8'
|
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 ---------------------------------------------------------------------------
|
dnl ---------------------------------------------------------------------------
|
||||||
AC_DEFUN([WX_LIKE_LIBNAME],
|
AC_DEFUN([WX_LIKE_LIBNAME],
|
||||||
[
|
[
|
||||||
wx_temp="$2""_""$WX_PORT"
|
wx_temp="$2""_""$WX_PORT""u"
|
||||||
|
|
||||||
dnl add the [u][d] string
|
dnl add the "d" suffix if necessary
|
||||||
if test "$WX_UNICODE" = "1"; then
|
|
||||||
wx_temp="$wx_temp""u"
|
|
||||||
fi
|
|
||||||
if test "$WX_DEBUG" = "1"; then
|
if test "$WX_DEBUG" = "1"; then
|
||||||
wx_temp="$wx_temp""d"
|
wx_temp="$wx_temp""d"
|
||||||
fi
|
fi
|
||||||
|
|
@ -572,29 +567,26 @@ dnl ---------------------------------------------------------------------------
|
||||||
dnl WX_STANDARD_OPTIONS([options-to-add])
|
dnl WX_STANDARD_OPTIONS([options-to-add])
|
||||||
dnl
|
dnl
|
||||||
dnl Adds to the configure script one or more of the following options:
|
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-[gtk|msw|x11|mac|dfb]
|
||||||
dnl --with-wxversion
|
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 PORT, WX_SHARED, WX_DEBUG, variables to one of the "yes", "no", "auto" values.
|
||||||
dnl
|
dnl
|
||||||
dnl Note that e.g. UNICODE != WX_UNICODE; the first is the value of the
|
dnl Note that e.g. DEBUG != WX_DEBUG; the first is the value of the
|
||||||
dnl --enable-unicode option (in boolean format) while the second indicates
|
dnl --enable-debug option (in boolean format) while the second indicates
|
||||||
dnl if wxWidgets was built in Unicode mode (and still is in boolean format).
|
dnl if wxWidgets was built in debug mode (and still is in boolean format).
|
||||||
dnl ---------------------------------------------------------------------------
|
dnl ---------------------------------------------------------------------------
|
||||||
AC_DEFUN([WX_STANDARD_OPTIONS],
|
AC_DEFUN([WX_STANDARD_OPTIONS],
|
||||||
[
|
[
|
||||||
|
|
||||||
dnl the following lines will expand to WX_ARG_ENABLE_YESNOAUTO calls if and only if
|
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
|
dnl be careful here not to set debug flag if only "wxdebug" was specified
|
||||||
ifelse(regexp([$1], [\bdebug]), [-1],,
|
ifelse(regexp([$1], [\bdebug]), [-1],,
|
||||||
[WX_ARG_ENABLE_YESNOAUTO([debug], [DEBUG], [Build in debug mode], [auto])])
|
[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],,
|
ifelse(regexp([$1], [\bshared]), [-1],,
|
||||||
[WX_ARG_ENABLE_YESNOAUTO([shared], [SHARED], [Build as shared library], [auto])])
|
[WX_ARG_ENABLE_YESNOAUTO([shared], [SHARED], [Build as shared library], [auto])])
|
||||||
|
|
||||||
|
|
@ -629,9 +621,9 @@ AC_DEFUN([WX_STANDARD_OPTIONS],
|
||||||
])
|
])
|
||||||
|
|
||||||
dnl ****** IMPORTANT *******
|
dnl ****** IMPORTANT *******
|
||||||
dnl Unlike for the UNICODE setting, you can build your program in
|
dnl You can build your program in shared mode against a static build
|
||||||
dnl shared mode against a static build of wxWidgets. Thus we have the
|
dnl of wxWidgets. Thus we have the following option which allows
|
||||||
dnl following option which allows these mixtures. E.g.
|
dnl these mixtures. E.g.
|
||||||
dnl
|
dnl
|
||||||
dnl ./configure --disable-shared --with-wxshared
|
dnl ./configure --disable-shared --with-wxshared
|
||||||
dnl
|
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 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 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 (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 ************************
|
dnl ************************
|
||||||
|
|
||||||
ifelse(index([$1], [wxshared]), [-1],,
|
ifelse(index([$1], [wxshared]), [-1],,
|
||||||
|
|
@ -706,7 +694,6 @@ AC_DEFUN([WX_STANDARD_OPTIONS],
|
||||||
|
|
||||||
if test "$WX_DEBUG_CONFIGURE" = "1"; then
|
if test "$WX_DEBUG_CONFIGURE" = "1"; then
|
||||||
echo "[[dbg]] DEBUG: $DEBUG, WX_DEBUG: $WX_DEBUG"
|
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]] SHARED: $SHARED, WX_SHARED: $WX_SHARED"
|
||||||
echo "[[dbg]] TOOLKIT: $TOOLKIT, WX_TOOLKIT: $WX_TOOLKIT"
|
echo "[[dbg]] TOOLKIT: $TOOLKIT, WX_TOOLKIT: $WX_TOOLKIT"
|
||||||
echo "[[dbg]] VERSION: $VERSION, WX_RELEASE: $WX_RELEASE"
|
echo "[[dbg]] VERSION: $VERSION, WX_RELEASE: $WX_RELEASE"
|
||||||
|
|
@ -717,7 +704,7 @@ AC_DEFUN([WX_STANDARD_OPTIONS],
|
||||||
dnl ---------------------------------------------------------------------------
|
dnl ---------------------------------------------------------------------------
|
||||||
dnl WX_CONVERT_STANDARD_OPTIONS_TO_WXCONFIG_FLAGS
|
dnl WX_CONVERT_STANDARD_OPTIONS_TO_WXCONFIG_FLAGS
|
||||||
dnl
|
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 which were specified.
|
||||||
dnl Thus this macro needs to be called only once all options have been set.
|
dnl Thus this macro needs to be called only once all options have been set.
|
||||||
dnl ---------------------------------------------------------------------------
|
dnl ---------------------------------------------------------------------------
|
||||||
|
|
@ -735,13 +722,6 @@ AC_DEFUN([WX_CONVERT_STANDARD_OPTIONS_TO_WXCONFIG_FLAGS],
|
||||||
WXCONFIG_FLAGS="$WXCONFIG_FLAGS""--debug=no "
|
WXCONFIG_FLAGS="$WXCONFIG_FLAGS""--debug=no "
|
||||||
fi
|
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
|
if test -n "$TOOLKIT" ; then
|
||||||
WXCONFIG_FLAGS="$WXCONFIG_FLAGS""--toolkit=$TOOLKIT "
|
WXCONFIG_FLAGS="$WXCONFIG_FLAGS""--toolkit=$TOOLKIT "
|
||||||
fi
|
fi
|
||||||
|
|
@ -799,11 +779,10 @@ dnl ---------------------------------------------------------------------------
|
||||||
dnl WX_DETECT_STANDARD_OPTION_VALUES
|
dnl WX_DETECT_STANDARD_OPTION_VALUES
|
||||||
dnl
|
dnl
|
||||||
dnl Detects the values of the following variables:
|
dnl Detects the values of the following variables:
|
||||||
dnl 1) WX_RELEASE
|
dnl - WX_RELEASE
|
||||||
dnl 2) WX_UNICODE
|
dnl - WX_DEBUG
|
||||||
dnl 3) WX_DEBUG
|
dnl - WX_SHARED (and also WX_STATIC)
|
||||||
dnl 4) WX_SHARED (and also WX_STATIC)
|
dnl - WX_PORT
|
||||||
dnl 5) WX_PORT
|
|
||||||
dnl from the previously selected wxWidgets build; this macro in fact must be
|
dnl from the previously selected wxWidgets build; this macro in fact must be
|
||||||
dnl called *after* calling the WX_CONFIG_CHECK macro.
|
dnl called *after* calling the WX_CONFIG_CHECK macro.
|
||||||
dnl
|
dnl
|
||||||
|
|
@ -845,9 +824,7 @@ AC_DEFUN([WX_DETECT_STANDARD_OPTION_VALUES],
|
||||||
STATIC=1
|
STATIC=1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
dnl Now set the WX_UNICODE, WX_DEBUG, WX_STATIC variables
|
dnl Now set the WX_DEBUG, WX_STATIC variables
|
||||||
_WX_SELECTEDCONFIG_CHECKFOR([UNICODE], [unicode],
|
|
||||||
[if wxWidgets was built with UNICODE enabled])
|
|
||||||
_WX_SELECTEDCONFIG_CHECKFOR([DEBUG], [debug],
|
_WX_SELECTEDCONFIG_CHECKFOR([DEBUG], [debug],
|
||||||
[if wxWidgets was built in DEBUG mode])
|
[if wxWidgets was built in DEBUG mode])
|
||||||
_WX_SELECTEDCONFIG_CHECKFOR([STATIC], [static],
|
_WX_SELECTEDCONFIG_CHECKFOR([STATIC], [static],
|
||||||
|
|
@ -860,7 +837,6 @@ AC_DEFUN([WX_DETECT_STANDARD_OPTION_VALUES],
|
||||||
WX_SHARED=1
|
WX_SHARED=1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
AC_SUBST(WX_UNICODE)
|
|
||||||
AC_SUBST(WX_DEBUG)
|
AC_SUBST(WX_DEBUG)
|
||||||
AC_SUBST(WX_SHARED)
|
AC_SUBST(WX_SHARED)
|
||||||
|
|
||||||
|
|
@ -915,7 +891,6 @@ AC_DEFUN([WX_DETECT_STANDARD_OPTION_VALUES],
|
||||||
if test "$WX_DEBUG_CONFIGURE" = "1"; then
|
if test "$WX_DEBUG_CONFIGURE" = "1"; then
|
||||||
echo "[[dbg]] Values of all WX_* options after final detection:"
|
echo "[[dbg]] Values of all WX_* options after final detection:"
|
||||||
echo "[[dbg]] WX_DEBUG: $WX_DEBUG"
|
echo "[[dbg]] WX_DEBUG: $WX_DEBUG"
|
||||||
echo "[[dbg]] WX_UNICODE: $WX_UNICODE"
|
|
||||||
echo "[[dbg]] WX_SHARED: $WX_SHARED"
|
echo "[[dbg]] WX_SHARED: $WX_SHARED"
|
||||||
echo "[[dbg]] WX_RELEASE: $WX_RELEASE"
|
echo "[[dbg]] WX_RELEASE: $WX_RELEASE"
|
||||||
echo "[[dbg]] WX_PORT: $WX_PORT"
|
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 now we can finally update the options to their final values if they
|
||||||
dnl were not already set
|
dnl were not already set
|
||||||
if test -z "$UNICODE" ; then
|
|
||||||
UNICODE=$WX_UNICODE
|
|
||||||
fi
|
|
||||||
if test -z "$SHARED" ; then
|
if test -z "$SHARED" ; then
|
||||||
SHARED=$WX_SHARED
|
SHARED=$WX_SHARED
|
||||||
fi
|
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 " The wxWidgets build which will be used by $PACKAGE_NAME $PACKAGE_VERSION"
|
||||||
echo " has the following settings:"
|
echo " has the following settings:"
|
||||||
WX_BOOLOPT_SUMMARY([WX_DEBUG], [" - DEBUG build"], [" - RELEASE build"])
|
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"])
|
WX_BOOLOPT_SUMMARY([WX_SHARED], [" - SHARED mode"], [" - STATIC mode"])
|
||||||
echo " - VERSION: $WX_VERSION"
|
echo " - VERSION: $WX_VERSION"
|
||||||
echo " - PORT: $WX_PORT"
|
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 " Configuration for $PACKAGE_NAME $PACKAGE_VERSION successfully completed."
|
||||||
echo " Summary of main configuration settings for $PACKAGE_NAME:"
|
echo " Summary of main configuration settings for $PACKAGE_NAME:"
|
||||||
WX_BOOLOPT_SUMMARY([DEBUG], [" - DEBUG build"], [" - RELEASE build"])
|
WX_BOOLOPT_SUMMARY([DEBUG], [" - DEBUG build"], [" - RELEASE build"])
|
||||||
WX_BOOLOPT_SUMMARY([UNICODE], [" - UNICODE mode"], [" - ANSI mode"])
|
|
||||||
WX_BOOLOPT_SUMMARY([SHARED], [" - SHARED mode"], [" - STATIC mode"])
|
WX_BOOLOPT_SUMMARY([SHARED], [" - SHARED mode"], [" - STATIC mode"])
|
||||||
])
|
])
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue