From 9acf2665b699c19a38e90b3b46f91c950c91c8f3 Mon Sep 17 00:00:00 2001
From: Kevin E Martin <kem@kem.org>
Date: Sat, 3 Dec 2005 04:41:52 +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 988348d..9435c1a 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>
 
 	* xxf86misc.pc.in:
diff --git a/configure.ac b/configure.ac
index 9f0ae25..cece7aa 100644
--- a/configure.ac
+++ b/configure.ac
@@ -13,6 +13,7 @@ AC_PROG_LIBTOOL
 # Checks for pkg-config packages
 PKG_CHECK_MODULES(XXF86MISC, xproto x11 xextproto xext xf86miscproto)
 
+XORG_CHECK_MALLOC_ZERO
 XORG_MANPAGE_SECTIONS
 XORG_RELEASE_VERSION
 
diff --git a/src/Makefile.am b/src/Makefile.am
index 5572019..715b82d 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -2,6 +2,6 @@ lib_LTLIBRARIES = libXxf86misc.la
 
 libXxf86misc_la_SOURCES = XF86Misc.c
 
-AM_CFLAGS = $(XXF86MISC_CFLAGS)
+AM_CFLAGS = $(XXF86MISC_CFLAGS) $(MALLOC_ZERO_CFLAGS)
 libXxf86misc_la_LIBADD = $(XXF86MISC_LIBS)
 libXxf86misc_la_LDFLAGS = -version-number 1:1:0
-- 
cgit v1.2.3