diff options
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 91 |
1 files changed, 32 insertions, 59 deletions
diff --git a/configure.ac b/configure.ac index 3f9cb2e..d85e690 100644 --- a/configure.ac +++ b/configure.ac @@ -1,8 +1,8 @@ AC_PREREQ(2.63) -AC_INIT([mate-power-manager], [1.6.1], [http://www.mate-desktop.org/]) +AC_INIT([mate-power-manager], [1.8.0], [http://www.mate-desktop.org/]) AC_CONFIG_SRCDIR(src) -AM_INIT_AUTOMAKE([1.9 no-dist-gzip dist-xz]) +AM_INIT_AUTOMAKE([1.9 no-dist-gzip dist-xz check-news tar-ustar]) AC_CONFIG_HEADERS([config.h]) AC_CONFIG_MACRO_DIR([m4]) @@ -17,7 +17,7 @@ LT_INIT IT_PROG_INTLTOOL([0.35.0]) MATE_COMPILE_WARNINGS -MATE_DOC_INIT +YELP_HELP_INIT AC_PATH_PROG(GLIB_GENMARSHAL, glib-genmarshal) @@ -44,7 +44,22 @@ if test x$enable_strict != xno; then fi fi -if test "$GCC" = "yes"; then +AC_ARG_ENABLE(deprecated, + [AS_HELP_STRING([--enable-deprecated], + [Warn about deprecated usages [default=no]])],, + [enable_deprecated=no]) + +if test "x$enable_deprecated" = "xyes"; then + DISABLE_DEPRECATED="" + CPPFLAGS="$CPPFLAGS $DISABLE_DEPRECATED" +fi + +AC_ARG_ENABLE(extra-warn, + [AS_HELP_STRING([--enable-extra-warn], + [Enable extra warnings. gcc only. [default=no]])],, + [enable_extra_warn=no]) + +if test "x$enable_extra_warn" = "xyes" && test "$GCC" = "yes"; then WARNINGFLAGS="$WARNINGFLAGS -Wall" WARNINGFLAGS="$WARNINGFLAGS -Wcast-align -Wno-uninitialized" WARNINGFLAGS="$WARNINGFLAGS -Wmissing-declarations" @@ -97,12 +112,11 @@ 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 -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 @@ -130,18 +144,20 @@ AC_MSG_RESULT([$with_gtk]) case "$with_gtk" in 2.0) GTK_API_VERSION=2.0 GTK_REQUIRED=2.17.7 + CANBERRA_GTK=libcanberra-gtk ;; 3.0) GTK_API_VERSION=3.0 GTK_REQUIRED=3.0.0 + CANBERRA_GTK=libcanberra-gtk3 ;; esac dnl --------------------------------------------------------------------------- dnl - Check library dependencies dnl --------------------------------------------------------------------------- -PKG_CHECK_MODULES(GLIB, glib-2.0 >= $GLIB_REQUIRED gobject-2.0 gio-2.0 >= $GIO_REQUIRED) +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, libcanberra-gtk >= $CANBERRA_REQUIRED) +PKG_CHECK_MODULES(CANBERRA, $CANBERRA_GTK >= $CANBERRA_REQUIRED) PKG_CHECK_MODULES(DBUS,[ dbus-glib-1 >= $DBUS_GLIB_REQUIRED @@ -149,12 +165,12 @@ PKG_CHECK_MODULES(DBUS,[ gthread-2.0]) PKG_CHECK_MODULES(MATE, [ - gtk+-2.0 >= $GTK_REQUIRED + gtk+-$GTK_API_VERSION >= $GTK_REQUIRED cairo >= $CAIRO_REQUIRED]) PKG_CHECK_MODULES(GDK, [ - gdk-2.0 >= $GDK_REQUIRED - gdk-x11-2.0 >= $GDK_REQUIRED]) + gdk-$GTK_API_VERSION >= $GDK_REQUIRED + gdk-x11-$GTK_API_VERSION >= $GDK_REQUIRED]) PKG_CHECK_MODULES(X11, [ xrandr >= $XRANDR_REQUIRED @@ -249,18 +265,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 @@ -284,48 +300,6 @@ AC_MSG_RESULT([$have_applets]) AM_CONDITIONAL([HAVE_APPLETS], [test $have_applets = yes]) dnl --------------------------------------------------------------------------- -dnl systemd inhibit -dnl --------------------------------------------------------------------------- - -AC_ARG_WITH(systemdinhibit, - AS_HELP_STRING([--with-systemdinhibit], - [Add systemdinhibit support]),, - with_systemdinhibit=auto) - -use_systemdinhibit=no -if test "x$with_systemdinhibit" != "xno" ; then - PKG_CHECK_MODULES(SYSTEMD_INHIBIT, libsystemd-login >= 195 libsystemd-daemon >= 195 , use_systemdinhibit=yes, use_systemdinhibit=no) - - if test "x$use_systemdinhibit" = "xyes"; then - AC_DEFINE(WITH_SYSTEMD_INHIBIT, 1, [systemdinhibit support]) - fi - -fi -AM_CONDITIONAL(WITH_SYSTEMD_INHIBIT, test x$use_systemdinhibit = xyes) -AC_SUBST(WITH_SYSTEMD_INHIBIT) - -dnl --------------------------------------------------------------------------- -dnl systemd sleep -dnl --------------------------------------------------------------------------- - -AC_ARG_WITH(systemdsleep, - AS_HELP_STRING([--with-systemdsleep], - [Use logind for suspend and hibernate instead of upower]),, - with_systemdsleep=auto) - -use_systemdsleep=no -if test "x$with_systemdsleep" != "xno" ; then - PKG_CHECK_MODULES(SYSTEMD_SLEEP, libsystemd-login >= 195 libsystemd-daemon >= 195 , use_systemdsleep=yes, use_systemdsleep=no) - - if test "x$use_systemdsleep" = "xyes"; then - AC_DEFINE(WITH_SYSTEMD_SLEEP, 1, [systemdsleeo support]) - fi - -fi -AM_CONDITIONAL(WITH_SYSTEMD_SLEEP, test x$use_systemdsleep = xyes) -AC_SUBST(WITH_SYSTEMD_SLEEP) - -dnl --------------------------------------------------------------------------- dnl - DocBook Documentation dnl --------------------------------------------------------------------------- AC_ARG_ENABLE(docbook-docs, @@ -435,12 +409,11 @@ 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} + GTK+ API version: ${GTK_API_VERSION} Use libunique: ${enable_libunique} - systemd support: ${use_systemdinhibit} - systemd sleep support: ${use_systemdsleep} Docbook support: ${enable_docbook_docs} documentation dir: $DOCDIR dbus-1 services dir: $DBUS_SERVICES_DIR |