m4: merge TangentOrg/ddm4

[awesomized/libmemcached] / m4 / ax_debug.m4

diff --git a/m4/ax_debug.m4 b/m4/ax_debug.m4
index 5522d72152e3188df6fa749238563f21153ee2df..17152e793ab0b72f9d8b50f076bb8bf9a71a4627 100644 (file)
--- a/m4/ax_debug.m4
+++ b/m4/ax_debug.m4
@@ -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,21 +43,22 @@
 #  (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 6
+#serial 8
 
 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
-      AC_DEFINE([DEBUG],[1],[Define to 1 to enable debugging code.])
-      AX_CHECK_LIBRARY([MCHECK],[mcheck.h],[mcheck],[AX_APPEND_LINK_FLAGS([-lmcheck])])
-      AX_ADD_AM_MACRO([--debug],[AM_YFLAGS])
-      AX_ADD_AM_MACRO([-D_GLIBCXX_DEBUG],[AM_CPPFLAGS])],
-      [ax_enable_debug=no
-      AC_SUBST([MCHECK])
-      AC_DEFINE([DEBUG],[0],[Define to 1 to enable debugging code.])])
+      [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])