From 5a05cf4063fc6ea666f3e24c60bd2e9e5526ef4e Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 17 Sep 2014 17:07:05 +0200
Subject: [PATCH] Add Make flag to disable optimization

---
 Makefile     | 9 ++++++++-
 configure.ac | 4 ++--
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/Makefile b/Makefile
index d6c645f0f..b41a82027 100644
--- a/Makefile
+++ b/Makefile
@@ -22,8 +22,15 @@ makefiles = \
   doc/manual/local.mk \
   tests/local.mk
 
-GLOBAL_CXXFLAGS += -std=c++0x
+GLOBAL_CXXFLAGS += -std=c++0x -g -Wall
 
 include Makefile.config
 
+OPTIMIZE = 1
+
+ifeq ($(OPTIMIZE), 1)
+  GLOBAL_CFLAGS += -O3
+  GLOBAL_CXXFLAGS += -O3
+endif
+
 include mk/lib.mk
diff --git a/configure.ac b/configure.ac
index 00c1d495d..89fd6b96e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -54,8 +54,8 @@ if test "$sys_name" = sunos; then
 fi
 
 
-CFLAGS=${CFLAGS:--g -O3 -Wall}
-CXXFLAGS=${CXXFLAGS:--g -O3 -Wall}
+CFLAGS=
+CXXFLAGS=
 AC_PROG_CC
 AC_PROG_CXX