[tracker] tracker-extract: Disable libstreamanalyzer by default
- From: Martyn James Russell <mr src gnome org>
- To: svn-commits-list gnome org
- Cc:
- Subject: [tracker] tracker-extract: Disable libstreamanalyzer by default
- Date: Mon, 26 Oct 2009 20:32:39 +0000 (UTC)
commit 3d3946b05403742db2f6a980b276a18df6dcea65
Author: Martyn Russell <martyn lanedo com>
Date: Mon Oct 26 20:32:26 2009 +0000
tracker-extract: Disable libstreamanalyzer by default
configure.ac | 47 +++++++++++++++++++++++++++++++++--------------
1 files changed, 33 insertions(+), 14 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index b55d699..6ae884c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -200,20 +200,6 @@ AC_SUBST(GCONF_LIBS)
AM_CONDITIONAL(HAVE_GCONF, test "$have_gconf" = "yes")
-# Check for Streamanalyzer
-PKG_CHECK_MODULES(LIBSTREAMANALYZER,
- [libstreamanalyzer >= $LIBSTREAMANALYZER_REQUIRED],
- [have_libstreamanalyzer=yes],
- [have_libstreamanalyzer=no])
-AC_SUBST(LIBSTREAMANALYZER_CFLAGS)
-AC_SUBST(LIBSTREAMANALYZER_LIBS)
-
-AM_CONDITIONAL(HAVE_LIBSTREAMANALYZER, test "$have_libstreamanalyzer" = "yes")
-
-if test x$have_libstreamanalyzer == "xyes"; then
- AC_DEFINE(HAVE_LIBSTREAMANALYZER, 1, [libstreamanalyzer is available])
-fi
-
# Check for libuuid
PKG_CHECK_MODULES(UUID, [uuid])
AC_SUBST(UUID_CFLAGS)
@@ -242,6 +228,39 @@ fi
GLIB_GENMARSHAL=`$PKG_CONFIG glib-2.0 --variable=glib_genmarshal`
AC_SUBST(GLIB_GENMARSHAL)
+
+####################################################################
+# Stream Analyzer
+####################################################################
+
+AC_ARG_ENABLE(libstreamanalyzer,
+ AS_HELP_STRING([--enable-libstreamanalyzer],
+ [enable libstreamananalyzer [[default=no]]]), ,
+ [enable_libstreamanalyzer=no])
+
+if test "x$enable_libstreamanalyzer" != "xno"; then
+ PKG_CHECK_MODULES(LIBSTREAMANALYZER,
+ [libstreamanalyzer >= $LIBSTREAMANALYZER_REQUIRED],
+ [have_libstreamanalyzer=yes],
+ [have_libstreamanalyzer=no])
+ AC_SUBST(LIBSTREAMANALYZER_CFLAGS)
+ AC_SUBST(LIBSTREAMANALYZER_LIBS)
+
+ if test "x$have_libstreamanalyzer" = "xyes"; then
+ AC_DEFINE(HAVE_LIBSTREAMANALYZER, [], [Define if we have libstreamanalyzer])
+ fi
+else
+ have_libstreamanalyzer="no (disabled)"
+fi
+
+if test "x$enable_libstreamanalyzer" = "xyes"; then
+ if test "x$have_libstreamanalyzer" != "xyes"; then
+ AC_MSG_ERROR([Couldn't find libstreamanalyzer >= $LIBSTREAMANALYZER_REQUIRED and libstreamanalyzer.])
+ fi
+fi
+
+AM_CONDITIONAL(HAVE_LIBSTREAMANALYZER, test "$have_libstreamanalyzer" = "yes")
+
####################################################################
# DBus Service
####################################################################
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]