summaryrefslogtreecommitdiff
path: root/configure.ac
diff options
context:
space:
mode:
authorStefano Karapetsas <[email protected]>2012-11-03 03:52:31 -0700
committerStefano Karapetsas <[email protected]>2012-11-03 03:52:31 -0700
commit2256a902e87b28697407c304bcb96ab1aeb3f669 (patch)
tree723fbf30b7e26a55d01463c0f703bab2c8ee0b88 /configure.ac
parentce7da346624297407644a1be28f75de0856e1f49 (diff)
parent8d80642d5cd6ce3522029525505abc991087f258 (diff)
downloadmate-screensaver-2256a902e87b28697407c304bcb96ab1aeb3f669.tar.bz2
mate-screensaver-2256a902e87b28697407c304bcb96ab1aeb3f669.tar.xz
Merge pull request #8 from NiceandGently/master
gsettings migration
Diffstat (limited to 'configure.ac')
-rw-r--r--configure.ac16
1 files changed, 9 insertions, 7 deletions
diff --git a/configure.ac b/configure.ac
index e29c232..f1c7559 100644
--- a/configure.ac
+++ b/configure.ac
@@ -35,17 +35,21 @@ AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE", [Name of default gettext
AM_GLIB_GNU_GETTEXT
+dnl
+dnl Enable gsettigns schema macros
+dnl
+
+GLIB_GSETTINGS
+
# Dependencies
DBUS_REQUIRED_VERSION=0.30
GLIB_REQUIRED_VERSION=2.15.0
-MATECONF_REQUIRED_VERSION=1.1.0
GDK_REQUIRED_VERSION=2.14.0
GTK_REQUIRED_VERSION=2.11.5
X11_REQUIRED_VERSION=1.0
LIBMATE_MENU_REQUIRED_VERSION=1.1.0
MATE_DESKTOP_REQUIRED_VERSION=1.1.0
-
LIBMATEKBDUI_REQUIRED_VERSION=1.1.0
AC_CHECK_HEADERS(unistd.h)
@@ -60,14 +64,14 @@ PKG_CHECK_MODULES(MATE_SCREENSAVER,
x11 >= $X11_REQUIRED_VERSION
gtk+-2.0 >= $GTK_REQUIRED_VERSION
dbus-glib-1 >= $DBUS_REQUIRED_VERSION
- mateconf-2.0 >= $MATECONF_REQUIRED_VERSION
+ gio-2.0 >= $GLIB_REQUIRED_VERSION
mate-desktop-2.0 >= $MATE_DESKTOP_REQUIRED_VERSION
libmate-menu >= $LIBMATE_MENU_REQUIRED_VERSION)
AC_SUBST(MATE_SCREENSAVER_CFLAGS)
AC_SUBST(MATE_SCREENSAVER_LIBS)
PKG_CHECK_MODULES(MATE_SCREENSAVER_DIALOG,
- mateconf-2.0 >= $MATECONF_REQUIRED_VERSION
+ gio-2.0 >= $GLIB_REQUIRED_VERSION
gthread-2.0
gtk+-2.0 >= $GTK_REQUIRED_VERSION)
AC_SUBST(MATE_SCREENSAVER_DIALOG_CFLAGS)
@@ -75,7 +79,6 @@ AC_SUBST(MATE_SCREENSAVER_DIALOG_LIBS)
PKG_CHECK_MODULES(MATE_SCREENSAVER_CAPPLET,
gio-2.0 >= $GLIB_REQUIRED_VERSION
- mateconf-2.0 >= $MATECONF_REQUIRED_VERSION
gtk+-2.0 >= $GTK_REQUIRED_VERSION
libmate-menu >= $LIBMATE_MENU_REQUIRED_VERSION)
AC_SUBST(MATE_SCREENSAVER_CAPPLET_CFLAGS)
@@ -93,9 +96,7 @@ ALL_X_LIBS="$X_LIBS $X_PRE_LIBS -lXext -lX11 $X_EXTRA_LIBS"
SAVER_LIBS="$ALL_X_LIBS"
AC_PATH_PROG(GLIB_GENMARSHAL, glib-genmarshal)
-AC_PATH_PROG(MATECONFTOOL, mateconftool-2)
-AM_MATECONF_SOURCE_2
MATE_COMPILE_WARNINGS(yes)
@@ -1074,6 +1075,7 @@ data/Makefile
data/mate-screensavers.menu
data/mate-screensaver.pc
data/org.mate.ScreenSaver.service
+data/org.mate.screensaver.gschema.xml
data/images/Makefile
data/images/cosmos/Makefile
savers/Makefile