Change Unix build system to not use debug build any more.
Remove "d" suffix from the libraries and the BUILD variable which is not used any longer. Also ignore (but still support, for compatibility) --debug option in wx-config. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@61889 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
618
configure
vendored
618
configure
vendored
@@ -747,7 +747,6 @@ EXTRALIBS_GNOMEPRINT
|
|||||||
EXTRALIBS_GNOMEVFS
|
EXTRALIBS_GNOMEVFS
|
||||||
EXTRALIBS_HILDON
|
EXTRALIBS_HILDON
|
||||||
UNICODE
|
UNICODE
|
||||||
BUILD
|
|
||||||
DEBUG_INFO
|
DEBUG_INFO
|
||||||
DEBUG_FLAG
|
DEBUG_FLAG
|
||||||
TOOLKIT_LOWERCASE
|
TOOLKIT_LOWERCASE
|
||||||
@@ -831,6 +830,7 @@ COND_BUILD_release
|
|||||||
COND_BUILD_release_DEBUG_INFO_default
|
COND_BUILD_release_DEBUG_INFO_default
|
||||||
COND_BUILD_release_UNICODE_0
|
COND_BUILD_release_UNICODE_0
|
||||||
COND_BUILD_release_UNICODE_1
|
COND_BUILD_release_UNICODE_1
|
||||||
|
COND_DEBUG_FLAG_0
|
||||||
COND_DEBUG_FLAG_1
|
COND_DEBUG_FLAG_1
|
||||||
COND_DEBUG_INFO_0
|
COND_DEBUG_INFO_0
|
||||||
COND_DEBUG_INFO_1
|
COND_DEBUG_INFO_1
|
||||||
@@ -1012,7 +1012,6 @@ WX_RELEASE
|
|||||||
WX_VERSION
|
WX_VERSION
|
||||||
WX_SUBVERSION
|
WX_SUBVERSION
|
||||||
WX_CHARTYPE
|
WX_CHARTYPE
|
||||||
WX_DEBUGTYPE
|
|
||||||
WXCONFIG_CPPFLAGS
|
WXCONFIG_CPPFLAGS
|
||||||
WXCONFIG_CFLAGS
|
WXCONFIG_CFLAGS
|
||||||
WXCONFIG_CXXFLAGS
|
WXCONFIG_CXXFLAGS
|
||||||
@@ -1664,8 +1663,13 @@ Optional Features:
|
|||||||
--enable-nanox use NanoX
|
--enable-nanox use NanoX
|
||||||
--disable-gtk2 use GTK+ 1.2 instead of 2.0
|
--disable-gtk2 use GTK+ 1.2 instead of 2.0
|
||||||
--enable-gpe use GNOME PDA Environment features if possible
|
--enable-gpe use GNOME PDA Environment features if possible
|
||||||
|
--enable-debug build library for debugging
|
||||||
|
--disable-debug_flag disable all debugging support
|
||||||
|
--enable-debug_info generate debug information
|
||||||
|
--enable-debug_gdb create code with extra GDB debugging information
|
||||||
|
--enable-debug_cntxt obsolete, don't use: use wxDebugContext
|
||||||
|
--enable-mem_tracing obsolete, don't use: create code with memory tracing
|
||||||
--disable-shared create static library instead of shared
|
--disable-shared create static library instead of shared
|
||||||
--enable-debug same as debug_flag and debug_info
|
|
||||||
--enable-stl use STL for containers
|
--enable-stl use STL for containers
|
||||||
--enable-std_iostreams use standard C++ stream classes
|
--enable-std_iostreams use standard C++ stream classes
|
||||||
--enable-std_string use standard C++ string classes
|
--enable-std_string use standard C++ string classes
|
||||||
@@ -1675,12 +1679,7 @@ Optional Features:
|
|||||||
--enable-utf8only only support UTF-8 locales in UTF-8 build (Unix only)
|
--enable-utf8only only support UTF-8 locales in UTF-8 build (Unix only)
|
||||||
--enable-extended_rtti use extended RTTI (XTI)
|
--enable-extended_rtti use extended RTTI (XTI)
|
||||||
--enable-omf use OMF object format
|
--enable-omf use OMF object format
|
||||||
--enable-debug_flag set __WXDEBUG__ flag (recommended for developers!)
|
|
||||||
--enable-debug_info create code with debugging information
|
|
||||||
--disable-optimise compile without optimisations
|
--disable-optimise compile without optimisations
|
||||||
--enable-debug_gdb create code with extra GDB debugging information
|
|
||||||
--enable-debug_cntxt use wxDebugContext
|
|
||||||
--enable-mem_tracing create code with memory tracing
|
|
||||||
--enable-profile create code with profiling information
|
--enable-profile create code with profiling information
|
||||||
--enable-no_rtti create code without RTTI information
|
--enable-no_rtti create code without RTTI information
|
||||||
--enable-no_exceptions create code without C++ exceptions handling
|
--enable-no_exceptions create code without C++ exceptions handling
|
||||||
@@ -4318,6 +4317,274 @@ fi
|
|||||||
echo "${ECHO_T}$wxUSE_MACOSX_VERSION_MIN" >&6; }
|
echo "${ECHO_T}$wxUSE_MACOSX_VERSION_MIN" >&6; }
|
||||||
|
|
||||||
|
|
||||||
|
{ echo "$as_me:$LINENO: checking for --enable-debug" >&5
|
||||||
|
echo $ECHO_N "checking for --enable-debug... $ECHO_C" >&6; }
|
||||||
|
# Check whether --enable-debug was given.
|
||||||
|
if test "${enable_debug+set}" = set; then
|
||||||
|
enableval=$enable_debug;
|
||||||
|
if test "$enableval" = yes; then
|
||||||
|
wxUSE_DEBUG=yes
|
||||||
|
elif test "$enableval" = no; then
|
||||||
|
wxUSE_DEBUG=no
|
||||||
|
elif test "$enableval" = max; then
|
||||||
|
wxUSE_DEBUG=yes
|
||||||
|
WXCONFIG_CPPFLAGS="$WXCONFIG_CPPFLAGS -DwxDEBUG_LEVEL=2"
|
||||||
|
else
|
||||||
|
{ { echo "$as_me:$LINENO: error: Invalid --enable-debug value, must be yes, no or max" >&5
|
||||||
|
echo "$as_me: error: Invalid --enable-debug value, must be yes, no or max" >&2;}
|
||||||
|
{ (exit 1); exit 1; }; }
|
||||||
|
fi
|
||||||
|
|
||||||
|
|
||||||
|
else
|
||||||
|
wxUSE_DEBUG=default
|
||||||
|
|
||||||
|
fi
|
||||||
|
|
||||||
|
|
||||||
|
case "$wxUSE_DEBUG" in
|
||||||
|
yes)
|
||||||
|
DEFAULT_wxUSE_DEBUG_FLAG=yes
|
||||||
|
DEFAULT_wxUSE_DEBUG_INFO=yes
|
||||||
|
|
||||||
|
DEFAULT_wxUSE_OPTIMISE=no
|
||||||
|
;;
|
||||||
|
|
||||||
|
no)
|
||||||
|
DEFAULT_wxUSE_DEBUG_FLAG=no
|
||||||
|
DEFAULT_wxUSE_DEBUG_INFO=no
|
||||||
|
;;
|
||||||
|
|
||||||
|
default)
|
||||||
|
DEFAULT_wxUSE_DEBUG_FLAG=yes
|
||||||
|
DEFAULT_wxUSE_DEBUG_INFO=no
|
||||||
|
;;
|
||||||
|
esac
|
||||||
|
|
||||||
|
|
||||||
|
enablestring=disable
|
||||||
|
defaultval=
|
||||||
|
if test -z "$defaultval"; then
|
||||||
|
if test x"$enablestring" = xdisable; then
|
||||||
|
defaultval=yes
|
||||||
|
else
|
||||||
|
defaultval=no
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
|
||||||
|
{ echo "$as_me:$LINENO: checking for --${enablestring:-enable}-debug_flag" >&5
|
||||||
|
echo $ECHO_N "checking for --${enablestring:-enable}-debug_flag... $ECHO_C" >&6; }
|
||||||
|
# Check whether --enable-debug_flag was given.
|
||||||
|
if test "${enable_debug_flag+set}" = set; then
|
||||||
|
enableval=$enable_debug_flag;
|
||||||
|
if test "$enableval" = yes; then
|
||||||
|
wx_cv_use_debug_flag='wxUSE_DEBUG_FLAG=yes'
|
||||||
|
else
|
||||||
|
wx_cv_use_debug_flag='wxUSE_DEBUG_FLAG=no'
|
||||||
|
fi
|
||||||
|
|
||||||
|
else
|
||||||
|
|
||||||
|
wx_cv_use_debug_flag='wxUSE_DEBUG_FLAG=${'DEFAULT_wxUSE_DEBUG_FLAG":-$defaultval}"
|
||||||
|
|
||||||
|
fi
|
||||||
|
|
||||||
|
|
||||||
|
eval "$wx_cv_use_debug_flag"
|
||||||
|
|
||||||
|
if test x"$enablestring" = xdisable; then
|
||||||
|
if test $wxUSE_DEBUG_FLAG = no; then
|
||||||
|
result=yes
|
||||||
|
else
|
||||||
|
result=no
|
||||||
|
fi
|
||||||
|
else
|
||||||
|
result=$wxUSE_DEBUG_FLAG
|
||||||
|
fi
|
||||||
|
|
||||||
|
{ echo "$as_me:$LINENO: result: $result" >&5
|
||||||
|
echo "${ECHO_T}$result" >&6; }
|
||||||
|
|
||||||
|
|
||||||
|
enablestring=
|
||||||
|
defaultval=
|
||||||
|
if test -z "$defaultval"; then
|
||||||
|
if test x"$enablestring" = xdisable; then
|
||||||
|
defaultval=yes
|
||||||
|
else
|
||||||
|
defaultval=no
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
|
||||||
|
{ echo "$as_me:$LINENO: checking for --${enablestring:-enable}-debug_info" >&5
|
||||||
|
echo $ECHO_N "checking for --${enablestring:-enable}-debug_info... $ECHO_C" >&6; }
|
||||||
|
# Check whether --enable-debug_info was given.
|
||||||
|
if test "${enable_debug_info+set}" = set; then
|
||||||
|
enableval=$enable_debug_info;
|
||||||
|
if test "$enableval" = yes; then
|
||||||
|
wx_cv_use_debug_info='wxUSE_DEBUG_INFO=yes'
|
||||||
|
else
|
||||||
|
wx_cv_use_debug_info='wxUSE_DEBUG_INFO=no'
|
||||||
|
fi
|
||||||
|
|
||||||
|
else
|
||||||
|
|
||||||
|
wx_cv_use_debug_info='wxUSE_DEBUG_INFO=${'DEFAULT_wxUSE_DEBUG_INFO":-$defaultval}"
|
||||||
|
|
||||||
|
fi
|
||||||
|
|
||||||
|
|
||||||
|
eval "$wx_cv_use_debug_info"
|
||||||
|
|
||||||
|
if test x"$enablestring" = xdisable; then
|
||||||
|
if test $wxUSE_DEBUG_INFO = no; then
|
||||||
|
result=yes
|
||||||
|
else
|
||||||
|
result=no
|
||||||
|
fi
|
||||||
|
else
|
||||||
|
result=$wxUSE_DEBUG_INFO
|
||||||
|
fi
|
||||||
|
|
||||||
|
{ echo "$as_me:$LINENO: result: $result" >&5
|
||||||
|
echo "${ECHO_T}$result" >&6; }
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
enablestring=
|
||||||
|
defaultval=
|
||||||
|
if test -z "$defaultval"; then
|
||||||
|
if test x"$enablestring" = xdisable; then
|
||||||
|
defaultval=yes
|
||||||
|
else
|
||||||
|
defaultval=no
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
|
||||||
|
{ echo "$as_me:$LINENO: checking for --${enablestring:-enable}-debug_gdb" >&5
|
||||||
|
echo $ECHO_N "checking for --${enablestring:-enable}-debug_gdb... $ECHO_C" >&6; }
|
||||||
|
# Check whether --enable-debug_gdb was given.
|
||||||
|
if test "${enable_debug_gdb+set}" = set; then
|
||||||
|
enableval=$enable_debug_gdb;
|
||||||
|
if test "$enableval" = yes; then
|
||||||
|
wx_cv_use_debug_gdb='wxUSE_DEBUG_GDB=yes'
|
||||||
|
else
|
||||||
|
wx_cv_use_debug_gdb='wxUSE_DEBUG_GDB=no'
|
||||||
|
fi
|
||||||
|
|
||||||
|
else
|
||||||
|
|
||||||
|
wx_cv_use_debug_gdb='wxUSE_DEBUG_GDB=${'DEFAULT_wxUSE_DEBUG_GDB":-$defaultval}"
|
||||||
|
|
||||||
|
fi
|
||||||
|
|
||||||
|
|
||||||
|
eval "$wx_cv_use_debug_gdb"
|
||||||
|
|
||||||
|
if test x"$enablestring" = xdisable; then
|
||||||
|
if test $wxUSE_DEBUG_GDB = no; then
|
||||||
|
result=yes
|
||||||
|
else
|
||||||
|
result=no
|
||||||
|
fi
|
||||||
|
else
|
||||||
|
result=$wxUSE_DEBUG_GDB
|
||||||
|
fi
|
||||||
|
|
||||||
|
{ echo "$as_me:$LINENO: result: $result" >&5
|
||||||
|
echo "${ECHO_T}$result" >&6; }
|
||||||
|
|
||||||
|
|
||||||
|
enablestring=
|
||||||
|
defaultval=
|
||||||
|
if test -z "$defaultval"; then
|
||||||
|
if test x"$enablestring" = xdisable; then
|
||||||
|
defaultval=yes
|
||||||
|
else
|
||||||
|
defaultval=no
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
|
||||||
|
{ echo "$as_me:$LINENO: checking for --${enablestring:-enable}-debug_cntxt" >&5
|
||||||
|
echo $ECHO_N "checking for --${enablestring:-enable}-debug_cntxt... $ECHO_C" >&6; }
|
||||||
|
# Check whether --enable-debug_cntxt was given.
|
||||||
|
if test "${enable_debug_cntxt+set}" = set; then
|
||||||
|
enableval=$enable_debug_cntxt;
|
||||||
|
if test "$enableval" = yes; then
|
||||||
|
wx_cv_use_debug_cntxt='wxUSE_DEBUG_CONTEXT=yes'
|
||||||
|
else
|
||||||
|
wx_cv_use_debug_cntxt='wxUSE_DEBUG_CONTEXT=no'
|
||||||
|
fi
|
||||||
|
|
||||||
|
else
|
||||||
|
|
||||||
|
wx_cv_use_debug_cntxt='wxUSE_DEBUG_CONTEXT=${'DEFAULT_wxUSE_DEBUG_CONTEXT":-$defaultval}"
|
||||||
|
|
||||||
|
fi
|
||||||
|
|
||||||
|
|
||||||
|
eval "$wx_cv_use_debug_cntxt"
|
||||||
|
|
||||||
|
if test x"$enablestring" = xdisable; then
|
||||||
|
if test $wxUSE_DEBUG_CONTEXT = no; then
|
||||||
|
result=yes
|
||||||
|
else
|
||||||
|
result=no
|
||||||
|
fi
|
||||||
|
else
|
||||||
|
result=$wxUSE_DEBUG_CONTEXT
|
||||||
|
fi
|
||||||
|
|
||||||
|
{ echo "$as_me:$LINENO: result: $result" >&5
|
||||||
|
echo "${ECHO_T}$result" >&6; }
|
||||||
|
|
||||||
|
|
||||||
|
enablestring=
|
||||||
|
defaultval=
|
||||||
|
if test -z "$defaultval"; then
|
||||||
|
if test x"$enablestring" = xdisable; then
|
||||||
|
defaultval=yes
|
||||||
|
else
|
||||||
|
defaultval=no
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
|
||||||
|
{ echo "$as_me:$LINENO: checking for --${enablestring:-enable}-mem_tracing" >&5
|
||||||
|
echo $ECHO_N "checking for --${enablestring:-enable}-mem_tracing... $ECHO_C" >&6; }
|
||||||
|
# Check whether --enable-mem_tracing was given.
|
||||||
|
if test "${enable_mem_tracing+set}" = set; then
|
||||||
|
enableval=$enable_mem_tracing;
|
||||||
|
if test "$enableval" = yes; then
|
||||||
|
wx_cv_use_mem_tracing='wxUSE_MEM_TRACING=yes'
|
||||||
|
else
|
||||||
|
wx_cv_use_mem_tracing='wxUSE_MEM_TRACING=no'
|
||||||
|
fi
|
||||||
|
|
||||||
|
else
|
||||||
|
|
||||||
|
wx_cv_use_mem_tracing='wxUSE_MEM_TRACING=${'DEFAULT_wxUSE_MEM_TRACING":-$defaultval}"
|
||||||
|
|
||||||
|
fi
|
||||||
|
|
||||||
|
|
||||||
|
eval "$wx_cv_use_mem_tracing"
|
||||||
|
|
||||||
|
if test x"$enablestring" = xdisable; then
|
||||||
|
if test $wxUSE_MEM_TRACING = no; then
|
||||||
|
result=yes
|
||||||
|
else
|
||||||
|
result=no
|
||||||
|
fi
|
||||||
|
else
|
||||||
|
result=$wxUSE_MEM_TRACING
|
||||||
|
fi
|
||||||
|
|
||||||
|
{ echo "$as_me:$LINENO: result: $result" >&5
|
||||||
|
echo "${ECHO_T}$result" >&6; }
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
enablestring=disable
|
enablestring=disable
|
||||||
defaultval=
|
defaultval=
|
||||||
@@ -4363,50 +4630,6 @@ fi
|
|||||||
echo "${ECHO_T}$result" >&6; }
|
echo "${ECHO_T}$result" >&6; }
|
||||||
|
|
||||||
|
|
||||||
enablestring=
|
|
||||||
defaultval=
|
|
||||||
if test -z "$defaultval"; then
|
|
||||||
if test x"$enablestring" = xdisable; then
|
|
||||||
defaultval=yes
|
|
||||||
else
|
|
||||||
defaultval=no
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
|
|
||||||
{ echo "$as_me:$LINENO: checking for --${enablestring:-enable}-debug" >&5
|
|
||||||
echo $ECHO_N "checking for --${enablestring:-enable}-debug... $ECHO_C" >&6; }
|
|
||||||
# Check whether --enable-debug was given.
|
|
||||||
if test "${enable_debug+set}" = set; then
|
|
||||||
enableval=$enable_debug;
|
|
||||||
if test "$enableval" = yes; then
|
|
||||||
wx_cv_use_debug='wxUSE_DEBUG=yes'
|
|
||||||
else
|
|
||||||
wx_cv_use_debug='wxUSE_DEBUG=no'
|
|
||||||
fi
|
|
||||||
|
|
||||||
else
|
|
||||||
|
|
||||||
wx_cv_use_debug='wxUSE_DEBUG=${'DEFAULT_wxUSE_DEBUG":-$defaultval}"
|
|
||||||
|
|
||||||
fi
|
|
||||||
|
|
||||||
|
|
||||||
eval "$wx_cv_use_debug"
|
|
||||||
|
|
||||||
if test x"$enablestring" = xdisable; then
|
|
||||||
if test $wxUSE_DEBUG = no; then
|
|
||||||
result=yes
|
|
||||||
else
|
|
||||||
result=no
|
|
||||||
fi
|
|
||||||
else
|
|
||||||
result=$wxUSE_DEBUG
|
|
||||||
fi
|
|
||||||
|
|
||||||
{ echo "$as_me:$LINENO: result: $result" >&5
|
|
||||||
echo "${ECHO_T}$result" >&6; }
|
|
||||||
|
|
||||||
|
|
||||||
enablestring=
|
enablestring=
|
||||||
defaultval=
|
defaultval=
|
||||||
if test -z "$defaultval"; then
|
if test -z "$defaultval"; then
|
||||||
@@ -4783,114 +5006,6 @@ echo "${ECHO_T}$result" >&6; }
|
|||||||
|
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if test "$wxUSE_DEBUG" = "yes"; then
|
|
||||||
DEFAULT_wxUSE_DEBUG_FLAG=yes
|
|
||||||
DEFAULT_wxUSE_DEBUG_INFO=yes
|
|
||||||
BUILD=debug
|
|
||||||
elif test "$wxUSE_DEBUG" = "no"; then
|
|
||||||
DEFAULT_wxUSE_DEBUG_FLAG=no
|
|
||||||
DEFAULT_wxUSE_DEBUG_INFO=no
|
|
||||||
BUILD=release
|
|
||||||
fi
|
|
||||||
|
|
||||||
|
|
||||||
enablestring=
|
|
||||||
defaultval=
|
|
||||||
if test -z "$defaultval"; then
|
|
||||||
if test x"$enablestring" = xdisable; then
|
|
||||||
defaultval=yes
|
|
||||||
else
|
|
||||||
defaultval=no
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
|
|
||||||
{ echo "$as_me:$LINENO: checking for --${enablestring:-enable}-debug_flag" >&5
|
|
||||||
echo $ECHO_N "checking for --${enablestring:-enable}-debug_flag... $ECHO_C" >&6; }
|
|
||||||
# Check whether --enable-debug_flag was given.
|
|
||||||
if test "${enable_debug_flag+set}" = set; then
|
|
||||||
enableval=$enable_debug_flag;
|
|
||||||
if test "$enableval" = yes; then
|
|
||||||
wx_cv_use_debug_flag='wxUSE_DEBUG_FLAG=yes'
|
|
||||||
else
|
|
||||||
wx_cv_use_debug_flag='wxUSE_DEBUG_FLAG=no'
|
|
||||||
fi
|
|
||||||
|
|
||||||
else
|
|
||||||
|
|
||||||
wx_cv_use_debug_flag='wxUSE_DEBUG_FLAG=${'DEFAULT_wxUSE_DEBUG_FLAG":-$defaultval}"
|
|
||||||
|
|
||||||
fi
|
|
||||||
|
|
||||||
|
|
||||||
eval "$wx_cv_use_debug_flag"
|
|
||||||
|
|
||||||
if test x"$enablestring" = xdisable; then
|
|
||||||
if test $wxUSE_DEBUG_FLAG = no; then
|
|
||||||
result=yes
|
|
||||||
else
|
|
||||||
result=no
|
|
||||||
fi
|
|
||||||
else
|
|
||||||
result=$wxUSE_DEBUG_FLAG
|
|
||||||
fi
|
|
||||||
|
|
||||||
{ echo "$as_me:$LINENO: result: $result" >&5
|
|
||||||
echo "${ECHO_T}$result" >&6; }
|
|
||||||
|
|
||||||
|
|
||||||
enablestring=
|
|
||||||
defaultval=
|
|
||||||
if test -z "$defaultval"; then
|
|
||||||
if test x"$enablestring" = xdisable; then
|
|
||||||
defaultval=yes
|
|
||||||
else
|
|
||||||
defaultval=no
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
|
|
||||||
{ echo "$as_me:$LINENO: checking for --${enablestring:-enable}-debug_info" >&5
|
|
||||||
echo $ECHO_N "checking for --${enablestring:-enable}-debug_info... $ECHO_C" >&6; }
|
|
||||||
# Check whether --enable-debug_info was given.
|
|
||||||
if test "${enable_debug_info+set}" = set; then
|
|
||||||
enableval=$enable_debug_info;
|
|
||||||
if test "$enableval" = yes; then
|
|
||||||
wx_cv_use_debug_info='wxUSE_DEBUG_INFO=yes'
|
|
||||||
else
|
|
||||||
wx_cv_use_debug_info='wxUSE_DEBUG_INFO=no'
|
|
||||||
fi
|
|
||||||
|
|
||||||
else
|
|
||||||
|
|
||||||
wx_cv_use_debug_info='wxUSE_DEBUG_INFO=${'DEFAULT_wxUSE_DEBUG_INFO":-$defaultval}"
|
|
||||||
|
|
||||||
fi
|
|
||||||
|
|
||||||
|
|
||||||
eval "$wx_cv_use_debug_info"
|
|
||||||
|
|
||||||
if test x"$enablestring" = xdisable; then
|
|
||||||
if test $wxUSE_DEBUG_INFO = no; then
|
|
||||||
result=yes
|
|
||||||
else
|
|
||||||
result=no
|
|
||||||
fi
|
|
||||||
else
|
|
||||||
result=$wxUSE_DEBUG_INFO
|
|
||||||
fi
|
|
||||||
|
|
||||||
{ echo "$as_me:$LINENO: result: $result" >&5
|
|
||||||
echo "${ECHO_T}$result" >&6; }
|
|
||||||
|
|
||||||
|
|
||||||
if test "$wxUSE_DEBUG_FLAG" = "yes" -a "$wxUSE_DEBUG_INFO" = "yes"; then
|
|
||||||
wxUSE_DEBUG=yes
|
|
||||||
BUILD=debug
|
|
||||||
fi
|
|
||||||
|
|
||||||
if test "$wxUSE_DEBUG" = "yes"; then
|
|
||||||
DEFAULT_wxUSE_OPTIMISE=no
|
|
||||||
fi
|
|
||||||
|
|
||||||
|
|
||||||
enablestring=disable
|
enablestring=disable
|
||||||
defaultval=
|
defaultval=
|
||||||
@@ -4937,138 +5052,6 @@ echo "${ECHO_T}$result" >&6; }
|
|||||||
|
|
||||||
|
|
||||||
|
|
||||||
enablestring=
|
|
||||||
defaultval=
|
|
||||||
if test -z "$defaultval"; then
|
|
||||||
if test x"$enablestring" = xdisable; then
|
|
||||||
defaultval=yes
|
|
||||||
else
|
|
||||||
defaultval=no
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
|
|
||||||
{ echo "$as_me:$LINENO: checking for --${enablestring:-enable}-debug_gdb" >&5
|
|
||||||
echo $ECHO_N "checking for --${enablestring:-enable}-debug_gdb... $ECHO_C" >&6; }
|
|
||||||
# Check whether --enable-debug_gdb was given.
|
|
||||||
if test "${enable_debug_gdb+set}" = set; then
|
|
||||||
enableval=$enable_debug_gdb;
|
|
||||||
if test "$enableval" = yes; then
|
|
||||||
wx_cv_use_debug_gdb='wxUSE_DEBUG_GDB=yes'
|
|
||||||
else
|
|
||||||
wx_cv_use_debug_gdb='wxUSE_DEBUG_GDB=no'
|
|
||||||
fi
|
|
||||||
|
|
||||||
else
|
|
||||||
|
|
||||||
wx_cv_use_debug_gdb='wxUSE_DEBUG_GDB=${'DEFAULT_wxUSE_DEBUG_GDB":-$defaultval}"
|
|
||||||
|
|
||||||
fi
|
|
||||||
|
|
||||||
|
|
||||||
eval "$wx_cv_use_debug_gdb"
|
|
||||||
|
|
||||||
if test x"$enablestring" = xdisable; then
|
|
||||||
if test $wxUSE_DEBUG_GDB = no; then
|
|
||||||
result=yes
|
|
||||||
else
|
|
||||||
result=no
|
|
||||||
fi
|
|
||||||
else
|
|
||||||
result=$wxUSE_DEBUG_GDB
|
|
||||||
fi
|
|
||||||
|
|
||||||
{ echo "$as_me:$LINENO: result: $result" >&5
|
|
||||||
echo "${ECHO_T}$result" >&6; }
|
|
||||||
|
|
||||||
|
|
||||||
enablestring=
|
|
||||||
defaultval=
|
|
||||||
if test -z "$defaultval"; then
|
|
||||||
if test x"$enablestring" = xdisable; then
|
|
||||||
defaultval=yes
|
|
||||||
else
|
|
||||||
defaultval=no
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
|
|
||||||
{ echo "$as_me:$LINENO: checking for --${enablestring:-enable}-debug_cntxt" >&5
|
|
||||||
echo $ECHO_N "checking for --${enablestring:-enable}-debug_cntxt... $ECHO_C" >&6; }
|
|
||||||
# Check whether --enable-debug_cntxt was given.
|
|
||||||
if test "${enable_debug_cntxt+set}" = set; then
|
|
||||||
enableval=$enable_debug_cntxt;
|
|
||||||
if test "$enableval" = yes; then
|
|
||||||
wx_cv_use_debug_cntxt='wxUSE_DEBUG_CONTEXT=yes'
|
|
||||||
else
|
|
||||||
wx_cv_use_debug_cntxt='wxUSE_DEBUG_CONTEXT=no'
|
|
||||||
fi
|
|
||||||
|
|
||||||
else
|
|
||||||
|
|
||||||
wx_cv_use_debug_cntxt='wxUSE_DEBUG_CONTEXT=${'DEFAULT_wxUSE_DEBUG_CONTEXT":-$defaultval}"
|
|
||||||
|
|
||||||
fi
|
|
||||||
|
|
||||||
|
|
||||||
eval "$wx_cv_use_debug_cntxt"
|
|
||||||
|
|
||||||
if test x"$enablestring" = xdisable; then
|
|
||||||
if test $wxUSE_DEBUG_CONTEXT = no; then
|
|
||||||
result=yes
|
|
||||||
else
|
|
||||||
result=no
|
|
||||||
fi
|
|
||||||
else
|
|
||||||
result=$wxUSE_DEBUG_CONTEXT
|
|
||||||
fi
|
|
||||||
|
|
||||||
{ echo "$as_me:$LINENO: result: $result" >&5
|
|
||||||
echo "${ECHO_T}$result" >&6; }
|
|
||||||
|
|
||||||
|
|
||||||
enablestring=
|
|
||||||
defaultval=
|
|
||||||
if test -z "$defaultval"; then
|
|
||||||
if test x"$enablestring" = xdisable; then
|
|
||||||
defaultval=yes
|
|
||||||
else
|
|
||||||
defaultval=no
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
|
|
||||||
{ echo "$as_me:$LINENO: checking for --${enablestring:-enable}-mem_tracing" >&5
|
|
||||||
echo $ECHO_N "checking for --${enablestring:-enable}-mem_tracing... $ECHO_C" >&6; }
|
|
||||||
# Check whether --enable-mem_tracing was given.
|
|
||||||
if test "${enable_mem_tracing+set}" = set; then
|
|
||||||
enableval=$enable_mem_tracing;
|
|
||||||
if test "$enableval" = yes; then
|
|
||||||
wx_cv_use_mem_tracing='wxUSE_MEM_TRACING=yes'
|
|
||||||
else
|
|
||||||
wx_cv_use_mem_tracing='wxUSE_MEM_TRACING=no'
|
|
||||||
fi
|
|
||||||
|
|
||||||
else
|
|
||||||
|
|
||||||
wx_cv_use_mem_tracing='wxUSE_MEM_TRACING=${'DEFAULT_wxUSE_MEM_TRACING":-$defaultval}"
|
|
||||||
|
|
||||||
fi
|
|
||||||
|
|
||||||
|
|
||||||
eval "$wx_cv_use_mem_tracing"
|
|
||||||
|
|
||||||
if test x"$enablestring" = xdisable; then
|
|
||||||
if test $wxUSE_MEM_TRACING = no; then
|
|
||||||
result=yes
|
|
||||||
else
|
|
||||||
result=no
|
|
||||||
fi
|
|
||||||
else
|
|
||||||
result=$wxUSE_MEM_TRACING
|
|
||||||
fi
|
|
||||||
|
|
||||||
{ echo "$as_me:$LINENO: result: $result" >&5
|
|
||||||
echo "${ECHO_T}$result" >&6; }
|
|
||||||
|
|
||||||
|
|
||||||
enablestring=
|
enablestring=
|
||||||
defaultval=
|
defaultval=
|
||||||
if test -z "$defaultval"; then
|
if test -z "$defaultval"; then
|
||||||
@@ -34024,15 +34007,6 @@ if test "$wxUSE_UNICODE" = "yes"; then
|
|||||||
UNICODE=1
|
UNICODE=1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
lib_debug_suffix=
|
|
||||||
WX_DEBUGTYPE="release"
|
|
||||||
DEBUG_FLAG=0
|
|
||||||
if test "$wxUSE_DEBUG_FLAG" = "yes"; then
|
|
||||||
lib_debug_suffix=d
|
|
||||||
WX_DEBUGTYPE="debug"
|
|
||||||
DEBUG_FLAG=1
|
|
||||||
fi
|
|
||||||
|
|
||||||
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 '-' '_'`
|
||||||
|
|
||||||
@@ -34041,22 +34015,22 @@ if test "$wxUSE_DEBUG_INFO" = "yes"; then
|
|||||||
DEBUG_INFO=1
|
DEBUG_INFO=1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
WX_VERSION_TAG=`echo WX${lib_unicode_suffix}${lib_debug_suffix}${WX_LIB_FLAVOUR}_${WX_RELEASE} | tr '[a-z]' '[A-Z]'`
|
WX_VERSION_TAG=`echo WX${lib_unicode_suffix}${WX_LIB_FLAVOUR}_${WX_RELEASE} | tr '[a-z]' '[A-Z]'`
|
||||||
|
|
||||||
TOOLCHAIN_NAME="${TOOLKIT_DIR}${TOOLKIT_VERSION}${WIDGET_SET}${lib_unicode_suffix}${lib_debug_suffix}${WX_LIB_FLAVOUR}-${WX_RELEASE}${HOST_SUFFIX}"
|
TOOLCHAIN_NAME="${TOOLKIT_DIR}${TOOLKIT_VERSION}${WIDGET_SET}${lib_unicode_suffix}${WX_LIB_FLAVOUR}-${WX_RELEASE}${HOST_SUFFIX}"
|
||||||
|
|
||||||
TOOLCHAIN_FULLNAME="${HOST_PREFIX}${TOOLKIT_DIR}${TOOLKIT_VERSION}${WIDGET_SET}-${WX_CHARTYPE}-${WX_DEBUGTYPE}${config_linkage_component}-${WX_RELEASE}${WX_FLAVOUR}"
|
TOOLCHAIN_FULLNAME="${HOST_PREFIX}${TOOLKIT_DIR}${TOOLKIT_VERSION}${WIDGET_SET}-${WX_CHARTYPE}${config_linkage_component}-${WX_RELEASE}${WX_FLAVOUR}"
|
||||||
|
|
||||||
|
|
||||||
if test "$wxUSE_OSX_CARBON" = 1 -o "$wxUSE_OSX_COCOA" = 1 -o "$wxUSE_COCOA" = 1; then
|
if test "$wxUSE_OSX_CARBON" = 1 -o "$wxUSE_OSX_COCOA" = 1 -o "$wxUSE_COCOA" = 1; then
|
||||||
WX_LIBRARY_BASENAME_NOGUI="wx_base${lib_unicode_suffix}${lib_debug_suffix}${WX_LIB_FLAVOUR}"
|
WX_LIBRARY_BASENAME_NOGUI="wx_base${lib_unicode_suffix}${WX_LIB_FLAVOUR}"
|
||||||
else
|
else
|
||||||
WX_LIBRARY_BASENAME_NOGUI="wx_base${WXBASEPORT}${lib_unicode_suffix}${lib_debug_suffix}${WX_LIB_FLAVOUR}"
|
WX_LIBRARY_BASENAME_NOGUI="wx_base${WXBASEPORT}${lib_unicode_suffix}${WX_LIB_FLAVOUR}"
|
||||||
fi
|
fi
|
||||||
if test "${TOOLKIT_DIR}" = "os2"; then
|
if test "${TOOLKIT_DIR}" = "os2"; then
|
||||||
WX_LIBRARY_BASENAME_GUI="wx_pm${WIDGET_SET}${lib_unicode_suffix}${lib_debug_suffix}${WX_LIB_FLAVOUR}"
|
WX_LIBRARY_BASENAME_GUI="wx_pm${WIDGET_SET}${lib_unicode_suffix}${WX_LIB_FLAVOUR}"
|
||||||
else
|
else
|
||||||
WX_LIBRARY_BASENAME_GUI="wx_${TOOLKIT_DIR}${TOOLKIT_VERSION}${WIDGET_SET}${lib_unicode_suffix}${lib_debug_suffix}${WX_LIB_FLAVOUR}"
|
WX_LIBRARY_BASENAME_GUI="wx_${TOOLKIT_DIR}${TOOLKIT_VERSION}${WIDGET_SET}${lib_unicode_suffix}${WX_LIB_FLAVOUR}"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
|
||||||
@@ -41520,13 +41494,7 @@ if test "$wxUSE_DEBUG_GDB" = "yes" ; then
|
|||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if test "$wxUSE_DEBUG_FLAG" = "yes" ; then
|
if test "$wxUSE_DEBUG_FLAG" = "no" ; then
|
||||||
cat >>confdefs.h <<\_ACEOF
|
|
||||||
#define WXDEBUG 1
|
|
||||||
_ACEOF
|
|
||||||
|
|
||||||
WXCONFIG_CPPFLAGS="$WXCONFIG_CPPFLAGS -D__WXDEBUG__"
|
|
||||||
else
|
|
||||||
if test "$wxUSE_GTK" = 1 ; then
|
if test "$wxUSE_GTK" = 1 ; then
|
||||||
if test "x$wxGTK_VERSION" = "x1" ; then
|
if test "x$wxGTK_VERSION" = "x1" ; then
|
||||||
CPPFLAGS="-DGTK_NO_CHECK_CASTS $CPPFLAGS"
|
CPPFLAGS="-DGTK_NO_CHECK_CASTS $CPPFLAGS"
|
||||||
@@ -47221,7 +47189,7 @@ EXTRALIBS="$LDFLAGS $LDFLAGS_VERSIONING $LIBS $DMALLOC_LIBS"
|
|||||||
EXTRALIBS_XML="$EXPAT_LINK"
|
EXTRALIBS_XML="$EXPAT_LINK"
|
||||||
EXTRALIBS_HTML="$MSPACK_LINK"
|
EXTRALIBS_HTML="$MSPACK_LINK"
|
||||||
EXTRALIBS_MEDIA="$GST_LIBS"
|
EXTRALIBS_MEDIA="$GST_LIBS"
|
||||||
EXTRALIBS_STC="-lwxscintilla${lib_debug_suffix}${WX_LIB_FLAVOUR}-${WX_RELEASE}${HOST_SUFFIX}"
|
EXTRALIBS_STC="-lwxscintilla${WX_LIB_FLAVOUR}-${WX_RELEASE}${HOST_SUFFIX}"
|
||||||
if test "$wxUSE_GUI" = "yes"; then
|
if test "$wxUSE_GUI" = "yes"; then
|
||||||
EXTRALIBS_GUI=`echo $GUI_TK_LIBRARY $PNG_LINK $JPEG_LINK $TIFF_LINK $WEBKIT_LINK $EXTRALIBS_HILDON $EXTRALIBS_GNOMEVFS $EXTRALIBS_GNOMEPRINT`
|
EXTRALIBS_GUI=`echo $GUI_TK_LIBRARY $PNG_LINK $JPEG_LINK $TIFF_LINK $WEBKIT_LINK $EXTRALIBS_HILDON $EXTRALIBS_GNOMEVFS $EXTRALIBS_GNOMEPRINT`
|
||||||
fi
|
fi
|
||||||
@@ -47253,7 +47221,7 @@ if test "$wxUSE_ZLIB" = "builtin" ; then
|
|||||||
fi
|
fi
|
||||||
|
|
||||||
for i in $wxconfig_3rdparty ; do
|
for i in $wxconfig_3rdparty ; do
|
||||||
WXCONFIG_LIBS="-lwx${i}${lib_debug_suffix}${WX_LIB_FLAVOUR}-${WX_RELEASE}${HOST_SUFFIX} $WXCONFIG_LIBS"
|
WXCONFIG_LIBS="-lwx${i}${WX_LIB_FLAVOUR}-${WX_RELEASE}${HOST_SUFFIX} $WXCONFIG_LIBS"
|
||||||
done
|
done
|
||||||
|
|
||||||
|
|
||||||
@@ -47335,7 +47303,6 @@ fi
|
|||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
TOOLKIT_LOWERCASE=xxx
|
TOOLKIT_LOWERCASE=xxx
|
||||||
@@ -49746,6 +49713,11 @@ EOF
|
|||||||
COND_BUILD_release_UNICODE_1=""
|
COND_BUILD_release_UNICODE_1=""
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
COND_DEBUG_FLAG_0="#"
|
||||||
|
if test "x$DEBUG_FLAG" = "x0" ; then
|
||||||
|
COND_DEBUG_FLAG_0=""
|
||||||
|
fi
|
||||||
|
|
||||||
COND_DEBUG_FLAG_1="#"
|
COND_DEBUG_FLAG_1="#"
|
||||||
if test "x$DEBUG_FLAG" = "x1" ; then
|
if test "x$DEBUG_FLAG" = "x1" ; then
|
||||||
COND_DEBUG_FLAG_1=""
|
COND_DEBUG_FLAG_1=""
|
||||||
@@ -50806,7 +50778,6 @@ SAMPLES_SUBDIRS="`echo $SAMPLES_SUBDIRS | tr -s ' ' | tr ' ' '\n' | sort | uniq
|
|||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
{ echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5
|
{ echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5
|
||||||
@@ -51866,7 +51837,6 @@ EXTRALIBS_GNOMEPRINT!$EXTRALIBS_GNOMEPRINT$ac_delim
|
|||||||
EXTRALIBS_GNOMEVFS!$EXTRALIBS_GNOMEVFS$ac_delim
|
EXTRALIBS_GNOMEVFS!$EXTRALIBS_GNOMEVFS$ac_delim
|
||||||
EXTRALIBS_HILDON!$EXTRALIBS_HILDON$ac_delim
|
EXTRALIBS_HILDON!$EXTRALIBS_HILDON$ac_delim
|
||||||
UNICODE!$UNICODE$ac_delim
|
UNICODE!$UNICODE$ac_delim
|
||||||
BUILD!$BUILD$ac_delim
|
|
||||||
DEBUG_INFO!$DEBUG_INFO$ac_delim
|
DEBUG_INFO!$DEBUG_INFO$ac_delim
|
||||||
DEBUG_FLAG!$DEBUG_FLAG$ac_delim
|
DEBUG_FLAG!$DEBUG_FLAG$ac_delim
|
||||||
TOOLKIT_LOWERCASE!$TOOLKIT_LOWERCASE$ac_delim
|
TOOLKIT_LOWERCASE!$TOOLKIT_LOWERCASE$ac_delim
|
||||||
@@ -51929,6 +51899,7 @@ SETFILE!$SETFILE$ac_delim
|
|||||||
OBJCXXFLAGS!$OBJCXXFLAGS$ac_delim
|
OBJCXXFLAGS!$OBJCXXFLAGS$ac_delim
|
||||||
GCC_PCH!$GCC_PCH$ac_delim
|
GCC_PCH!$GCC_PCH$ac_delim
|
||||||
ICC_PCH!$ICC_PCH$ac_delim
|
ICC_PCH!$ICC_PCH$ac_delim
|
||||||
|
ICC_PCH_CREATE_SWITCH!$ICC_PCH_CREATE_SWITCH$ac_delim
|
||||||
_ACEOF
|
_ACEOF
|
||||||
|
|
||||||
if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
|
if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
|
||||||
@@ -51970,7 +51941,6 @@ _ACEOF
|
|||||||
ac_delim='%!_!# '
|
ac_delim='%!_!# '
|
||||||
for ac_last_try in false false false false false :; do
|
for ac_last_try in false false false false false :; do
|
||||||
cat >conf$$subs.sed <<_ACEOF
|
cat >conf$$subs.sed <<_ACEOF
|
||||||
ICC_PCH_CREATE_SWITCH!$ICC_PCH_CREATE_SWITCH$ac_delim
|
|
||||||
ICC_PCH_USE_SWITCH!$ICC_PCH_USE_SWITCH$ac_delim
|
ICC_PCH_USE_SWITCH!$ICC_PCH_USE_SWITCH$ac_delim
|
||||||
BK_MAKE_PCH!$BK_MAKE_PCH$ac_delim
|
BK_MAKE_PCH!$BK_MAKE_PCH$ac_delim
|
||||||
COND_BUILD_DEBUG!$COND_BUILD_DEBUG$ac_delim
|
COND_BUILD_DEBUG!$COND_BUILD_DEBUG$ac_delim
|
||||||
@@ -51991,6 +51961,7 @@ COND_BUILD_release!$COND_BUILD_release$ac_delim
|
|||||||
COND_BUILD_release_DEBUG_INFO_default!$COND_BUILD_release_DEBUG_INFO_default$ac_delim
|
COND_BUILD_release_DEBUG_INFO_default!$COND_BUILD_release_DEBUG_INFO_default$ac_delim
|
||||||
COND_BUILD_release_UNICODE_0!$COND_BUILD_release_UNICODE_0$ac_delim
|
COND_BUILD_release_UNICODE_0!$COND_BUILD_release_UNICODE_0$ac_delim
|
||||||
COND_BUILD_release_UNICODE_1!$COND_BUILD_release_UNICODE_1$ac_delim
|
COND_BUILD_release_UNICODE_1!$COND_BUILD_release_UNICODE_1$ac_delim
|
||||||
|
COND_DEBUG_FLAG_0!$COND_DEBUG_FLAG_0$ac_delim
|
||||||
COND_DEBUG_FLAG_1!$COND_DEBUG_FLAG_1$ac_delim
|
COND_DEBUG_FLAG_1!$COND_DEBUG_FLAG_1$ac_delim
|
||||||
COND_DEBUG_INFO_0!$COND_DEBUG_INFO_0$ac_delim
|
COND_DEBUG_INFO_0!$COND_DEBUG_INFO_0$ac_delim
|
||||||
COND_DEBUG_INFO_1!$COND_DEBUG_INFO_1$ac_delim
|
COND_DEBUG_INFO_1!$COND_DEBUG_INFO_1$ac_delim
|
||||||
@@ -52254,7 +52225,6 @@ WX_RELEASE!$WX_RELEASE$ac_delim
|
|||||||
WX_VERSION!$WX_VERSION$ac_delim
|
WX_VERSION!$WX_VERSION$ac_delim
|
||||||
WX_SUBVERSION!$WX_SUBVERSION$ac_delim
|
WX_SUBVERSION!$WX_SUBVERSION$ac_delim
|
||||||
WX_CHARTYPE!$WX_CHARTYPE$ac_delim
|
WX_CHARTYPE!$WX_CHARTYPE$ac_delim
|
||||||
WX_DEBUGTYPE!$WX_DEBUGTYPE$ac_delim
|
|
||||||
WXCONFIG_CPPFLAGS!$WXCONFIG_CPPFLAGS$ac_delim
|
WXCONFIG_CPPFLAGS!$WXCONFIG_CPPFLAGS$ac_delim
|
||||||
WXCONFIG_CFLAGS!$WXCONFIG_CFLAGS$ac_delim
|
WXCONFIG_CFLAGS!$WXCONFIG_CFLAGS$ac_delim
|
||||||
WXCONFIG_CXXFLAGS!$WXCONFIG_CXXFLAGS$ac_delim
|
WXCONFIG_CXXFLAGS!$WXCONFIG_CXXFLAGS$ac_delim
|
||||||
@@ -52284,7 +52254,7 @@ LIBOBJS!$LIBOBJS$ac_delim
|
|||||||
LTLIBOBJS!$LTLIBOBJS$ac_delim
|
LTLIBOBJS!$LTLIBOBJS$ac_delim
|
||||||
_ACEOF
|
_ACEOF
|
||||||
|
|
||||||
if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 36; then
|
if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 35; then
|
||||||
break
|
break
|
||||||
elif $ac_last_try; then
|
elif $ac_last_try; then
|
||||||
{ { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
|
{ { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
|
||||||
@@ -52915,8 +52885,6 @@ echo "Configured wxWidgets ${WX_VERSION} for \`${host}'"
|
|||||||
echo ""
|
echo ""
|
||||||
echo " Which GUI toolkit should wxWidgets use? ${TOOLKIT_DESC}"
|
echo " Which GUI toolkit should wxWidgets use? ${TOOLKIT_DESC}"
|
||||||
echo " Should wxWidgets be compiled into single library? ${wxUSE_MONOLITHIC:-yes}"
|
echo " Should wxWidgets be compiled into single library? ${wxUSE_MONOLITHIC:-yes}"
|
||||||
|
|
||||||
echo " Should wxWidgets be compiled in debug mode? ${wxUSE_DEBUG:-no}"
|
|
||||||
echo " Should wxWidgets be linked as a shared library? ${wxUSE_SHARED:-no}"
|
echo " Should wxWidgets be linked as a shared library? ${wxUSE_SHARED:-no}"
|
||||||
echo $ECHO_N " Should wxWidgets support Unicode? ${wxUSE_UNICODE:-no}$ECHO_C"
|
echo $ECHO_N " Should wxWidgets support Unicode? ${wxUSE_UNICODE:-no}$ECHO_C"
|
||||||
if test "$wxUSE_UNICODE" = "yes"; then
|
if test "$wxUSE_UNICODE" = "yes"; then
|
||||||
|
|||||||
134
configure.in
134
configure.in
@@ -605,12 +605,72 @@ AC_ARG_WITH(macosx-version-min, [ --with-macosx-version-min=VER build bina
|
|||||||
])
|
])
|
||||||
AC_MSG_RESULT([$wxUSE_MACOSX_VERSION_MIN])
|
AC_MSG_RESULT([$wxUSE_MACOSX_VERSION_MIN])
|
||||||
|
|
||||||
|
dnl ---------------------------------------------------------------------------
|
||||||
|
dnl debugging options
|
||||||
|
dnl ---------------------------------------------------------------------------
|
||||||
|
|
||||||
|
dnl don't use WX_ARG_ENABLE as it just gets in the way instead of helping with
|
||||||
|
dnl this rather unusual option
|
||||||
|
AC_MSG_CHECKING([for --enable-debug])
|
||||||
|
AC_ARG_ENABLE(debug, [ --enable-debug build library for debugging],
|
||||||
|
[
|
||||||
|
if test "$enableval" = yes; then
|
||||||
|
wxUSE_DEBUG=yes
|
||||||
|
elif test "$enableval" = no; then
|
||||||
|
wxUSE_DEBUG=no
|
||||||
|
elif test "$enableval" = max; then
|
||||||
|
wxUSE_DEBUG=yes
|
||||||
|
WXCONFIG_CPPFLAGS="$WXCONFIG_CPPFLAGS -DwxDEBUG_LEVEL=2"
|
||||||
|
else
|
||||||
|
AC_MSG_ERROR([Invalid --enable-debug value, must be yes, no or max])
|
||||||
|
fi
|
||||||
|
],
|
||||||
|
wxUSE_DEBUG=default
|
||||||
|
)
|
||||||
|
|
||||||
|
case "$wxUSE_DEBUG" in
|
||||||
|
yes)
|
||||||
|
dnl build the library for debugging: enable debugging code and generate
|
||||||
|
dnl the debug information for the library itself
|
||||||
|
DEFAULT_wxUSE_DEBUG_FLAG=yes
|
||||||
|
DEFAULT_wxUSE_DEBUG_INFO=yes
|
||||||
|
|
||||||
|
dnl also disable optimizations by default if --enable-debug was used
|
||||||
|
dnl (this can still be overridden by an explicit --enable-optimise)
|
||||||
|
DEFAULT_wxUSE_OPTIMISE=no
|
||||||
|
;;
|
||||||
|
|
||||||
|
no)
|
||||||
|
dnl --disable-debug is equivalent to both --disable-debug_flag and
|
||||||
|
dnl --disable-debug_info
|
||||||
|
DEFAULT_wxUSE_DEBUG_FLAG=no
|
||||||
|
DEFAULT_wxUSE_DEBUG_INFO=no
|
||||||
|
;;
|
||||||
|
|
||||||
|
default)
|
||||||
|
dnl the library is built with debugging support by default but without
|
||||||
|
dnl debug information as this requires much, much more disk space
|
||||||
|
DEFAULT_wxUSE_DEBUG_FLAG=yes
|
||||||
|
DEFAULT_wxUSE_DEBUG_INFO=no
|
||||||
|
;;
|
||||||
|
esac
|
||||||
|
|
||||||
|
WX_ARG_DISABLE(debug_flag, [ --disable-debug_flag disable all debugging support], wxUSE_DEBUG_FLAG)
|
||||||
|
WX_ARG_ENABLE(debug_info, [ --enable-debug_info generate debug information], wxUSE_DEBUG_INFO)
|
||||||
|
|
||||||
|
dnl enabled if just --enable-debug_{flag,info} was
|
||||||
|
dnl
|
||||||
|
dnl in any case, only set the default value and allow overriding it with an
|
||||||
|
|
||||||
|
WX_ARG_ENABLE(debug_gdb, [ --enable-debug_gdb create code with extra GDB debugging information], wxUSE_DEBUG_GDB)
|
||||||
|
WX_ARG_ENABLE(debug_cntxt, [ --enable-debug_cntxt obsolete, don't use: use wxDebugContext], wxUSE_DEBUG_CONTEXT)
|
||||||
|
WX_ARG_ENABLE(mem_tracing, [ --enable-mem_tracing obsolete, don't use: create code with memory tracing], wxUSE_MEM_TRACING)
|
||||||
|
|
||||||
dnl ---------------------------------------------------------------------------
|
dnl ---------------------------------------------------------------------------
|
||||||
dnl global compile options
|
dnl global compile options
|
||||||
dnl ---------------------------------------------------------------------------
|
dnl ---------------------------------------------------------------------------
|
||||||
|
|
||||||
WX_ARG_DISABLE(shared, [ --disable-shared create static library instead of shared], wxUSE_SHARED)
|
WX_ARG_DISABLE(shared, [ --disable-shared create static library instead of shared], wxUSE_SHARED)
|
||||||
WX_ARG_ENABLE(debug, [ --enable-debug same as debug_flag and debug_info], wxUSE_DEBUG)
|
|
||||||
WX_ARG_ENABLE(stl, [ --enable-stl use STL for containers], wxUSE_STL)
|
WX_ARG_ENABLE(stl, [ --enable-stl use STL for containers], wxUSE_STL)
|
||||||
WX_ARG_ENABLE(std_iostreams, [ --enable-std_iostreams use standard C++ stream classes], wxUSE_STD_IOSTREAM)
|
WX_ARG_ENABLE(std_iostreams, [ --enable-std_iostreams use standard C++ stream classes], wxUSE_STD_IOSTREAM)
|
||||||
WX_ARG_ENABLE(std_string, [ --enable-std_string use standard C++ string classes], wxUSE_STD_STRING)
|
WX_ARG_ENABLE(std_string, [ --enable-std_string use standard C++ string classes], wxUSE_STD_STRING)
|
||||||
@@ -624,42 +684,8 @@ if test "$USE_OS2" = 1; then
|
|||||||
WX_ARG_ENABLE(omf, [ --enable-omf use OMF object format], wxUSE_OMF)
|
WX_ARG_ENABLE(omf, [ --enable-omf use OMF object format], wxUSE_OMF)
|
||||||
fi
|
fi
|
||||||
|
|
||||||
dnl --enable-debug is equivalent to both --enable-debug_flag and
|
|
||||||
dnl --enable-debug_info
|
|
||||||
if test "$wxUSE_DEBUG" = "yes"; then
|
|
||||||
DEFAULT_wxUSE_DEBUG_FLAG=yes
|
|
||||||
DEFAULT_wxUSE_DEBUG_INFO=yes
|
|
||||||
BUILD=debug
|
|
||||||
elif test "$wxUSE_DEBUG" = "no"; then
|
|
||||||
DEFAULT_wxUSE_DEBUG_FLAG=no
|
|
||||||
DEFAULT_wxUSE_DEBUG_INFO=no
|
|
||||||
BUILD=release
|
|
||||||
fi
|
|
||||||
|
|
||||||
WX_ARG_ENABLE(debug_flag, [ --enable-debug_flag set __WXDEBUG__ flag (recommended for developers!)], wxUSE_DEBUG_FLAG)
|
|
||||||
WX_ARG_ENABLE(debug_info, [ --enable-debug_info create code with debugging information], wxUSE_DEBUG_INFO)
|
|
||||||
|
|
||||||
dnl it's important to also do it in the other direction to get the correct
|
|
||||||
dnl output in the configure summary (which uses wxUSE_DEBUG)
|
|
||||||
if test "$wxUSE_DEBUG_FLAG" = "yes" -a "$wxUSE_DEBUG_INFO" = "yes"; then
|
|
||||||
wxUSE_DEBUG=yes
|
|
||||||
BUILD=debug
|
|
||||||
fi
|
|
||||||
|
|
||||||
dnl disable optimizations by default if --enable-debug was used but leave them
|
|
||||||
dnl enabled if just --enable-debug_{flag,info} was
|
|
||||||
dnl
|
|
||||||
dnl in any case, only set the default value and allow overriding it with an
|
|
||||||
dnl explicit --enable-optimise
|
|
||||||
if test "$wxUSE_DEBUG" = "yes"; then
|
|
||||||
DEFAULT_wxUSE_OPTIMISE=no
|
|
||||||
fi
|
|
||||||
|
|
||||||
WX_ARG_DISABLE(optimise, [ --disable-optimise compile without optimisations], wxUSE_OPTIMISE)
|
WX_ARG_DISABLE(optimise, [ --disable-optimise compile without optimisations], wxUSE_OPTIMISE)
|
||||||
|
|
||||||
WX_ARG_ENABLE(debug_gdb, [ --enable-debug_gdb create code with extra GDB debugging information], wxUSE_DEBUG_GDB)
|
|
||||||
WX_ARG_ENABLE(debug_cntxt, [ --enable-debug_cntxt use wxDebugContext], wxUSE_DEBUG_CONTEXT)
|
|
||||||
WX_ARG_ENABLE(mem_tracing, [ --enable-mem_tracing create code with memory tracing], wxUSE_MEM_TRACING)
|
|
||||||
WX_ARG_ENABLE(profile, [ --enable-profile create code with profiling information], wxUSE_PROFILE)
|
WX_ARG_ENABLE(profile, [ --enable-profile create code with profiling information], wxUSE_PROFILE)
|
||||||
WX_ARG_ENABLE(no_rtti, [ --enable-no_rtti create code without RTTI information], wxUSE_NO_RTTI)
|
WX_ARG_ENABLE(no_rtti, [ --enable-no_rtti create code without RTTI information], wxUSE_NO_RTTI)
|
||||||
WX_ARG_ENABLE(no_exceptions, [ --enable-no_exceptions create code without C++ exceptions handling], wxUSE_NO_EXCEPTIONS)
|
WX_ARG_ENABLE(no_exceptions, [ --enable-no_exceptions create code without C++ exceptions handling], wxUSE_NO_EXCEPTIONS)
|
||||||
@@ -3876,15 +3902,6 @@ if test "$wxUSE_UNICODE" = "yes"; then
|
|||||||
UNICODE=1
|
UNICODE=1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
lib_debug_suffix=
|
|
||||||
WX_DEBUGTYPE="release"
|
|
||||||
DEBUG_FLAG=0
|
|
||||||
if test "$wxUSE_DEBUG_FLAG" = "yes"; then
|
|
||||||
lib_debug_suffix=d
|
|
||||||
WX_DEBUGTYPE="debug"
|
|
||||||
DEBUG_FLAG=1
|
|
||||||
fi
|
|
||||||
|
|
||||||
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 '-' '_'`
|
||||||
|
|
||||||
@@ -3893,25 +3910,25 @@ if test "$wxUSE_DEBUG_INFO" = "yes"; then
|
|||||||
DEBUG_INFO=1
|
DEBUG_INFO=1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
WX_VERSION_TAG=`echo WX${lib_unicode_suffix}${lib_debug_suffix}${WX_LIB_FLAVOUR}_${WX_RELEASE} | tr '[[a-z]]' '[[A-Z]]'`
|
WX_VERSION_TAG=`echo WX${lib_unicode_suffix}${WX_LIB_FLAVOUR}_${WX_RELEASE} | tr '[[a-z]]' '[[A-Z]]'`
|
||||||
|
|
||||||
TOOLCHAIN_NAME="${TOOLKIT_DIR}${TOOLKIT_VERSION}${WIDGET_SET}${lib_unicode_suffix}${lib_debug_suffix}${WX_LIB_FLAVOUR}-${WX_RELEASE}${HOST_SUFFIX}"
|
TOOLCHAIN_NAME="${TOOLKIT_DIR}${TOOLKIT_VERSION}${WIDGET_SET}${lib_unicode_suffix}${WX_LIB_FLAVOUR}-${WX_RELEASE}${HOST_SUFFIX}"
|
||||||
|
|
||||||
TOOLCHAIN_FULLNAME="${HOST_PREFIX}${TOOLKIT_DIR}${TOOLKIT_VERSION}${WIDGET_SET}-${WX_CHARTYPE}-${WX_DEBUGTYPE}${config_linkage_component}-${WX_RELEASE}${WX_FLAVOUR}"
|
TOOLCHAIN_FULLNAME="${HOST_PREFIX}${TOOLKIT_DIR}${TOOLKIT_VERSION}${WIDGET_SET}-${WX_CHARTYPE}${config_linkage_component}-${WX_RELEASE}${WX_FLAVOUR}"
|
||||||
|
|
||||||
dnl library link name
|
dnl library link name
|
||||||
dnl These just save us from exporting lib_{unicode,debug,flavour}_suffix.
|
dnl These just save us from exporting lib_{unicode,flavour}_suffix.
|
||||||
dnl If we ever need to do that, we won't need to keep these.
|
dnl If we ever need to do that, we won't need to keep these.
|
||||||
|
|
||||||
if test "$wxUSE_OSX_CARBON" = 1 -o "$wxUSE_OSX_COCOA" = 1 -o "$wxUSE_COCOA" = 1; then
|
if test "$wxUSE_OSX_CARBON" = 1 -o "$wxUSE_OSX_COCOA" = 1 -o "$wxUSE_COCOA" = 1; then
|
||||||
WX_LIBRARY_BASENAME_NOGUI="wx_base${lib_unicode_suffix}${lib_debug_suffix}${WX_LIB_FLAVOUR}"
|
WX_LIBRARY_BASENAME_NOGUI="wx_base${lib_unicode_suffix}${WX_LIB_FLAVOUR}"
|
||||||
else
|
else
|
||||||
WX_LIBRARY_BASENAME_NOGUI="wx_base${WXBASEPORT}${lib_unicode_suffix}${lib_debug_suffix}${WX_LIB_FLAVOUR}"
|
WX_LIBRARY_BASENAME_NOGUI="wx_base${WXBASEPORT}${lib_unicode_suffix}${WX_LIB_FLAVOUR}"
|
||||||
fi
|
fi
|
||||||
if test "${TOOLKIT_DIR}" = "os2"; then
|
if test "${TOOLKIT_DIR}" = "os2"; then
|
||||||
WX_LIBRARY_BASENAME_GUI="wx_pm${WIDGET_SET}${lib_unicode_suffix}${lib_debug_suffix}${WX_LIB_FLAVOUR}"
|
WX_LIBRARY_BASENAME_GUI="wx_pm${WIDGET_SET}${lib_unicode_suffix}${WX_LIB_FLAVOUR}"
|
||||||
else
|
else
|
||||||
WX_LIBRARY_BASENAME_GUI="wx_${TOOLKIT_DIR}${TOOLKIT_VERSION}${WIDGET_SET}${lib_unicode_suffix}${lib_debug_suffix}${WX_LIB_FLAVOUR}"
|
WX_LIBRARY_BASENAME_GUI="wx_${TOOLKIT_DIR}${TOOLKIT_VERSION}${WIDGET_SET}${lib_unicode_suffix}${WX_LIB_FLAVOUR}"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
|
||||||
@@ -5203,10 +5220,7 @@ if test "$wxUSE_DEBUG_GDB" = "yes" ; then
|
|||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if test "$wxUSE_DEBUG_FLAG" = "yes" ; then
|
if test "$wxUSE_DEBUG_FLAG" = "no" ; then
|
||||||
AC_DEFINE(WXDEBUG)
|
|
||||||
WXCONFIG_CPPFLAGS="$WXCONFIG_CPPFLAGS -D__WXDEBUG__"
|
|
||||||
else
|
|
||||||
if test "$wxUSE_GTK" = 1 ; then
|
if test "$wxUSE_GTK" = 1 ; then
|
||||||
if test "x$wxGTK_VERSION" = "x1" ; then
|
if test "x$wxGTK_VERSION" = "x1" ; then
|
||||||
CPPFLAGS="-DGTK_NO_CHECK_CASTS $CPPFLAGS"
|
CPPFLAGS="-DGTK_NO_CHECK_CASTS $CPPFLAGS"
|
||||||
@@ -7522,7 +7536,7 @@ EXTRALIBS="$LDFLAGS $LDFLAGS_VERSIONING $LIBS $DMALLOC_LIBS"
|
|||||||
EXTRALIBS_XML="$EXPAT_LINK"
|
EXTRALIBS_XML="$EXPAT_LINK"
|
||||||
EXTRALIBS_HTML="$MSPACK_LINK"
|
EXTRALIBS_HTML="$MSPACK_LINK"
|
||||||
EXTRALIBS_MEDIA="$GST_LIBS"
|
EXTRALIBS_MEDIA="$GST_LIBS"
|
||||||
EXTRALIBS_STC="-lwxscintilla${lib_debug_suffix}${WX_LIB_FLAVOUR}-${WX_RELEASE}${HOST_SUFFIX}"
|
EXTRALIBS_STC="-lwxscintilla${WX_LIB_FLAVOUR}-${WX_RELEASE}${HOST_SUFFIX}"
|
||||||
if test "$wxUSE_GUI" = "yes"; then
|
if test "$wxUSE_GUI" = "yes"; then
|
||||||
EXTRALIBS_GUI=`echo $GUI_TK_LIBRARY $PNG_LINK $JPEG_LINK $TIFF_LINK $WEBKIT_LINK $EXTRALIBS_HILDON $EXTRALIBS_GNOMEVFS $EXTRALIBS_GNOMEPRINT`
|
EXTRALIBS_GUI=`echo $GUI_TK_LIBRARY $PNG_LINK $JPEG_LINK $TIFF_LINK $WEBKIT_LINK $EXTRALIBS_HILDON $EXTRALIBS_GNOMEVFS $EXTRALIBS_GNOMEPRINT`
|
||||||
fi
|
fi
|
||||||
@@ -7555,7 +7569,7 @@ if test "$wxUSE_ZLIB" = "builtin" ; then
|
|||||||
fi
|
fi
|
||||||
|
|
||||||
for i in $wxconfig_3rdparty ; do
|
for i in $wxconfig_3rdparty ; do
|
||||||
WXCONFIG_LIBS="-lwx${i}${lib_debug_suffix}${WX_LIB_FLAVOUR}-${WX_RELEASE}${HOST_SUFFIX} $WXCONFIG_LIBS"
|
WXCONFIG_LIBS="-lwx${i}${WX_LIB_FLAVOUR}-${WX_RELEASE}${HOST_SUFFIX} $WXCONFIG_LIBS"
|
||||||
done
|
done
|
||||||
|
|
||||||
|
|
||||||
@@ -7631,7 +7645,6 @@ AC_SUBST(EXTRALIBS_GNOMEPRINT)
|
|||||||
AC_SUBST(EXTRALIBS_GNOMEVFS)
|
AC_SUBST(EXTRALIBS_GNOMEVFS)
|
||||||
AC_SUBST(EXTRALIBS_HILDON)
|
AC_SUBST(EXTRALIBS_HILDON)
|
||||||
AC_SUBST(UNICODE)
|
AC_SUBST(UNICODE)
|
||||||
AC_SUBST(BUILD)
|
|
||||||
AC_SUBST(DEBUG_INFO)
|
AC_SUBST(DEBUG_INFO)
|
||||||
AC_SUBST(DEBUG_FLAG)
|
AC_SUBST(DEBUG_FLAG)
|
||||||
TOOLKIT_LOWERCASE=xxx
|
TOOLKIT_LOWERCASE=xxx
|
||||||
@@ -7942,7 +7955,6 @@ AC_SUBST(WX_RELEASE)
|
|||||||
AC_SUBST(WX_VERSION)
|
AC_SUBST(WX_VERSION)
|
||||||
AC_SUBST(WX_SUBVERSION)
|
AC_SUBST(WX_SUBVERSION)
|
||||||
AC_SUBST(WX_CHARTYPE)
|
AC_SUBST(WX_CHARTYPE)
|
||||||
AC_SUBST(WX_DEBUGTYPE)
|
|
||||||
|
|
||||||
dnl note that in addition to the usual CPP/C/CXXFLAGS which are used for
|
dnl note that in addition to the usual CPP/C/CXXFLAGS which are used for
|
||||||
dnl building the library itself, we also have WXCONFIG_-prefixed variants which
|
dnl building the library itself, we also have WXCONFIG_-prefixed variants which
|
||||||
@@ -8126,8 +8138,6 @@ echo "Configured wxWidgets ${WX_VERSION} for \`${host}'"
|
|||||||
echo ""
|
echo ""
|
||||||
echo " Which GUI toolkit should wxWidgets use? ${TOOLKIT_DESC}"
|
echo " Which GUI toolkit should wxWidgets use? ${TOOLKIT_DESC}"
|
||||||
echo " Should wxWidgets be compiled into single library? ${wxUSE_MONOLITHIC:-yes}"
|
echo " Should wxWidgets be compiled into single library? ${wxUSE_MONOLITHIC:-yes}"
|
||||||
|
|
||||||
echo " Should wxWidgets be compiled in debug mode? ${wxUSE_DEBUG:-no}"
|
|
||||||
echo " Should wxWidgets be linked as a shared library? ${wxUSE_SHARED:-no}"
|
echo " Should wxWidgets be linked as a shared library? ${wxUSE_SHARED:-no}"
|
||||||
echo $ECHO_N " Should wxWidgets support Unicode? ${wxUSE_UNICODE:-no}$ECHO_C"
|
echo $ECHO_N " Should wxWidgets support Unicode? ${wxUSE_UNICODE:-no}$ECHO_C"
|
||||||
if test "$wxUSE_UNICODE" = "yes"; then
|
if test "$wxUSE_UNICODE" = "yes"; then
|
||||||
|
|||||||
33
wx-config.in
33
wx-config.in
@@ -45,9 +45,9 @@ usage()
|
|||||||
|
|
||||||
wx-config [--prefix[=DIR]] [--exec-prefix[=DIR]] [--release] [--version-full]
|
wx-config [--prefix[=DIR]] [--exec-prefix[=DIR]] [--release] [--version-full]
|
||||||
[--list] [--selected-config] [--host=HOST] [--toolkit=TOOLKIT]
|
[--list] [--selected-config] [--host=HOST] [--toolkit=TOOLKIT]
|
||||||
[--universal[=yes|no]] [--unicode[=yes|no]] [--debug[=yes|no]]
|
[--universal[=yes|no]] [--unicode[=yes|no]] [--static[=yes|no]]
|
||||||
[--static[=yes|no]] [--version[=VERSION]] [--basename]
|
[--version[=VERSION]] [--basename] [--cc] [--cxx]
|
||||||
[--cc] [--cxx] [--cppflags [base]] [--cxxflags [base]] [--cflags]
|
[--cppflags [base]] [--cxxflags [base]] [--cflags]
|
||||||
[--rescomp] [--linkdeps] [--ld] [--utility=UTIL]
|
[--rescomp] [--linkdeps] [--ld] [--utility=UTIL]
|
||||||
[--libs [LIBS...]] [--optional-libs [LIBS...]]
|
[--libs [LIBS...]] [--optional-libs [LIBS...]]
|
||||||
|
|
||||||
@@ -55,14 +55,14 @@ usage()
|
|||||||
your system. It may be used to retrieve the information required to build
|
your system. It may be used to retrieve the information required to build
|
||||||
applications using these libraries using --cppflags, --cxxflags, --cflags,
|
applications using these libraries using --cppflags, --cxxflags, --cflags,
|
||||||
and --libs options. And you may query the properties of this configuration
|
and --libs options. And you may query the properties of this configuration
|
||||||
using --query-{host,toolkit,widgetset,chartype,debugtype,version,linkage}.
|
using --query-{host,toolkit,widgetset,chartype,version,linkage}.
|
||||||
|
|
||||||
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, --debug, --static, --universal and
|
--prefix, --host, --toolkit, --unicode, --static, --universal or --version
|
||||||
--version to select from them. The --selected-config option shows the name
|
to select from them. The --selected-config option shows the name of the
|
||||||
of the current configuration and --list shows available alternatives which
|
current configuration and --list shows available alternatives which match
|
||||||
match specified criteria. The --utility option returns the correct version
|
specified criteria. The --utility option returns the correct version of
|
||||||
of UTIL to use with the selected build. The --linkdeps option returns only
|
UTIL to use with the selected build. The --linkdeps option returns only
|
||||||
static libraries for your makefile link rule dependencies.
|
static libraries for your makefile link rule dependencies.
|
||||||
|
|
||||||
The LIBS arguments (comma or space separated) may be used to specify the
|
The LIBS arguments (comma or space separated) may be used to specify the
|
||||||
@@ -114,7 +114,7 @@ EGREP="@EGREP@"
|
|||||||
# configs to this one. Options earlier in the list should be more crucial
|
# configs to this one. Options earlier in the list should be more crucial
|
||||||
# to match well than those that follow. Options specified by the user will
|
# to match well than those that follow. Options specified by the user will
|
||||||
# always take precedence and are not subject to any partial ordering here.
|
# always take precedence and are not subject to any partial ordering here.
|
||||||
wxconfig_schema="host toolkit widgetset chartype debugtype flavour version linkage"
|
wxconfig_schema="host toolkit widgetset chartype flavour version linkage"
|
||||||
|
|
||||||
# Options that are expected to generate some output.
|
# Options that are expected to generate some output.
|
||||||
wxconfig_output_options="prefix exec_prefix
|
wxconfig_output_options="prefix exec_prefix
|
||||||
@@ -135,6 +135,10 @@ wxconfig_output_options="prefix exec_prefix
|
|||||||
wxconfig_input_options="prefix exec_prefix utility $wxconfig_schema"
|
wxconfig_input_options="prefix exec_prefix utility $wxconfig_schema"
|
||||||
|
|
||||||
# Input options that accept only a yes or no argument.
|
# Input options that accept only a yes or no argument.
|
||||||
|
#
|
||||||
|
# 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
|
||||||
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.
|
||||||
@@ -317,7 +321,6 @@ done
|
|||||||
|
|
||||||
check_yesno_option universal widgetset univ
|
check_yesno_option universal widgetset univ
|
||||||
check_yesno_option unicode chartype unicode ansi
|
check_yesno_option unicode chartype unicode ansi
|
||||||
check_yesno_option debug debugtype debug release
|
|
||||||
check_yesno_option static linkage static
|
check_yesno_option static linkage static
|
||||||
|
|
||||||
# Dump everything we just read in debug mode.
|
# Dump everything we just read in debug mode.
|
||||||
@@ -361,7 +364,7 @@ fi
|
|||||||
get_mask()
|
get_mask()
|
||||||
{
|
{
|
||||||
[ $# -gt 0 ] || set m
|
[ $# -gt 0 ] || set m
|
||||||
eval echo "\${$1_host:+\$$1_host-}\${$1_toolkit}\${$1_widgetset}-\${$1_chartype}-\${$1_debugtype}\${$1_linkage:+-\$$1_linkage}-\${$1_version}\${$1_flavour}"
|
eval echo "\${$1_host:+\$$1_host-}\${$1_toolkit}\${$1_widgetset}-\${$1_chartype}\${$1_linkage:+-\$$1_linkage}-\${$1_version}\${$1_flavour}"
|
||||||
}
|
}
|
||||||
|
|
||||||
# Returns true if this script is for a cross compiled config.
|
# Returns true if this script is for a cross compiled config.
|
||||||
@@ -383,7 +386,6 @@ 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="@WX_CHARTYPE@"
|
||||||
this_debugtype="@WX_DEBUGTYPE@"
|
|
||||||
this_flavour="@WX_FLAVOUR@"
|
this_flavour="@WX_FLAVOUR@"
|
||||||
this_version="@WX_RELEASE@"
|
this_version="@WX_RELEASE@"
|
||||||
this_linkage=`[ "x@SHARED@" = "x1" ] || echo 'static'`
|
this_linkage=`[ "x@SHARED@" = "x1" ] || echo 'static'`
|
||||||
@@ -397,7 +399,6 @@ m_host=${m_host:-$this_host}
|
|||||||
m_toolkit=${input_option_toolkit:-'[^-]+'}
|
m_toolkit=${input_option_toolkit:-'[^-]+'}
|
||||||
m_widgetset=${input_option_widgetset-'(univ)?'}
|
m_widgetset=${input_option_widgetset-'(univ)?'}
|
||||||
m_chartype=${input_option_chartype:-'(unicode|ansi)'}
|
m_chartype=${input_option_chartype:-'(unicode|ansi)'}
|
||||||
m_debugtype=${input_option_debugtype:-'(debug|release)'}
|
|
||||||
m_flavour=${input_option_flavour:+-$input_option_flavour}
|
m_flavour=${input_option_flavour:+-$input_option_flavour}
|
||||||
m_flavour=${m_flavour:-${input_option_flavour-'(-[^-]+)?'}}
|
m_flavour=${m_flavour:-${input_option_flavour-'(-[^-]+)?'}}
|
||||||
m_version=${input_option_version:-'[0-9]+\.[0-9]+'}
|
m_version=${input_option_version:-'[0-9]+\.[0-9]+'}
|
||||||
@@ -418,7 +419,6 @@ if [ -n "$WXDEBUG" ]; then
|
|||||||
decho " m_toolkit = '$m_toolkit'"
|
decho " m_toolkit = '$m_toolkit'"
|
||||||
decho " m_widgetset = '$m_widgetset'"
|
decho " m_widgetset = '$m_widgetset'"
|
||||||
decho " m_chartype = '$m_chartype'"
|
decho " m_chartype = '$m_chartype'"
|
||||||
decho " m_debugtype = '$m_debugtype'"
|
|
||||||
decho " m_flavour = '$m_flavour'"
|
decho " m_flavour = '$m_flavour'"
|
||||||
decho " m_version = '$m_version'"
|
decho " m_version = '$m_version'"
|
||||||
decho " m_linkage = '$m_linkage'"
|
decho " m_linkage = '$m_linkage'"
|
||||||
@@ -604,8 +604,7 @@ get_legacy_mask()
|
|||||||
{
|
{
|
||||||
[ $# -gt 0 ] || set m
|
[ $# -gt 0 ] || set m
|
||||||
eval [ "x\${$1_chartype}" != "xunicode" ] || _unicode_flag=u
|
eval [ "x\${$1_chartype}" != "xunicode" ] || _unicode_flag=u
|
||||||
eval [ "x\${$1_debugtype}" != "xdebug" ] || _debug_flag=d
|
eval echo "wx\${$1_toolkit}${_unicode_flag}-\${$1_version}\${$1_host}-config"
|
||||||
eval echo "wx\${$1_toolkit}${_unicode_flag}${_debug_flag}-\${$1_version}\${$1_host}-config"
|
|
||||||
}
|
}
|
||||||
|
|
||||||
# find_legacy_configs
|
# find_legacy_configs
|
||||||
|
|||||||
Reference in New Issue
Block a user