summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlan Coopersmith <alan.coopersmith@oracle.com>2013-05-29 16:44:37 -0700
committerAlan Coopersmith <alan.coopersmith@oracle.com>2013-05-29 16:44:37 -0700
commit95f3a4aac6cddb3a74ba7ae44f1ca236d97c3fb7 (patch)
tree3bda9639663016c9ef9498993e930fe113ab25f1
parent92dbad919a7a56c12e87547f05b905530f66dd7b (diff)
Use XORG_MEMORY_CHECK_FLAGS to enable memory checks on various platforms
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
-rw-r--r--configure.ac13
1 files changed, 10 insertions, 3 deletions
diff --git a/configure.ac b/configure.ac
index 28f972b..2677ebf 100644
--- a/configure.ac
+++ b/configure.ac
@@ -35,10 +35,10 @@ AM_INIT_AUTOMAKE([foreign dist-bzip2])
# Dependencies for automake's static library support
AC_PROG_RANLIB
-# Require xorg-macros 1.8 or later for MAN_SUBSTS set by XORG_MANPAGE_SECTIONS
+# Require xorg-macros 1.16 or later for XORG_MEMORY_CHECK_FLAGS
m4_ifndef([XORG_MACROS_VERSION],
- [m4_fatal([must install xorg-macros 1.8 or later before running autoconf/autogen])])
-XORG_MACROS_VERSION(1.8)
+ [m4_fatal([must install xorg-macros 1.16 or later before running autoconf/autogen])])
+XORG_MACROS_VERSION(1.16)
XORG_DEFAULT_OPTIONS
# Transport selection macro from xtrans.m4
@@ -62,6 +62,13 @@ if test "x$HAVE_XCB" = "xyes" ; then
fi
AM_CONDITIONAL([HAVE_XCB], [test "x$HAVE_XCB" = "xyes"])
+# Use memory debugging flags when running tests
+XORG_MEMORY_CHECK_FLAGS
+if test "x$XORG_MALLOC_DEBUG_ENV" != "x" ; then
+ AM_TESTS_ENVIRONMENT="export ${XORG_MALLOC_DEBUG_ENV} ;"
+fi
+AC_SUBST([AM_TESTS_ENVIRONMENT])
+
AC_CONFIG_FILES([
Makefile
src/Makefile