From 6e86b1afe88ad387f97abb937b9b792fb0ebc0c8 Mon Sep 17 00:00:00 2001
From: Kevin E Martin <kem@kem.org>
Date: Sat, 3 Dec 2005 04:41:49 +0000
Subject: Add check and cflags for malloc(0) returning NULL.

---
 ChangeLog       | 6 ++++++
 configure.ac    | 1 +
 src/Makefile.am | 2 +-
 3 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 29887f7..f71806f 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>
 
 	* xfontcache.pc.in:
diff --git a/configure.ac b/configure.ac
index 092a324..bc5a11f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -39,6 +39,7 @@ PKG_CHECK_MODULES(XFONTCACHE, x11 xext xextproto fontcacheproto)
 AC_SUBST(XFONTCACHE_CFLAGS)
 AC_SUBST(XFONTCACHE_LIBS)
 		  
+XORG_CHECK_MALLOC_ZERO
 XORG_MANPAGE_SECTIONS
 XORG_RELEASE_VERSION
 
diff --git a/src/Makefile.am b/src/Makefile.am
index e0289a9..f2094dc 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,4 +1,4 @@
-AM_CFLAGS = $(XFONTCACHE_CFLAGS)
+AM_CFLAGS = $(XFONTCACHE_CFLAGS) $(MALLOC_ZERO_CFLAGS)
 lib_LTLIBRARIES = libXfontcache.la
 
 libXfontcache_la_SOURCES = \
-- 
cgit v1.2.3