summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKevin E Martin <kem@kem.org>2005-12-03 04:41:47 +0000
committerKevin E Martin <kem@kem.org>2005-12-03 04:41:47 +0000
commit6c82c873fe14a7c1273b16368674698d35a402ab (patch)
tree2cda7202c868087b035b73b490101d9915ec7359
parentee7b5feaa2d5dca9170bcf26b9aadd936d4f6129 (diff)
Add check and cflags for malloc(0) returning NULL.
-rw-r--r--ChangeLog6
-rw-r--r--configure.ac2
-rw-r--r--src/Makefile.am2
3 files changed, 9 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index c2fa2da..49d178f 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>
* windowswm.pc.in:
diff --git a/configure.ac b/configure.ac
index e338418..0161ad7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -39,6 +39,8 @@ PKG_CHECK_MODULES(WINDOWSWM, x11 xext xextproto windowswmproto)
AC_SUBST(WINDOWSWM_CFLAGS)
AC_SUBST(WINDOWSWM_LIBS)
+XORG_CHECK_MALLOC_ZERO
+
AC_OUTPUT([Makefile
src/Makefile
man/Makefile
diff --git a/src/Makefile.am b/src/Makefile.am
index 60b8707..f52da02 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -3,7 +3,7 @@ lib_LTLIBRARIES = libWindowsWM.la
libWindowsWM_la_SOURCES = \
windowswm.c
-libWindowsWM_la_CFLAGS = @WINDOWSWM_CFLAGS@
+libWindowsWM_la_CFLAGS = @WINDOWSWM_CFLAGS@ @MALLOC_ZERO_CFLAGS@
libWindowsWM_la_LIBADD = @WINDOWSWM_LIBS@
libWindowsWM_la_LDFLAGS = -version-info 7:0:0 -no-undefined