diff options
| author | Danielle Madeley <danielle.madeley@collabora.co.uk> | 2010-07-16 13:54:20 +1000 |
|---|---|---|
| committer | Danielle Madeley <danielle.madeley@collabora.co.uk> | 2010-07-16 13:54:20 +1000 |
| commit | 0aa8853161890069528ed10b8ecc22b4690569fa (patch) | |
| tree | ace9e428643c2380271b3af0debbc8c47f9c20bd /configure.ac | |
| parent | fbb4f0aa1ccd2d9ee53fbca918b161859740891d (diff) | |
| download | telepathy-logger-0aa8853161890069528ed10b8ecc22b4690569fa.tar.gz | |
Convert GConf schema to GSettings schema
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/configure.ac b/configure.ac index c1c77a3..1e9688f 100644 --- a/configure.ac +++ b/configure.ac @@ -66,7 +66,7 @@ AC_COPYRIGHT([ ]) # Minimal version required -GLIB_REQUIRED=2.22.0 +GLIB_REQUIRED=2.25.11 DBUS_REQUIRED=1.1.0 DBUS_GLIB_REQUIRED=0.82 TELEPATHY_GLIB_REQUIRED=0.11.7 @@ -93,8 +93,7 @@ AC_PATH_XTRA IT_PROG_INTLTOOL([0.35.0]) GNOME_DOC_INIT([0.17.3]) AC_PATH_PROG(DBUS_BINDING_TOOL, dbus-binding-tool) -AC_PATH_PROG(GCONFTOOL, gconftool-2) -AM_GCONF_SOURCE_2 +GLIB_GSETTINGS GLIB_GENMARSHAL=`$PKG_CONFIG glib-2.0 --variable=glib_genmarshal` AC_SUBST(GLIB_GENMARSHAL) @@ -159,7 +158,6 @@ AC_SUBST(ERROR_CFLAGS) # ----------------------------------------------------------- LIBTPL_MODULES=""" - gconf-2.0 gio-2.0 glib-2.0 >= $GLIB_REQUIRED gobject-2.0 |