summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlan Coopersmith <alan.coopersmith@oracle.com>2022-12-17 09:12:05 -0800
committerAlan Coopersmith <alan.coopersmith@oracle.com>2022-12-17 09:12:05 -0800
commit205e30739073d282d4401df57862ac3a5cf6a987 (patch)
tree90663ee6eb88cfaac8964cf3aca49b9246f30011
parent35eed89c651c87a5e9950f3033c1516358456425 (diff)
tests: Use XORG_MEMORY_CHECK_FLAGS from xorg-macros 1.16
Replaces previous local copy which had gotten out of date. Raises xorg-macros minimum version from 1.13 (released March 2011) to 1.16 (Dec. 2011). Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
-rw-r--r--configure.ac25
1 files changed, 4 insertions, 21 deletions
diff --git a/configure.ac b/configure.ac
index db37ca3..87b5217 100644
--- a/configure.ac
+++ b/configure.ac
@@ -35,10 +35,10 @@ AM_INIT_AUTOMAKE([foreign dist-xz])
# Initialize libtool
AC_PROG_LIBTOOL
-# Require X.Org macros 1.13 or later for XORG_ENABLE_UNIT_TESTS
+# Require X.Org macros 1.16 or later for XORG_MEMORY_CHECK_FLAGS
m4_ifndef([XORG_MACROS_VERSION],
- [m4_fatal([must install xorg-macros 1.13 or later before running autoconf/autogen])])
-XORG_MACROS_VERSION(1.13)
+ [m4_fatal([must install xorg-macros 1.16 or later before running autoconf/autogen])])
+XORG_MACROS_VERSION(1.16)
XORG_DEFAULT_OPTIONS
XORG_CHECK_MALLOC_ZERO
XORG_ENABLE_SPECS
@@ -139,24 +139,7 @@ fi
# --enable-unit-tests
XORG_ENABLE_UNIT_TESTS
XORG_WITH_GLIB([2.16])
-
-# Memory checking support
-case $host_os in
- solaris*)
- AC_CHECK_LIB([umem], [umem_alloc],
- [MALLOC_DEBUG_ENV='LD_PRELOAD=libumem.so UMEM_DEBUG=default'])
- ;;
- *-gnu*) # GNU libc - Value is used as a single byte bit pattern,
- # both directly and inverted, so should not be 0 or 255.
- MALLOC_DEBUG_ENV='MALLOC_PERTURB_=15'
- ;;
- *bsd*|darwin*)
- MALLOC_DEBUG_ENV='MallocPreScribble=1 MallocScribble=1'
- ;;
-esac
-AC_MSG_CHECKING(for definitions to enable memory-checking support)
-AC_MSG_RESULT(${MALLOC_DEBUG_ENV:-none})
-AC_SUBST([MALLOC_DEBUG_ENV])
+XORG_MEMORY_CHECK_FLAGS
# Replaces XFileSearchPathDefault from Imake configs
XFILESEARCHPATHDEFAULT='$(sysconfdir)/X11/%L/%T/%N%C%S:$(sysconfdir)/X11/%l/%T/%N%C%S:$(sysconfdir)/X11/%T/%N%C%S:$(sysconfdir)/X11/%L/%T/%N%S:$(sysconfdir)/X11/%l/%T/%N%S:$(sysconfdir)/X11/%T/%N%S:$(datadir)/X11/%L/%T/%N%C%S:$(datadir)/X11/%l/%T/%N%C%S:$(datadir)/X11/%T/%N%C%S:$(datadir)/X11/%L/%T/%N%S:$(datadir)/X11/%l/%T/%N%S:$(datadir)/X11/%T/%N%S:$(libdir)/X11/%L/%T/%N%C%S:$(libdir)/X11/%l/%T/%N%C%S:$(libdir)/X11/%T/%N%C%S:$(libdir)/X11/%L/%T/%N%S:$(libdir)/X11/%l/%T/%N%S:$(libdir)/X11/%T/%N%S'