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

diff --git a/m4/ax_debug.m4 b/m4/ax_debug.m4
index ba1a9615..5522d721 100644
--- a/m4/ax_debug.m4
+++ b/m4/ax_debug.m4
@@ -43,7 +43,7 @@
 #  (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
@@ -51,10 +51,14 @@ AC_DEFUN([AX_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.])],
+      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_DEFINE(DEBUG, [ 0 ], [Define to 1 to enable debugging code.])])
+      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"])])