summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog8
m---------common0
-rw-r--r--configure.ac4
-rw-r--r--gst/debug/Makefile.am8
4 files changed, 19 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 2f0bd074..dd722c03 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2005-10-07 Tim-Philipp Müller <tim at centricular dot net>
+
+ * configure.ac:
+ Add check for mmap
+
+ * gst/debug/Makefile.am:
+ Only compile efence plugin on systems that have mmap.
+
2005-10-05 Tim-Philipp Müller <tim at centricular dot net>
* gst/debug/Makefile.am:
diff --git a/common b/common
-Subproject 7d175466d3319fe55327608ea1f7a20619ab563
+Subproject fb4bd52a0a6e882bd8eb0ca836edd94d3fcaea4
diff --git a/configure.ac b/configure.ac
index e05018f7..7bf8b675 100644
--- a/configure.ac
+++ b/configure.ac
@@ -302,6 +302,10 @@ AC_ARG_WITH(plugins,
AC_SUBST(GST_PLUGINS_SELECTED)
+dnl Check for mmap (needed by electricfence plugin)
+AC_FUNC_MMAP()
+AM_CONDITIONAL(GST_HAVE_MMAP, test "x$ac_cv_func_mmap_fixed_mapped" == "xyes")
+
dnl ==========================================================================
dnl ============================= sys plug-ins ================================
dnl ==========================================================================
diff --git a/gst/debug/Makefile.am b/gst/debug/Makefile.am
index b3b2911f..da3b3a29 100644
--- a/gst/debug/Makefile.am
+++ b/gst/debug/Makefile.am
@@ -1,4 +1,10 @@
-plugin_LTLIBRARIES = libgstefence.la libgstdebug.la libgstnavigationtest.la
+if GST_HAVE_MMAP
+ EFENCE_PLUGIN=libgstefence.la
+else
+ EFENCE_PLUGIN=
+endif
+
+plugin_LTLIBRARIES = $(EFENCE_PLUGIN) libgstdebug.la libgstnavigationtest.la
noinst_HEADERS = efence.h gstnavigationtest.h gstnavseek.h tests.h