diff options
| author | Stefano Karapetsas <[email protected]> | 2012-12-15 12:33:17 -0800 |
|---|---|---|
| committer | Stefano Karapetsas <[email protected]> | 2012-12-15 12:33:17 -0800 |
| commit | 85c5ae14d75e3413b8f3f3aa38205ea852dcb20d (patch) | |
| tree | 4750b8d23dfcb17aea6cbc62c7e1c788a6976a7b /configure.ac | |
| parent | 12dcf19aa5f51901053c273cd7f5c17ce85e909d (diff) | |
| parent | c6a6cbde72489a0055ba63341a153fe365058072 (diff) | |
| download | mate-settings-daemon-85c5ae14d75e3413b8f3f3aa38205ea852dcb20d.tar.bz2 mate-settings-daemon-85c5ae14d75e3413b8f3f3aa38205ea852dcb20d.tar.xz | |
Merge pull request #31 from jasmineaura/develop
background revised, various other fixes & improvements
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/configure.ac b/configure.ac index 2743ab6..f4311ab 100644 --- a/configure.ac +++ b/configure.ac @@ -14,6 +14,8 @@ AC_CONFIG_SRCDIR([mate-settings-daemon/mate-settings-manager.c]) AM_INIT_AUTOMAKE([1.9 no-dist-gzip dist-bzip2 tar-ustar]) +m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])]) + AC_STDC_HEADERS AC_PROG_CXX AM_PROG_CC_C_O @@ -66,7 +68,6 @@ PKG_CHECK_MODULES(SETTINGS_DAEMON, PKG_CHECK_MODULES(SETTINGS_PLUGIN, gtk+-2.0 >= $GTK_REQUIRED_VERSION - mate-desktop-2.0 >= $MATE_DESKTOP_REQUIRED_VERSION gio-2.0 >= $GIO_REQUIRED_VERSION dbus-glib-1 >= $DBUS_GLIB_REQUIRED_VERSION ) @@ -84,6 +85,11 @@ AC_PATH_PROG(GLIB_GENMARSHAL, glib-genmarshal) GLIB_GSETTINGS dnl --------------------------------------------------------------------------- +dnl - Check for mate-desktop +dnl --------------------------------------------------------------------------- +PKG_CHECK_MODULES(MATE_DESKTOP, mate-desktop-2.0 >= $MATE_DESKTOP_REQUIRED_VERSION) + +dnl --------------------------------------------------------------------------- dnl - Check for libmatenotify dnl --------------------------------------------------------------------------- @@ -343,10 +349,8 @@ AC_SUBST(NSS_DATABASE) # PolicyKit # --------------------------------------------------------------------------- -POLKIT_REQUIRED=0.91 -DBUS_GLIB_REQUIRED=0.71 +POLKIT_REQUIRED=0.97 DBUS_REQUIRED=1.1.2 -NETWORK_MANAGER_REQUIRED=0.6 # PolicyKit detection; defaults to 'auto' (use it if it's available) # |