diff options
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 98 |
1 files changed, 18 insertions, 80 deletions
diff --git a/configure.ac b/configure.ac index 4cd97aa..f003bef 100644 --- a/configure.ac +++ b/configure.ac @@ -1,6 +1,6 @@ AC_PREREQ(2.63) -AC_INIT([mate-power-manager], [1.10.0], [http://www.mate-desktop.org/]) +AC_INIT([mate-power-manager], [1.17.0], [http://www.mate-desktop.org/]) AC_CONFIG_SRCDIR(src) AM_INIT_AUTOMAKE([1.9 no-dist-gzip dist-xz check-news tar-ustar]) AC_CONFIG_HEADERS([config.h]) @@ -14,11 +14,17 @@ AM_PROG_CC_C_O AC_PROG_INSTALL LT_INIT -IT_PROG_INTLTOOL([0.35.0]) +IT_PROG_INTLTOOL([0.50.1]) MATE_COMPILE_WARNINGS YELP_HELP_INIT +# GLib min/max required versions +AC_DEFINE([GLIB_VERSION_MAX_ALLOWED], [GLIB_VERSION_2_36], + [Warn on use of APIs added after GLib 2.36]) +AC_DEFINE([GLIB_VERSION_MIN_REQUIRED], [GLIB_VERSION_2_36], + [Warn on use of APIs deprecated before GLib 2.36]) + AC_PATH_PROG(GLIB_GENMARSHAL, glib-genmarshal) dnl --------------------------------------------------------------------------- @@ -114,66 +120,37 @@ dnl - Library dependencies dnl ---------------------------------------------------------------------------- GLIB_REQUIRED=2.36.0 GIO_REQUIRED=2.36.0 -GDK_REQUIRED=2.11.0 +GDK_REQUIRED=3.14.0 +GTK_REQUIRED=3.14.0 GNOME_KEYRING_REQUIRED=3.0.0 DBUS_REQUIRED=1.0 DBUS_GLIB_REQUIRED=0.70 LIBNOTIFY_REQUIRED=0.7.0 CAIRO_REQUIRED=1.0.0 -UNIQUE_REQUIRED=0.9.4 -LIBPANEL_REQUIRED=1.5.0 -XRANDR_REQUIRED=1.2.0 +LIBPANEL_REQUIRED=1.17.0 +XRANDR_REQUIRED=1.3.0 CANBERRA_REQUIRED=0.10 UPOWER_REQUIRED=0.9.5 -MATE_DESKTOP_REQUIRED=1.9.0 - -dnl ---------------------------------------------------------------------------- -dnl GTK library version -dnl ---------------------------------------------------------------------------- - -AC_MSG_CHECKING([which gtk+ version to compile against]) -AC_ARG_WITH([gtk], - [AS_HELP_STRING([--with-gtk=2.0|3.0],[which gtk+ version to compile against (default: 2.0)])], - [case "$with_gtk" in - 2.0|3.0) ;; - *) AC_MSG_ERROR([invalid gtk version specified]) ;; - esac], - [with_gtk=2.0]) -AC_MSG_RESULT([$with_gtk]) - -case "$with_gtk" in - 2.0) GTK_API_VERSION=2.0 - GTK_REQUIRED=2.24.0 - CANBERRA_GTK=libcanberra-gtk - LIBUNIQUE_VERSION=1.0 - ;; - 3.0) GTK_API_VERSION=3.0 - GTK_REQUIRED=3.0.0 - CANBERRA_GTK=libcanberra-gtk3 - LIBUNIQUE_VERSION=3.0 - ;; -esac dnl --------------------------------------------------------------------------- dnl - Check library dependencies dnl --------------------------------------------------------------------------- PKG_CHECK_MODULES(GLIB, glib-2.0 >= $GLIB_REQUIRED gobject-2.0 gio-2.0 >= $GIO_REQUIRED gio-unix-2.0) -PKG_CHECK_MODULES(CANBERRA, $CANBERRA_GTK >= $CANBERRA_REQUIRED) +PKG_CHECK_MODULES(CANBERRA, libcanberra-gtk3 >= $CANBERRA_REQUIRED) PKG_CHECK_MODULES(DBUS,[ dbus-glib-1 >= $DBUS_GLIB_REQUIRED dbus-1 >= $DBUS_REQUIRED gthread-2.0]) -PKG_CHECK_MODULES(MATE, [ - gtk+-$GTK_API_VERSION >= $GTK_REQUIRED - mate-desktop-2.0 >= $MATE_DESKTOP_REQUIRED +PKG_CHECK_MODULES(CAIRO, [ + gtk+-3.0 >= $GTK_REQUIRED cairo >= $CAIRO_REQUIRED]) PKG_CHECK_MODULES(GDK, [ - gdk-$GTK_API_VERSION >= $GDK_REQUIRED - gdk-x11-$GTK_API_VERSION >= $GDK_REQUIRED]) + gdk-3.0 >= $GDK_REQUIRED + gdk-x11-3.0 >= $GDK_REQUIRED]) PKG_CHECK_MODULES(X11, [ xrandr >= $XRANDR_REQUIRED @@ -181,22 +158,8 @@ PKG_CHECK_MODULES(X11, [ PKG_CHECK_MODULES(X11, x11 xrender) -PKG_CHECK_EXISTS( - [xrandr >= 1.3], - [AC_DEFINE(HAVE_XRANDR_13, 1, [xrandr 1.3 available])]) - PKG_CHECK_MODULES(LIBNOTIFY, libnotify >= $LIBNOTIFY_REQUIRED) -PKG_CHECK_MODULES(UNIQUE, unique-$LIBUNIQUE_VERSION) - -AC_SUBST([UNIQUE_CFLAGS]) -AC_SUBST([UNIQUE_LIBS]) - -# this deprecated stuff should be removed from unique in most distros -# but it's still not removed upstream in unique 1.x, so leaving it alone -# just in case. -UNIQUE_CFLAGS="$UNIQUE_CFLAGS -DG_CONST_RETURN=const" - PKG_CHECK_MODULES(UPOWER, upower-glib >= $UPOWER_REQUIRED) dnl --------------------------------------------------------------------------- @@ -284,29 +247,6 @@ AC_MSG_RESULT([$have_applets]) AM_CONDITIONAL([HAVE_APPLETS], [test $have_applets = yes]) dnl --------------------------------------------------------------------------- -dnl - DocBook Documentation -dnl --------------------------------------------------------------------------- -AC_ARG_ENABLE(docbook-docs, - AS_HELP_STRING([--enable-docbook-docs], - [build documentation (requires xmlto)]), - enable_docbook_docs=$enableval,enable_docbook_docs=auto) - -AC_PATH_PROG(XMLTO, xmlto, no) -AC_MSG_CHECKING([whether to build DocBook documentation]) -if test x$enable_docbook_docs = xauto ; then - if test x$XMLTO = xno ; then - enable_docbook_docs=no - else - enable_docbook_docs=yes - fi -fi -if test x$enable_docbook_docs = xyes -a x$XMLTO = xno; then - AC_MSG_ERROR([Building DocBook docs explicitly required, but DocBook not found]) -fi -AM_CONDITIONAL(DOCBOOK_DOCS_ENABLED, test x$enable_docbook_docs = xyes) -AC_MSG_RESULT(yes) - -dnl --------------------------------------------------------------------------- dnl - Are we specifying a different dbus root ? dnl --------------------------------------------------------------------------- AC_ARG_WITH(dbus-services, @@ -345,7 +285,6 @@ src/Makefile applets/Makefile applets/brightness/Makefile applets/inhibit/Makefile -docs/Makefile man/Makefile help/Makefile po/Makefile.in @@ -354,6 +293,7 @@ data/Makefile data/mate-power-manager.desktop.in data/mate-power-preferences.desktop.in data/mate-power-statistics.desktop.in +data/org.mate.power-manager.gschema.xml data/icons/Makefile data/icons/16x16/Makefile data/icons/16x16/actions/Makefile @@ -395,8 +335,6 @@ echo " gnome-keyring support: ${with_keyring} Building extra applets: ${enable_applets} Self test support: ${have_tests} - GTK+ API version: ${GTK_API_VERSION} - Docbook support: ${enable_docbook_docs} documentation dir: $DOCDIR dbus-1 services dir: $DBUS_SERVICES_DIR " |