summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--configure.ac1
-rw-r--r--src/Makefile.am2
3 files changed, 8 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 636fadc..06786e2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2005-12-02 Kevin E. Martin <kem-at-freedesktop-dot-org>
+
+ * configure.ac:
+ * src/Makefile.am:
+ Add check and cflags for malloc(0) returning NULL.
+
2005-11-19 Kevin E. Martin <kem-at-freedesktop-dot-org>
* dmx.pc.in:
diff --git a/configure.ac b/configure.ac
index 0568bfe..1362217 100644
--- a/configure.ac
+++ b/configure.ac
@@ -39,6 +39,7 @@ PKG_CHECK_MODULES(DMX, x11 xext xextproto dmxproto)
AC_SUBST(DMX_CFLAGS)
AC_SUBST(DMX_LIBS)
+XORG_CHECK_MALLOC_ZERO
XORG_MANPAGE_SECTIONS
XORG_RELEASE_VERSION
diff --git a/src/Makefile.am b/src/Makefile.am
index 5d1823e..6f8f548 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -7,4 +7,4 @@ libdmx_la_LIBADD = $(DMX_LIBS)
libdmx_la_LDFLAGS = -version-number 1:0:0 -no-undefined
-AM_CFLAGS = $(DMX_CFLAGS)
+AM_CFLAGS = $(DMX_CFLAGS) $(MALLOC_ZERO_CFLAGS)