diff options
| author | Stefano Karapetsas <[email protected]> | 2013-08-02 01:00:47 +0200 |
|---|---|---|
| committer | Stefano Karapetsas <[email protected]> | 2013-08-02 01:00:47 +0200 |
| commit | 5064f93879706df73c8ce9fa6c5ae4b74cdad37c (patch) | |
| tree | a9a350040fbb76bcf4aacf1b0a97082fcd6a392b /configure.ac | |
| parent | 3be92767b85acabf1f30e010cca425d322b89de2 (diff) | |
| parent | 74afe20a5373c92718731e205008c1d2c55fc47c (diff) | |
| download | mate-power-manager-5064f93879706df73c8ce9fa6c5ae4b74cdad37c.tar.bz2 mate-power-manager-5064f93879706df73c8ce9fa6c5ae4b74cdad37c.tar.xz | |
Merge branch 'dev-gnome-keyring'
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/configure.ac b/configure.ac index 89309ff..912c362 100644 --- a/configure.ac +++ b/configure.ac @@ -102,7 +102,7 @@ GLIB_REQUIRED=2.13.0 GIO_REQUIRED=2.25.0 GTK_REQUIRED=2.17.7 GDK_REQUIRED=2.11.0 -MATE_KEYRING_REQUIRED=1.1.0 +GNOME_KEYRING_REQUIRED=3.0.0 DBUS_REQUIRED=1.0 DBUS_GLIB_REQUIRED=0.70 LIBNOTIFY_REQUIRED=0.7.0 @@ -249,18 +249,18 @@ fi AM_CONDITIONAL([HAVE_TESTS], [test $have_tests = yes]) dnl --------------------------------------------------------------------------- -dnl - Build mate-keyring support +dnl - Build gnome-keyring support dnl --------------------------------------------------------------------------- AC_ARG_WITH(keyring, [AS_HELP_STRING([--without-keyring], - [Disable the use of mate-keyring])], + [Disable the use of gnome-keyring])], [], [with_keyring=yes]) AM_CONDITIONAL([WITH_KEYRING],[test "$with_keyring" = "yes"]) if test "$with_keyring" = "yes"; then - PKG_CHECK_MODULES(KEYRING, mate-keyring-1 >= $MATE_KEYRING_REQUIRED) + PKG_CHECK_MODULES(KEYRING, gnome-keyring-1 >= $GNOME_KEYRING_REQUIRED) AC_DEFINE([WITH_KEYRING],[1],[Define if KEYRING support is enabled]) fi @@ -393,7 +393,7 @@ echo " datadir: ${datadir} compiler: ${CC} cflags: ${CFLAGS} - mate-keyring support: ${with_keyring} + gnome-keyring support: ${with_keyring} Building extra applets: ${enable_applets} Self test support: ${have_tests} Use libunique: ${enable_libunique} |