From 1aa6079a48aacd1b495f6944848e3d432a4b115d Mon Sep 17 00:00:00 2001
From: Brent Hull <bhull2010@live.com>
Date: Thu, 15 Nov 2012 14:23:32 -0500
Subject: Port logview to Gsettings (based on GNOME patches)

---
 configure.ac | 25 ++++++++++++++++++++-----
 1 file changed, 20 insertions(+), 5 deletions(-)

(limited to 'configure.ac')

diff --git a/configure.ac b/configure.ac
index a116decd..ec1801e1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -84,10 +84,26 @@ PKG_CHECK_MODULES(MATE_UTILS, glib-2.0 >= $GLIB_REQUIRED dnl
 AC_SUBST(MATE_UTILS_CFLAGS)
 AC_SUBST(MATE_UTILS_LIBS)
 
+PKG_CHECK_MODULES(GLIB, glib-2.0 >= $GLIB_REQUIRED)
+AC_SUBST(GLIB_CFLAGS)
+AC_SUBST(GLIB_LIBS)
+
 PKG_CHECK_MODULES(GTHREAD, gthread-2.0 >= $GLIB_REQUIRED)
 AC_SUBST(GTHREAD_CFLAGS)
 AC_SUBST(GTHREAD_LIBS)
 
+PKG_CHECK_MODULES(GIO, gio-2.0 >= $GIO_REQUIRED)
+AC_SUBST(GIO_CFLAGS)
+AC_SUBST(GIO_LIBS)
+
+PKG_CHECK_MODULES(GIO_UNIX, gio-unix-2.0 >= $GIO_UNIX_REQUIRED)
+AC_SUBST(GIO_UNIX_CFLAGS)
+AC_SUBST(GIO_UNIX_LIBS)
+
+PKG_CHECK_MODULES(GTK, gtk+-2.0 >= $GTK_REQUIRED)
+AC_SUBST(GTK_CFLAGS)
+AC_SUBST(GTK_LIBS)
+
 # libeggsmclient
 PKG_CHECK_MODULES(LIBEGGSMCLIENT, gtk+-2.0 >= $GTK_REQUIRED)
 AC_SUBST(LIBEGGSMCLIENT_CFLAGS)
@@ -127,17 +143,14 @@ PKG_CHECK_MODULES(XSHAPE, xext x11,
                   [AC_CHECK_HEADERS(X11/extensions/shape.h, XSHAPE_LIBS="-lXext -lX11")])
 AC_SUBST(XSHAPE_LIBS)
 
-# gio-unix is needed for gsearchtool
-PKG_CHECK_MODULES(GIO_UNIX, gio-unix-2.0 >= $GIO_UNIX_REQUIRED)
-AC_SUBST(GIO_UNIX_CFLAGS)
-AC_SUBST(GIO_UNIX_LIBS)
-
 # for anything which calls mateconftool-2 correctly
 AC_PATH_PROG(MATECONFTOOL, [mateconftool-2], [no])
 AS_IF([test "x$MATECONFTOOL" = "xno"],
       [AC_MSG_ERROR([mateconftool-2 executable not found in your path - should be installed with MateConf])]
 )
 
+GLIB_GSETTINGS
+
 AM_MATECONF_SOURCE_2
 
 AC_ARG_ENABLE([gdict-applet],
@@ -342,6 +355,8 @@ AC_DEFINE_UNQUOTED([GETTEXT_PACKAGE], "$GETTEXT_PACKAGE", [Define the gettext pa
 AC_SUBST(GETTEXT_PACKAGE)
 AM_GLIB_GNU_GETTEXT
 
+GLIB_GSETTINGS
+
 # AM_GLIB_GNU_GETTEXT above substs $DATADIRNAME
 # this is the directory where the *.{mo,gmo} files are installed
 mateutilslocaledir='${prefix}/${DATADIRNAME}/locale'
-- 
cgit v1.2.1