fixed setting BUILD variable in any case (not only when DEBUG=auto)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@51208 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
14
wxwin.m4
14
wxwin.m4
@@ -937,13 +937,6 @@ AC_DEFUN([WX_DETECT_STANDARD_OPTION_VALUES],
|
|||||||
dnl to their final values if they were set to 'auto'
|
dnl to their final values if they were set to 'auto'
|
||||||
if test "$DEBUG" = "auto"; then
|
if test "$DEBUG" = "auto"; then
|
||||||
DEBUG=$WX_DEBUG
|
DEBUG=$WX_DEBUG
|
||||||
|
|
||||||
dnl in case user wants a BUILD=debug/release var...
|
|
||||||
if test "$DEBUG" = "1"; then
|
|
||||||
BUILD="debug"
|
|
||||||
elif test "$DEBUG" = ""; then
|
|
||||||
BUILD="release"
|
|
||||||
fi
|
|
||||||
fi
|
fi
|
||||||
if test "$UNICODE" = "auto"; then
|
if test "$UNICODE" = "auto"; then
|
||||||
UNICODE=$WX_UNICODE
|
UNICODE=$WX_UNICODE
|
||||||
@@ -955,6 +948,13 @@ AC_DEFUN([WX_DETECT_STANDARD_OPTION_VALUES],
|
|||||||
TOOLKIT=$WX_PORT
|
TOOLKIT=$WX_PORT
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
dnl in case the user needs a BUILD=debug/release var...
|
||||||
|
if test "$DEBUG" = "1"; then
|
||||||
|
BUILD="debug"
|
||||||
|
elif test "$DEBUG" = ""; then
|
||||||
|
BUILD="release"
|
||||||
|
fi
|
||||||
|
|
||||||
dnl respect the DEBUG variable adding the optimize/debug flags
|
dnl respect the DEBUG variable adding the optimize/debug flags
|
||||||
dnl NOTE: the CXXFLAGS are merged together with the CPPFLAGS so we
|
dnl NOTE: the CXXFLAGS are merged together with the CPPFLAGS so we
|
||||||
dnl don't need to set them, too
|
dnl don't need to set them, too
|
||||||
|
Reference in New Issue
Block a user