X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=configure.ac;h=1eb931da3da1d668d06df59cad4097d65ef299d2;hb=26742b3fd8776c6c64e3c1035adc2599ddeb76d1;hp=396a414ac79fe82844cb36f2063972c25dadc10f;hpb=bef2733fae665e880da6ea011b1f918e6900bb42;p=elogind.git

diff --git a/configure.ac b/configure.ac
index 396a414ac..1eb931da3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -17,7 +17,7 @@
 
 AC_PREREQ(2.63)
 
-AC_INIT([systemd],[15],[systemd-devel@lists.freedesktop.org])
+AC_INIT([systemd],[16],[systemd-devel@lists.freedesktop.org])
 AC_CONFIG_SRCDIR([src/main.c])
 AC_CONFIG_MACRO_DIR([m4])
 AC_CONFIG_HEADERS([config.h])
@@ -244,21 +244,17 @@ AM_CONDITIONAL(HAVE_LIBCRYPTSETUP, [test "$have_libcryptsetup" = "yes"])
 have_gtk=no
 AC_ARG_ENABLE(gtk, AS_HELP_STRING([--disable-gtk], [disable GTK tools]))
 if test "x$enable_gtk" != "xno"; then
-        PKG_CHECK_MODULES(GTK, [ gtk+-2.0 gio-unix-2.0 ],
+        PKG_CHECK_MODULES(GTK, [ gtk+-2.0 glib-2.0 > 2.26 gio-unix-2.0 ],
                 [AC_DEFINE(HAVE_GTK, 1, [Define if GTK is available]) have_gtk=yes], have_gtk=no)
         AC_SUBST(GTK_CFLAGS)
         AC_SUBST(GTK_LIBS)
         if test "x$have_gtk" = xno -a "x$enable_gtk" = xyes; then
-             AC_MSG_ERROR([*** gtk support requested but libraries not found])
+                AC_MSG_ERROR([*** gtk support requested but libraries not found])
         fi
 fi
 AM_CONDITIONAL(HAVE_GTK, [test "$have_gtk" = "yes"])
 
 if test "$have_gtk" = "yes"; then
-        PKG_CHECK_MODULES(DBUSGLIB, [ dbus-glib-1 ])
-        AC_SUBST(DBUSGLIB_CFLAGS)
-        AC_SUBST(DBUSGLIB_LIBS)
-
         PKG_CHECK_MODULES(LIBNOTIFY, [ libnotify ])
         PKG_CHECK_EXISTS([ libnotify >= 0.7.0 ], [ libnotify07=yes ])
 
@@ -267,7 +263,7 @@ if test "$have_gtk" = "yes"; then
 fi
 AM_CONDITIONAL(LIBNOTIFY07, [ test "$libnotify07" = "yes" ])
 
-AM_PROG_VALAC([0.10])
+AM_PROG_VALAC([0.11])
 AC_SUBST(VAPIDIR)
 AM_CONDITIONAL(HAVE_VALAC, test x"$VALAC" != x)
 
@@ -411,7 +407,7 @@ else
 fi
 
 AC_ARG_WITH([tty-gid],
-        [AS_HELP_STRING([--tty-gid=GID],
+        [AS_HELP_STRING([--with-tty-gid=GID],
                 [Specify the numeric GID of the 'tty' group])],
         [AC_DEFINE_UNQUOTED(TTY_GID, [$withval], [GID of the 'tty' group])],
         [])