diff options
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 32 |
1 files changed, 6 insertions, 26 deletions
diff --git a/configure.ac b/configure.ac index 265ffdc..312f220 100644 --- a/configure.ac +++ b/configure.ac @@ -1,6 +1,6 @@ AC_PREREQ(2.63) -AC_INIT([mate-power-manager], [1.2.1], [http://www.mate-desktop.org/]) +AC_INIT([mate-power-manager], [1.5.0], [http://www.mate-desktop.org/]) AC_CONFIG_SRCDIR(src) AM_INIT_AUTOMAKE(AC_PACKAGE_NAME, AC_PACKAGE_VERSION) AM_INIT_AUTOMAKE([foreign]) @@ -93,22 +93,23 @@ 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 MATE_KEYRING_REQUIRED=1.1.0 DBUS_REQUIRED=1.0 DBUS_GLIB_REQUIRED=0.70 LIBMATENOTIFY_REQUIRED=1.1.0 CAIRO_REQUIRED=1.0.0 UNIQUE_REQUIRED=0.9.4 -LIBPANEL_REQUIRED=1.1.0 +LIBPANEL_REQUIRED=1.5.0 XRANDR_REQUIRED=1.2.0 CANBERRA_REQUIRED=0.10 UPOWER_REQUIRED=0.9.1 @@ -139,7 +140,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) @@ -150,7 +151,6 @@ PKG_CHECK_MODULES(DBUS,[ PKG_CHECK_MODULES(MATE, [ gtk+-2.0 >= $GTK_REQUIRED - mateconf-2.0 >= $MATECONF_REQUIRED mate-keyring-1 >= $MATE_KEYRING_REQUIRED cairo >= $CAIRO_REQUIRED]) @@ -201,9 +201,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 +251,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, @@ -281,7 +263,7 @@ have_applets=no if test x$enable_applets = xyes ; then have_applets=yes - PKG_CHECK_MODULES(PANEL, [libmatepanelapplet-2.0 >= $LIBPANEL_REQUIRED]) + PKG_CHECK_MODULES(PANEL, [libmatepanelapplet-4.0 >= $LIBPANEL_REQUIRED]) AC_DEFINE(HAVE_APPLETS, 1, [Define if we are building applets]) fi AC_MSG_RESULT([$have_applets]) @@ -399,12 +381,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 ' |