diff options
| author | Diego Escalante Urrelo <descalante@igalia.com> | 2010-07-25 07:59:55 +0800 |
|---|---|---|
| committer | Xan Lopez <xan@gnome.org> | 2010-10-08 17:09:11 +0800 |
| commit | 5df7af9e3041102a5f5601d60faa11c38b48de75 (patch) | |
| tree | fe0306b87e0874a8541a082fe844f4a487331161 /configure.ac | |
| parent | 60d08f64c2466ce8eda20d832239ec6defc9ef06 (diff) | |
| download | gsoc2013-epiphany-5df7af9e3041102a5f5601d60faa11c38b48de75.tar gsoc2013-epiphany-5df7af9e3041102a5f5601d60faa11c38b48de75.tar.gz gsoc2013-epiphany-5df7af9e3041102a5f5601d60faa11c38b48de75.tar.bz2 gsoc2013-epiphany-5df7af9e3041102a5f5601d60faa11c38b48de75.tar.lz gsoc2013-epiphany-5df7af9e3041102a5f5601d60faa11c38b48de75.tar.xz gsoc2013-epiphany-5df7af9e3041102a5f5601d60faa11c38b48de75.tar.zst gsoc2013-epiphany-5df7af9e3041102a5f5601d60faa11c38b48de75.zip | |
gsettings: port epiphany to gsettings
Adds our own schemas, a migration file and removes old gconf API and files.
Bug #624485
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 21 |
1 files changed, 6 insertions, 15 deletions
diff --git a/configure.ac b/configure.ac index 006c54001..64caf2b26 100644 --- a/configure.ac +++ b/configure.ac @@ -75,6 +75,8 @@ AC_PATH_PROG([GLIB_MKENUMS],[glib-mkenums]) IT_PROG_INTLTOOL([0.40.0]) +GLIB_GSETTINGS + PKG_PROG_PKG_CONFIG GNOME_DEBUG_CHECK @@ -87,10 +89,10 @@ DEPRECATION_FLAGS= if test "$enable_maintainer_mode" = "yes"; then AC_DEFINE([MAINTAINER_MODE],[1],[Define to enable 'maintainer-only' behaviour]) enable_debug=yes - DEPRECATION_FLAGS="-DG_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED -DGDK_PIXBUF_DISABLE_DEPRECATED -DGCONF_DISABLE_DEPRECATED -DPANGO_DISABLE_DEPRECATED -DGNOME_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED -DGSEAL_ENABLE" + DEPRECATION_FLAGS="-DG_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED -DGDK_PIXBUF_DISABLE_DEPRECATED -DPANGO_DISABLE_DEPRECATED -DGNOME_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED -DGSEAL_ENABLE" fi -GLIB_REQUIRED=2.19.7 +GLIB_REQUIRED=2.25.13 GTK_REQUIRED=2.91.1 LIBXML_REQUIRED=2.6.12 LIBXSLT_REQUIRED=1.1.7 @@ -100,6 +102,7 @@ DBUS_GLIB_REQUIRED=0.35 WEBKIT_GTK_REQUIRED=1.3.2 LIBSOUP_GNOME_REQUIRED=2.29.91 GNOME_KEYRING_REQUIRED=2.26.0 +GSETTINGS_DESKTOP_SCHEMAS_REQUIRED=0.0.2 PKG_CHECK_EXISTS([libnotify >= $LIBNOTIFY_REQUIRED],[have_libnotify=yes],[have_libnotify=no]) @@ -131,12 +134,12 @@ PKG_CHECK_MODULES([DEPENDENCIES], [ sm libxml-2.0 >= $LIBXML_REQUIRED libxslt >= $LIBXSLT_REQUIRED - gconf-2.0 libstartup-notification-1.0 >= $LIBSTARTUP_NOTIFICATION_REQUIRED $LIBNOTIFY_PACKAGE webkitgtk-3.0 >= $WEBKIT_GTK_REQUIRED libsoup-gnome-2.4 >= $LIBSOUP_GNOME_REQUIRED gnome-keyring-1 >= $GNOME_KEYRING_REQUIRED + gsettings-desktop-schemas >= $GSETTINGS_DESKTOP_SCHEMAS_REQUIRED ]) # **** @@ -151,18 +154,6 @@ if test "$DBUS_BINDING_TOOL" = "no"; then AC_MSG_ERROR([dbus-binding-tool not found]) fi -# ***** -# GConf -# ***** - -AM_GCONF_SOURCE_2 - -AC_PATH_PROG([GCONFTOOL], [gconftool-2], [no]) - -if test "$GCONFTOOL" = "no"; then - AC_MSG_ERROR([gconftool-2 not found]) -fi - # ****************** # Portability checks # ****************** |