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 c3adc69..6f18b00 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>
* xxf86vm.pc.in:
diff --git a/configure.ac b/configure.ac
index 7eec63c..97c68f0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -13,6 +13,7 @@ AC_PROG_LIBTOOL
# Checks for pkg-config packages
PKG_CHECK_MODULES(XXF86VM, xproto x11 xextproto xext xf86vidmodeproto)
+XORG_CHECK_MALLOC_ZERO
XORG_MANPAGE_SECTIONS
XORG_RELEASE_VERSION
diff --git a/src/Makefile.am b/src/Makefile.am
index 6630eeb..3487d5c 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -2,6 +2,6 @@ lib_LTLIBRARIES = libXxf86vm.la
libXxf86vm_la_SOURCES = XF86VMode.c
-AM_CFLAGS = $(XXF86VM_CFLAGS)
+AM_CFLAGS = $(XXF86VM_CFLAGS) $(MALLOC_ZERO_CFLAGS)
libXxf86vm_la_LIBADD = $(XXF86VM_LIBS)
libXxf86vm_la_LDFLAGS = -version-number 1:0:0