don't disable optimize if --enable-debug_info was specified, this makes it impossible to build an optimized version with debug info
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@54996 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
parent
a1cb0b110e
commit
44710405ff
99
configure
vendored
99
configure
vendored
@ -1,5 +1,5 @@
|
||||
#! /bin/sh
|
||||
# From configure.in Id: configure.in 54171 2008-06-12 18:51:50Z VZ .
|
||||
# From configure.in Id: configure.in 54853 2008-07-30 15:48:24Z SC .
|
||||
# Guess values for system-dependent variables and create Makefiles.
|
||||
# Generated by GNU Autoconf 2.61 for wxWidgets 2.9.0.
|
||||
#
|
||||
@ -1642,7 +1642,6 @@ Optional Features:
|
||||
--disable-gtk2 use GTK+ 1.2 instead of 2.0
|
||||
--enable-gpe use GNOME PDA Environment features if possible
|
||||
--disable-shared create static library instead of shared
|
||||
--disable-optimise compile without optimisations
|
||||
--enable-debug same as debug_flag and debug_info
|
||||
--enable-stl use STL for containers
|
||||
--enable-std_iostreams use standard C++ stream classes
|
||||
@ -1655,6 +1654,7 @@ Optional Features:
|
||||
--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
|
||||
--enable-debug_gdb create code with extra GDB debugging information
|
||||
--enable-debug_cntxt use wxDebugContext
|
||||
--enable-mem_tracing create code with memory tracing
|
||||
@ -4357,50 +4357,6 @@ fi
|
||||
echo "${ECHO_T}$result" >&6; }
|
||||
|
||||
|
||||
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}-optimise" >&5
|
||||
echo $ECHO_N "checking for --${enablestring:-enable}-optimise... $ECHO_C" >&6; }
|
||||
# Check whether --enable-optimise was given.
|
||||
if test "${enable_optimise+set}" = set; then
|
||||
enableval=$enable_optimise;
|
||||
if test "$enableval" = yes; then
|
||||
wx_cv_use_optimise='wxUSE_OPTIMISE=yes'
|
||||
else
|
||||
wx_cv_use_optimise='wxUSE_OPTIMISE=no'
|
||||
fi
|
||||
|
||||
else
|
||||
|
||||
wx_cv_use_optimise='wxUSE_OPTIMISE=${'DEFAULT_wxUSE_OPTIMISE":-$defaultval}"
|
||||
|
||||
fi
|
||||
|
||||
|
||||
eval "$wx_cv_use_optimise"
|
||||
|
||||
if test x"$enablestring" = xdisable; then
|
||||
if test $wxUSE_OPTIMISE = yes; then
|
||||
result=no
|
||||
else
|
||||
result=yes
|
||||
fi
|
||||
else
|
||||
result=$wxUSE_OPTIMISE
|
||||
fi
|
||||
|
||||
{ echo "$as_me:$LINENO: result: $result" >&5
|
||||
echo "${ECHO_T}$result" >&6; }
|
||||
|
||||
|
||||
enablestring=
|
||||
defaultval=
|
||||
if test -z "$defaultval"; then
|
||||
@ -4925,6 +4881,55 @@ if test "$wxUSE_DEBUG_FLAG" = "yes" -a "$wxUSE_DEBUG_INFO" = "yes"; then
|
||||
BUILD=debug
|
||||
fi
|
||||
|
||||
if test "$wxUSE_DEBUG" = "yes"; then
|
||||
DEFAULT_wxUSE_OPTIMISE=no
|
||||
fi
|
||||
|
||||
|
||||
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}-optimise" >&5
|
||||
echo $ECHO_N "checking for --${enablestring:-enable}-optimise... $ECHO_C" >&6; }
|
||||
# Check whether --enable-optimise was given.
|
||||
if test "${enable_optimise+set}" = set; then
|
||||
enableval=$enable_optimise;
|
||||
if test "$enableval" = yes; then
|
||||
wx_cv_use_optimise='wxUSE_OPTIMISE=yes'
|
||||
else
|
||||
wx_cv_use_optimise='wxUSE_OPTIMISE=no'
|
||||
fi
|
||||
|
||||
else
|
||||
|
||||
wx_cv_use_optimise='wxUSE_OPTIMISE=${'DEFAULT_wxUSE_OPTIMISE":-$defaultval}"
|
||||
|
||||
fi
|
||||
|
||||
|
||||
eval "$wx_cv_use_optimise"
|
||||
|
||||
if test x"$enablestring" = xdisable; then
|
||||
if test $wxUSE_OPTIMISE = yes; then
|
||||
result=no
|
||||
else
|
||||
result=yes
|
||||
fi
|
||||
else
|
||||
result=$wxUSE_OPTIMISE
|
||||
fi
|
||||
|
||||
{ echo "$as_me:$LINENO: result: $result" >&5
|
||||
echo "${ECHO_T}$result" >&6; }
|
||||
|
||||
|
||||
|
||||
enablestring=
|
||||
defaultval=
|
||||
@ -41129,7 +41134,6 @@ fi
|
||||
DEBUG_CFLAGS=
|
||||
if test "$wxUSE_DEBUG_INFO" = "yes" ; then
|
||||
DEBUG_CFLAGS="-g"
|
||||
wxUSE_OPTIMISE=no
|
||||
fi
|
||||
|
||||
if test "$wxUSE_DEBUG_GDB" = "yes" ; then
|
||||
@ -46441,6 +46445,7 @@ _ACEOF
|
||||
fi
|
||||
fi
|
||||
|
||||
|
||||
if test "$wxUSE_MAC" = 1; then
|
||||
wxUSE_GRAPHICS_CONTEXT="yes"
|
||||
fi
|
||||
|
||||
13
configure.in
13
configure.in
@ -602,7 +602,6 @@ dnl global compile options
|
||||
dnl ---------------------------------------------------------------------------
|
||||
|
||||
WX_ARG_DISABLE(shared, [ --disable-shared create static library instead of shared], wxUSE_SHARED)
|
||||
WX_ARG_DISABLE(optimise, [ --disable-optimise compile without optimisations], wxUSE_OPTIMISE)
|
||||
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(std_iostreams, [ --enable-std_iostreams use standard C++ stream classes], wxUSE_STD_IOSTREAM)
|
||||
@ -639,6 +638,17 @@ if test "$wxUSE_DEBUG_FLAG" = "yes" -a "$wxUSE_DEBUG_INFO" = "yes"; then
|
||||
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_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)
|
||||
@ -5089,7 +5099,6 @@ dnl compilers: we'd need a separate DEBUG_CXXFLAGS if this is ever not the case)
|
||||
DEBUG_CFLAGS=
|
||||
if test "$wxUSE_DEBUG_INFO" = "yes" ; then
|
||||
DEBUG_CFLAGS="-g"
|
||||
wxUSE_OPTIMISE=no
|
||||
fi
|
||||
|
||||
if test "$wxUSE_DEBUG_GDB" = "yes" ; then
|
||||
|
||||
Loading…
Reference in New Issue
Block a user