X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=m4%2Fax_debug.m4;h=5522d72152e3188df6fa749238563f21153ee2df;hb=2eb14a59f3626073017de925929dcc7e3e9eb43d;hp=d83a87e9cfbfa8d559336b904b0403a6bed5f481;hpb=0aaa4448e3787c60c7ed87bd75905ca22ccec7a4;p=awesomized%2Flibmemcached

diff --git a/m4/ax_debug.m4 b/m4/ax_debug.m4
index d83a87e9..5522d721 100644
--- a/m4/ax_debug.m4
+++ b/m4/ax_debug.m4
@@ -43,20 +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 3
+#serial 6
 
 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_enable_debug=no
-      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],[test "x${ax_enable_debug}" = "xyes"])])