]> git.saurik.com Git - wxWidgets.git/commitdiff
fixed setting BUILD variable in any case (not only when DEBUG=auto)
authorFrancesco Montorsi <f18m_cpp217828@yahoo.it>
Mon, 14 Jan 2008 13:35:37 +0000 (13:35 +0000)
committerFrancesco Montorsi <f18m_cpp217828@yahoo.it>
Mon, 14 Jan 2008 13:35:37 +0000 (13:35 +0000)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@51208 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

wxwin.m4

index 7f38874eba9f35667a2796cbe0c230b611517a40..b2434a21b3aa64889df3c19164f1305d8f9da49c 100644 (file)
--- a/wxwin.m4
+++ b/wxwin.m4
@@ -937,13 +937,6 @@ AC_DEFUN([WX_DETECT_STANDARD_OPTION_VALUES],
         dnl to their final values if they were set to 'auto'
         if test "$DEBUG" = "auto"; then
             DEBUG=$WX_DEBUG
         dnl to their final values if they were set to 'auto'
         if test "$DEBUG" = "auto"; then
             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
         if test "$UNICODE" = "auto"; then
             UNICODE=$WX_UNICODE
         fi
         if test "$UNICODE" = "auto"; then
             UNICODE=$WX_UNICODE
@@ -955,6 +948,13 @@ AC_DEFUN([WX_DETECT_STANDARD_OPTION_VALUES],
             TOOLKIT=$WX_PORT
         fi
 
             TOOLKIT=$WX_PORT
         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 NOTE: the CXXFLAGS are merged together with the CPPFLAGS so we
         dnl       don't need to set them, too
         dnl respect the DEBUG variable adding the optimize/debug flags
         dnl NOTE: the CXXFLAGS are merged together with the CPPFLAGS so we
         dnl       don't need to set them, too