m4_define([ev_major_version],[2])
m4_define([ev_minor_version],[31])
-m4_define([ev_micro_version],[1])
+m4_define([ev_micro_version],[2])
m4_define([ev_extra_version],[])
m4_define([ev_version],[ev_major_version.ev_minor_version.ev_micro_version()ev_extra_version])
AM_CONDITIONAL([PLATFORM_WIN32],[test "$with_platform" = "win32"])
dnl Specify required versions of dependencies
-DBUS_GLIB_REQUIRED=0.70
-GTK_REQUIRED=2.20.0
-GLIB_REQUIRED=2.25.3
+GTK_REQUIRED=2.21.0
+GLIB_REQUIRED=2.25.7
KEYRING_REQUIRED=2.22.0
-GCONF_REQUIRED=2.31.2
AC_SUBST([GLIB_REQUIRED])
AC_SUBST([GTK_REQUIRED])
esac])
if test "$enable_dbus" = "yes"; then
- PKG_CHECK_MODULES([DBUS],[dbus-glib-1 >= $DBUS_GLIB_REQUIRED],[],
- [AC_MSG_ERROR([DBUS not found; use --disable-dbus to disable DBUS support])])
-
- AC_PATH_PROG([DBUS_BINDING_TOOL], [dbus-binding-tool], [no])
- if test x$DBUS_BINDING_TOOL = "xno" ; then
- AC_MSG_ERROR([dbus-binding-tool executable not found in your path - should be installed with dbus glib bindings])
- fi
-
AC_DEFINE([ENABLE_DBUS],[1],[Define if DBUS support is enabled])
-fi
-AC_SUBST([DBUS_CFLAGS])
-AC_SUBST([DBUS_LIBS])
+ PKG_CHECK_MODULES([EV_DAEMON], [gio-2.0 >= $GLIB_REQUIRED])
+fi
AM_CONDITIONAL([ENABLE_DBUS], [test "$enable_dbus" = "yes"])
-if test "$enable_dbus" = "yes"; then
- PKG_CHECK_MODULES([EV_DAEMON], [gthread-2.0 gio-2.0 >= $GLIB_REQUIRED dbus-glib-1 >= $DBUS_GLIB_REQUIRED])
-fi
-
dnl ========= Check for GConf
AC_MSG_CHECKING([whether GConf support is requested])
AM_CONDITIONAL([WITH_GCONF],[test "$with_gconf" = "yes"])
if test "$with_gconf" = "yes"; then
- PKG_CHECK_MODULES([GCONF],[gconf-2.0 >= $GCONF_REQUIRED])
+ PKG_CHECK_MODULES([GCONF],[gconf-2.0])
AC_DEFINE([WITH_GCONF],[1],[Define if GConf support is enabled])
AM_GCONF_SOURCE_2
AC_SUBST(BACKEND_CFLAGS)
AC_SUBST(BACKEND_LIBS)
-SHELL_CFLAGS="$SHELL_CORE_CFLAGS $DBUS_CFLAGS $KEYRING_CFLAGS $GCONF_CFLAGS -DGDK_MULTIHEAD_SAFE -DGTK_MULTIHEAD_SAFE $DEBUG_FLAGS"
-SHELL_LIBS="$SHELL_CORE_LIBS $DBUS_LIBS $KEYRING_LIBS $GCONF_LIBS -lz -lm"
+SHELL_CFLAGS="$SHELL_CORE_CFLAGS $KEYRING_CFLAGS $GCONF_CFLAGS -DGDK_MULTIHEAD_SAFE -DGTK_MULTIHEAD_SAFE $DEBUG_FLAGS"
+SHELL_LIBS="$SHELL_CORE_LIBS $KEYRING_LIBS $GCONF_LIBS -lz -lm"
AC_SUBST(SHELL_CFLAGS)
AC_SUBST(SHELL_LIBS)