summaryrefslogtreecommitdiff
path: root/configure.in
diff options
context:
space:
mode:
authorStefano Karapetsas <[email protected]>2012-09-03 17:14:37 +0200
committerStefano Karapetsas <[email protected]>2012-09-03 17:14:37 +0200
commit74e8c123722068886a8b12872601b14f5cc3bbe9 (patch)
treedd680caed288f9056b31d26221c8f007dc1740d6 /configure.in
parent35c8125877e60b0c3279dd15b26bf0e85df5b136 (diff)
downloadlibmatekbd-74e8c123722068886a8b12872601b14f5cc3bbe9.tar.bz2
libmatekbd-74e8c123722068886a8b12872601b14f5cc3bbe9.tar.xz
migrate to gsettings
Diffstat (limited to 'configure.in')
-rw-r--r--configure.in22
1 files changed, 7 insertions, 15 deletions
diff --git a/configure.in b/configure.in
index db81cad..aa0fea8 100644
--- a/configure.in
+++ b/configure.in
@@ -2,7 +2,7 @@ dnl ***************************************************************************
dnl *** configure.in for libmatekbd ***
dnl ***************************************************************************
m4_define([libmatekbd_major_version], [1])
-m4_define([libmatekbd_minor_version], [4])
+m4_define([libmatekbd_minor_version], [5])
m4_define([libmatekbd_micro_version], [0])
m4_define([libmatekbd_version],[libmatekbd_major_version.libmatekbd_minor_version.libmatekbd_micro_version])
@@ -48,11 +48,11 @@ dnl ***************************************************************************
dnl *** Minimum library versions for libmatekbd ***
dnl ***************************************************************************
GLIB_REQUIRED=2.18
-MATECONF_REQUIRED=1.1.0
+GIO_REQUIRED=2.25.0
LIBXKLAVIER_REQUIRED=5.0
-AC_SUBST([MATECONF_REQUIRED])
+AC_SUBST([GIO_REQUIRED])
AC_SUBST([GDK_REQUIRED])
AC_SUBST([GTK_REQUIRED])
AC_SUBST([LIBXKLAVIER_REQUIRED])
@@ -90,10 +90,10 @@ AC_SUBST(GLIB_CFLAGS)
AC_SUBST(GLIB_LIBS)
AC_SUBST(GMODULE_LIBS)
-PKG_CHECK_MODULES(MATECONF, mateconf-2.0 >= $MATECONF_REQUIRED)
+PKG_CHECK_MODULES(GIO, gio-2.0 >= $GIO_REQUIRED)
-AC_SUBST(MATECONF_CFLAGS)
-AC_SUBST(MATECONF_LIBS)
+AC_SUBST(GIO_CFLAGS)
+AC_SUBST(GIO_LIBS)
PKG_CHECK_MODULES(GDK, gdk-$GTK_API_VERSION >= $GDK_REQUIRED)
@@ -116,13 +116,7 @@ XLIB_LIBS="$X_LIBS -lX11 $X_EXTRA_LIBS"
AC_SUBST(XLIB_CFLAGS)
AC_SUBST(XLIB_LIBS)
-AC_PATH_PROG(MATECONFTOOL, mateconftool-2, no)
-
-if test x"$MATECONFTOOL" = xno; then
- AC_MSG_ERROR([mateconftool-2 executable not found in your path - should be installed with MateConf])
-fi
-
-AM_MATECONF_SOURCE_2
+GLIB_GSETTINGS
AC_ARG_ENABLE([tests],
AC_HELP_STRING([--disable-tests], [Dont build the test apps]),,
@@ -139,6 +133,4 @@ libmatekbdui.pc
po/Makefile.in
libmatekbd/Makefile
test/Makefile
-capplet/Makefile
-capplet/matekbd-indicator-plugins-capplet.desktop.in
])