[tracker] build: Remove configure args for libsecret and gnome-keyring
- From: Martyn James Russell <mr src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [tracker] build: Remove configure args for libsecret and gnome-keyring
- Date: Wed, 26 Feb 2014 14:37:51 +0000 (UTC)
commit 15b00e6706e6106eefa70b0fd7d1c251f0eef329
Author: Martyn Russell <martyn lanedo com>
Date: Wed Feb 26 14:36:48 2014 +0000
build: Remove configure args for libsecret and gnome-keyring
We no longer use these after the api-cleanups branch from Carlos
configure.ac | 45 ---------------------------------------------
1 files changed, 0 insertions(+), 45 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 15e5e33..291244f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -194,7 +194,6 @@ CAMEL_REQUIRED=2.32.0
LIBSTREAMANALYZER_REQUIRED=0.7.0
GEE_REQUIRED=0.3
TAGLIB_REQUIRED=1.6
-LIBSECRET_REQUIRED=0.5
LIBGRSS_REQUIRED=0.5
REST_REQUIRED=0.6
NETWORK_MANAGER_REQUIRED=0.8
@@ -975,49 +974,6 @@ AM_CONDITIONAL(BUILD_LIBUNISTRING_PARSER, test "x$with_unicode_support" = "xlibu
AM_CONDITIONAL(BUILD_LIBICU_PARSER, test "x$with_unicode_support" = "xlibicu")
##################################################################
-# Check for libtracker-miner: libsecet for web miner details
-##################################################################
-
-AC_ARG_ENABLE(gnome_keyring,
- AS_HELP_STRING([--enable-gnome-keyring],
- [enable Gnome Keyring support to store credentials [[default=auto]]]),,
- [enable_gnome_keyring=auto])
-
-AC_ARG_ENABLE(libsecret,
- AS_HELP_STRING([--enable-libsecret],
- [enable libsecret support to store login credentials [[default=auto]]]),,
- [enable_libsecret=auto])
-
-if test "x$enable_gnome_keyring" != "xauto"; then
- AC_MSG_WARN([The --enable-gnome-keyring option has been deprecated for --enable-libsecret])
-
- # Try to continue as normal
- enable_libsecret="$enable_gnome_keyring"
-fi
-
-if test "x$enable_libsecret" != "xno"; then
- PKG_CHECK_MODULES(LIBSECRET,
- [libsecret-unstable >= $LIBSECRET_REQUIRED],
- [have_libsecret=yes],
- [have_libsecret=no])
-
- LIBTRACKER_MINER_CFLAGS="$LIBTRACKER_MINER_CFLAGS $LIBSECRET_CFLAGS"
- LIBTRACKER_MINER_LIBS="$LIBTRACKER_MINER_LIBS $LIBSECRET_LIBS"
-
- if test "x$have_libsecret" = "xyes"; then
- AC_DEFINE(HAVE_LIBSECRET, [], [Define if we have libsecret for password storage])
- fi
-fi
-
-if test "x$enable_libsecret" = "xyes"; then
- if test "x$have_libsecret" != "xyes"; then
- AC_MSG_ERROR([Couldn't find libsecret >= $LIBSECRET_REQUIRED.])
- fi
-fi
-
-AM_CONDITIONAL(HAVE_LIBSECRET, test "x$have_libsecret" = "xyes")
-
-##################################################################
# Check for libtracker-miner: network-manager for web miners
##################################################################
@@ -2682,7 +2638,6 @@ Build Configuration:
Support for HAL: $have_hal
Support for UPower: $have_upower
Support for network status detection: $have_network_manager
- Support for keyring data (libsecret): $have_libsecret
Unicode support library: $with_unicode_support
Applications:
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]