From 76f35f988f37430e3d45e4d14fac68f0d0871cc4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tim-Philipp=20M=C3=BCller?= Date: Fri, 7 Oct 2005 11:30:41 +0000 Subject: [PATCH] configure.ac: Add check for mmap Original commit message from CVS: * configure.ac: Add check for mmap * gst/debug/Makefile.am: Only compile efence plugin on systems that have mmap. --- ChangeLog | 8 ++++++++ common | 2 +- configure.ac | 4 ++++ gst/debug/Makefile.am | 8 +++++++- 4 files changed, 20 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 2f0bd074ba..dd722c03d6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2005-10-07 Tim-Philipp Müller + + * 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 * gst/debug/Makefile.am: diff --git a/common b/common index 7d175466d3..fb4bd52a0a 160000 --- a/common +++ b/common @@ -1 +1 @@ -Subproject commit 7d175466d3319fe55327608ea1f7a20619ab5634 +Subproject commit fb4bd52a0a6e882bd8eb0ca836edd94d3fcaea42 diff --git a/configure.ac b/configure.ac index e05018f7b9..7bf8b6758d 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 b3b2911fdc..da3b3a2999 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