diff options
| author | Stefano Karapetsas <[email protected]> | 2012-11-01 17:33:16 -0700 |
|---|---|---|
| committer | Stefano Karapetsas <[email protected]> | 2012-11-01 17:33:16 -0700 |
| commit | 7c7b09026bde3ffd1ce886fd545e7bfa1e59aec7 (patch) | |
| tree | 076ec7419159262e65f608da7a3dbccdd8ec3a5a /configure.ac | |
| parent | 83dc101045267b2e793af3af4716f1cf02089ac6 (diff) | |
| parent | 972be3627b8b6368a0e8c971ade7963ea7d459de (diff) | |
| download | mate-power-manager-7c7b09026bde3ffd1ce886fd545e7bfa1e59aec7.tar.bz2 mate-power-manager-7c7b09026bde3ffd1ce886fd545e7bfa1e59aec7.tar.xz | |
Merge pull request #19 from bhull2010/gsettings
Port to Gsettings
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 24 |
1 files changed, 3 insertions, 21 deletions
diff --git a/configure.ac b/configure.ac index bfaed8c..8271e34 100644 --- a/configure.ac +++ b/configure.ac @@ -93,12 +93,14 @@ AC_SUBST(GETTEXT_PACKAGE) AC_DEFINE(GETTEXT_PACKAGE, "AC_PACKAGE_NAME", [foo]) AM_GLIB_GNU_GETTEXT +GLIB_GSETTINGS dnl ---------------------------------------------------------------------------- dnl - Library dependencies dnl ---------------------------------------------------------------------------- GTK_API_VERSION=2.0 GLIB_REQUIRED=2.13.0 +GIO_REQUIRED=2.25.0 GTK_REQUIRED=2.17.7 GDK_REQUIRED=2.11.0 MATECONF_REQUIRED=1.1.0 @@ -139,7 +141,7 @@ esac dnl --------------------------------------------------------------------------- dnl - Check library dependencies dnl --------------------------------------------------------------------------- -PKG_CHECK_MODULES(GLIB, glib-2.0 >= $GLIB_REQUIRED gobject-2.0) +PKG_CHECK_MODULES(GLIB, glib-2.0 >= $GLIB_REQUIRED gobject-2.0 gio-2.0 >= $GIO_REQUIRED) PKG_CHECK_MODULES(CANBERRA, libcanberra-gtk >= $CANBERRA_REQUIRED) @@ -201,9 +203,6 @@ fi PKG_CHECK_MODULES(UPOWER, upower-glib >= $UPOWER_REQUIRED) -AC_PATH_PROG(MATECONFTOOL, mateconftool-2) -AM_MATECONF_SOURCE_2 - dnl --------------------------------------------------------------------------- dnl - Check XF86XK_Keys dnl --------------------------------------------------------------------------- @@ -254,21 +253,6 @@ fi AM_CONDITIONAL([HAVE_TESTS], [test $have_tests = yes]) dnl --------------------------------------------------------------------------- -dnl - Build mateconf default button? -dnl --------------------------------------------------------------------------- -AC_ARG_ENABLE(mateconf-defaults, - AS_HELP_STRING([--disable-mateconf-defaults], - [Allow setting mateconf default settings]), - have_mateconfdefaults=$enableval,have_mateconfdefaults=yes) - -AC_MSG_CHECKING([whether to support mateconf defaults]) -if test x$have_mateconfdefaults = xyes ; then - AC_DEFINE(HAVE_MATECONF_DEFAULTS, 1, [Define if have mateconf defaults]) -fi -AC_MSG_RESULT([$have_mateconfdefaults]) -AM_CONDITIONAL([HAVE_MATECONF_DEFAULTS], [test $have_mateconfdefaults = yes]) - -dnl --------------------------------------------------------------------------- dnl - Build applets dnl --------------------------------------------------------------------------- AC_ARG_ENABLE(applets, @@ -399,12 +383,10 @@ echo " cflags: ${CFLAGS} Building extra applets: ${enable_applets} Self test support: ${have_tests} - MateConf default support: ${have_mateconfdefaults} Use libunique: ${enable_libunique} Docbook support: ${enable_docbook_docs} documentation dir: $DOCDIR dbus-1 services dir: $DBUS_SERVICES_DIR - mateconf-schema dir: $MATECONF_SCHEMA_FILE_DIR " if [[ "${prefix}" != "/usr" ]] ; then echo ' |