[lmi-commits] [6296] Fix unwanted appearance of -O2 in Automake build system

[Vadim Zeitlin]

Revision: 6296
          http://svn.sv.gnu.org/viewvc/?view=rev&root=lmi&revision=6296
Author:   zeitlin
Date:     2015-09-24 22:16:55 +0000 (Thu, 24 Sep 2015)
Log Message:
-----------
Fix unwanted appearance of -O2 in Automake build system

Upgrade to the very latest version of wxwin.m4 from wxWidgets which fixes the
problem with -O2 always used for the build, even if --enable-debug or
--disable-optimise configure option was explicitly used.

See 
https://github.com/wxWidgets/wxWidgets/commit/d72006f5b83a1a8a76fca4a381327b0d52be14c0

Modified Paths:
--------------
    lmi/trunk/aclocal/wxwin.m4

Modified: lmi/trunk/aclocal/wxwin.m4
===================================================================
--- lmi/trunk/aclocal/wxwin.m4  2015-09-21 00:51:20 UTC (rev 6295)
+++ lmi/trunk/aclocal/wxwin.m4  2015-09-24 22:16:55 UTC (rev 6296)
@@ -928,11 +928,8 @@
                          ])
         fi
 
-        dnl now we can finally update the DEBUG,UNICODE,SHARED options
-        dnl to their final values if they were not already set
-        if test -z "$DEBUG" ; then
-            DEBUG=$WX_DEBUG
-        fi
+        dnl now we can finally update the options to their final values if they
+        dnl were not already set
         if test -z "$UNICODE" ; then
             UNICODE=$WX_UNICODE
         fi
@@ -943,20 +940,17 @@
             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" = "0" -o "$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 and also
+        dnl define a BUILD variable in case the user wants to use it
+        dnl
         dnl NOTE: the CXXFLAGS are merged together with the CPPFLAGS so we
         dnl       don't need to set them, too
         if test "$DEBUG" = "1"; then
+            BUILD="debug"
             CXXFLAGS="$CXXFLAGS -g -O0"
             CFLAGS="$CFLAGS -g -O0"
-        else
+        elif test "$DEBUG" = "0"; then
+            BUILD="release"
             CXXFLAGS="$CXXFLAGS -O2"
             CFLAGS="$CFLAGS -O2"
         fi