Add check and cflags for malloc(0) returning NULL.

diff --git a/ChangeLog b/ChangeLog
index 1232672..0b4be38 100644 (file)
--- 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-26  Thomas Hellstrom  <unichrome-at-shipmail-dot-org>
 
        * src/Makefile.am:

diff --git a/configure.ac b/configure.ac
index e917e30..8374350 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -38,6 +38,7 @@ PKG_CHECK_MODULES(XVMC, x11 xext xv xextproto videoproto)
 AC_SUBST(XVMC_CFLAGS)
 AC_SUBST(XVMC_LIBS)
                  
+XORG_CHECK_MALLOC_ZERO
 XORG_RELEASE_VERSION
 
 AC_OUTPUT([Makefile

diff --git a/src/Makefile.am b/src/Makefile.am
index b16b177..6cb61dd 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -7,13 +7,14 @@ libXvMC_la_SOURCES = \
 libXvMCW_la_SOURCES = \
        XvMCWrapper.c
 
+AM_CFLAGS = @XVMC_CFLAGS@ -I$(top_srcdir)/include @MALLOC_ZERO_CFLAGS@
+
 libXvMC_la_LIBADD = @XVMC_LIBS@
-libXvMC_la_CFLAGS = @XVMC_CFLAGS@ -I$(top_srcdir)/include
+libXvMC_la_CFLAGS = $(AM_CFLAGS)
 
 libXvMCW_la_LIBADD = @XVMC_LIBS@
 libXvMCW_la_CFLAGS =                           \
-       @XVMC_CFLAGS@                           \
-       -I$(top_srcdir)/include                 \
+       $(AM_CFLAGS)                            \
        -DXVMC_CONFIGDIR=XConfigDir             \
        -DXVMC_SOVERSION=\".1.0\"               \
        -DXV_SOVERSION=\".1.0\"