X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=m4%2Fax_debug.m4;h=5522d72152e3188df6fa749238563f21153ee2df;hb=95474a1687017de0adb2c6ce57c1ab7c0704c5c6;hp=41d3fa02ce8f63fdb51795956d25e7386db9ff5c;hpb=8e04e2a97ba16fce9ebf7d47a944de2dc40ba453;p=awesomized%2Flibmemcached

diff --git a/m4/ax_debug.m4 b/m4/ax_debug.m4
index 41d3fa02..5522d721 100644
--- a/m4/ax_debug.m4
+++ b/m4/ax_debug.m4
@@ -4,7 +4,7 @@
 #
 # SYNOPSIS
 #
-#   AX_DEBUG
+#   AX_DEBUG()
 #
 # DESCRIPTION
 #
@@ -43,26 +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 1
+#serial 6
 
-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=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.])])
 
     AC_MSG_CHECKING([for debug])
     AC_MSG_RESULT([$ax_enable_debug])
-    AM_CONDITIONAL([DEBUG_BUILD], [test "x$ax_enable_debug" = "xyes"])
-    ])
+    AM_CONDITIONAL([DEBUG],[test "x${ax_enable_debug}" = "xyes"])])