X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=m4%2Fax_debug.m4;h=17152e793ab0b72f9d8b50f076bb8bf9a71a4627;hb=61b948a92ab79734b009a438b5cf3bfad03cb59d;hp=2f78b71115c8cda46078fe00de2273604f9c24b3;hpb=66dcfb211cc2ca7dc6630754a6fd68343569e29a;p=awesomized%2Flibmemcached

diff --git a/m4/ax_debug.m4 b/m4/ax_debug.m4
index 2f78b711..17152e79 100644
--- a/m4/ax_debug.m4
+++ b/m4/ax_debug.m4
@@ -4,7 +4,7 @@
 #
 # SYNOPSIS
 #
-#   AX_DEBUG
+#   AX_DEBUG()
 #
 # DESCRIPTION
 #
@@ -12,7 +12,7 @@
 #
 # LICENSE
 #
-#  Copyright (C) 2012 Brian Aker
+#  Copyright (C) 2012-2014 Brian Aker
 #  All rights reserved.
 #  
 #  Redistribution and use in source and binary forms, with or without
@@ -43,25 +43,23 @@
 #  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 #  OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-#serial 1
+#serial 8
 
-AC_DEFUN([AX_DEBUG],[
+AC_DEFUN([AX_DEBUG],
+    [AC_PREREQ([2.63])dnl
     AC_ARG_ENABLE([debug],
       [AS_HELP_STRING([--enable-debug],
-        [Add debug code/turns off optimizations (yes|no) @<:@default=no@:>@])],[
-      ax_enable_debug=yes
-      dnl Debugging. No optimization.
-      AM_CFLAGS="${AM_CFLAGS} ${DEBUG_CFLAGS} -DDEBUG"
-      AM_CXXFLAGS="${AM_CXXFLAGS} ${DEBUG_CXXFLAGS} -DDEBUG"
-      AC_DEFINE(DEBUG, [ 1 ], [Define to 1 to enable debugging code.])
-      ],[
-      ax_enable_debug=no
-      dnl Optimized version. No debug
-      AM_CFLAGS="${AM_CFLAGS} ${OPTIMIZE_CFLAGS}"
-      AM_CXXFLAGS="${AM_CXXFLAGS} ${OPTIMIZE_CXXFLAGS}"
-      AC_DEFINE(DEBUG, [ 0 ], [Define to 1 to enable debugging code.])
-      ])
+        [Add debug code/turns off optimizations (yes|no) @<:@default=no@:>@])],
+      [ax_enable_debug=$enableval],
+			[ax_enable_debug=no])
+
+		AS_IF([test "x$ax_enable_debug" = xyes],
+			[AC_DEFINE([DEBUG],[1],[Define to 1 to enable debugging code.])
+			AX_ADD_AM_MACRO([AM_YFLAGS += --debug])
+			AX_ADD_AM_MACRO([AM_CPPFLAGS += -D_GLIBCXX_DEBUG])],
+			[AC_SUBST([MCHECK])
+			AC_DEFINE([DEBUG],[0],[Define to 1 to enable debugging code.])])
 
     AC_MSG_CHECKING([for debug])
     AC_MSG_RESULT([$ax_enable_debug])
-    ])
+    AM_CONDITIONAL([DEBUG],[test "x${ax_enable_debug}" = "xyes"])])