summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlan Coopersmith <Alan.Coopersmith@sun.com>2006-06-16 22:07:08 +0000
committerAlan Coopersmith <Alan.Coopersmith@sun.com>2006-06-16 22:07:08 +0000
commit42226f6ba7fbccd7d7cb0f9ce431be477bdf9a0c (patch)
tree5cdcc2dcdf17c3299b8bb4bc7ec6d75cbb5fe846
parent9a93b2a2ace59e6c2ab8fec586561a136c06e664 (diff)
Define HAS_SHM if shmat() is found
Include <config.h> to get HAS_SHM define.
-rw-r--r--ChangeLog8
-rw-r--r--configure.ac2
-rw-r--r--src/XvMC.c3
3 files changed, 13 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index c03cb48..311e3e0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2006-06-16 Alan Coopersmith <alan.coopersmith@sun.com>
+
+ * configure.ac:
+ Define HAS_SHM if shmat() is found
+
+ * src/XvMC.c:
+ Include <config.h> to get HAS_SHM define.
+
2006-04-26 Adam Jackson <ajax@freedesktop.org>
* configure.ac:
diff --git a/configure.ac b/configure.ac
index 16813bc..e9ac0cd 100644
--- a/configure.ac
+++ b/configure.ac
@@ -37,6 +37,8 @@ PKG_CHECK_MODULES(XVMC, x11 xext xv xextproto videoproto)
AC_SUBST(XVMC_CFLAGS)
AC_SUBST(XVMC_LIBS)
+
+AC_CHECK_FUNC([shmat], AC_DEFINE(HAS_SHM,1,[Has shm*() functions]))
XORG_CHECK_MALLOC_ZERO
XORG_RELEASE_VERSION
diff --git a/src/XvMC.c b/src/XvMC.c
index 8db6409..16327c8 100644
--- a/src/XvMC.c
+++ b/src/XvMC.c
@@ -2,6 +2,9 @@
#define NEED_REPLIES
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
#include <stdio.h>
#include "XvMClibint.h"
#ifdef HAS_SHM