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 712c63f..dca970d 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>
* xv.pc.in:
diff --git a/configure.ac b/configure.ac
index a26671d..5be6759 100644
--- a/configure.ac
+++ b/configure.ac
@@ -40,6 +40,7 @@ PKG_CHECK_MODULES(XV, x11 xext xextproto videoproto)
AC_SUBST(XV_CFLAGS)
AC_SUBST(XV_LIBS)
+XORG_CHECK_MALLOC_ZERO
XORG_MANPAGE_SECTIONS
XORG_RELEASE_VERSION
diff --git a/src/Makefile.am b/src/Makefile.am
index a877aa7..e1d7ff4 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -5,6 +5,6 @@ libXv_la_SOURCES = \
Xvlibint.h
libXv_la_LIBADD = @XV_LIBS@
-AM_CFLAGS = @XV_CFLAGS@ -I$(top_srcdir)/include
+AM_CFLAGS = @XV_CFLAGS@ -I$(top_srcdir)/include @MALLOC_ZERO_CFLAGS@
libXv_la_LDFLAGS = -version-number 1:0:0 -no-undefined