aboutsummaryrefslogtreecommitdiff
path: root/configure.ac
diff options
context:
space:
mode:
authorTed Gould <ted@gould.cx>2012-02-23 08:55:02 -0600
committerTed Gould <ted@gould.cx>2012-02-23 08:55:02 -0600
commita2a0779d48c596f1fda30a2d502bb3d419a83164 (patch)
treefdc5ab9af6d20c35d11c630e35db049cc797d40a /configure.ac
parent10923a8e6c73b0dbee321c33d4b40f1e90c8dd59 (diff)
parent2afbdf3abb677533b1fdfb25d8b0aa64ebb332f9 (diff)
downloadayatana-indicator-session-a2a0779d48c596f1fda30a2d502bb3d419a83164.tar.gz
ayatana-indicator-session-a2a0779d48c596f1fda30a2d502bb3d419a83164.tar.bz2
ayatana-indicator-session-a2a0779d48c596f1fda30a2d502bb3d419a83164.zip
Import upstream version 0.3.92
Diffstat (limited to 'configure.ac')
-rw-r--r--configure.ac14
1 files changed, 10 insertions, 4 deletions
diff --git a/configure.ac b/configure.ac
index 8d02d69..ab12f12 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4,7 +4,7 @@ AC_INIT(src/indicator-session.c)
AC_PREREQ(2.53)
AM_CONFIG_HEADER(config.h)
-AM_INIT_AUTOMAKE(indicator-session, 0.3.91)
+AM_INIT_AUTOMAKE(indicator-session, 0.3.92)
AM_MAINTAINER_MODE
@@ -61,7 +61,6 @@ AS_IF([test "x$with_gtk" = x3],
[PKG_CHECK_MODULES(SESSIONSERVICE, dbusmenu-glib-0.4 >= $DBUSMENUGLIB_REQUIRED_VERSION
dbusmenu-gtk3-0.4 >= $DBUSMENUGTK_REQUIRED_VERSION
dbus-glib-1
- gudev-1.0
gio-unix-2.0
indicator3-0.4 >= $INDICATOR_REQUIRED_VERSION
packagekit-glib2)
@@ -69,7 +68,6 @@ AS_IF([test "x$with_gtk" = x3],
[test "x$with_gtk" = x2],
[PKG_CHECK_MODULES(SESSIONSERVICE, dbusmenu-glib-0.4 >= $DBUSMENUGLIB_REQUIRED_VERSION
dbusmenu-gtk-0.4 >= $DBUSMENUGTK_REQUIRED_VERSION
- gudev-1.0
dbus-glib-1
gio-unix-2.0
indicator-0.4 >= $INDICATOR_REQUIRED_VERSION
@@ -80,6 +78,10 @@ AS_IF([test "x$with_gtk" = x3],
AC_SUBST(SESSIONERVICE_CFLAGS)
AC_SUBST(SESSIONERVICE_LIBS)
+PKG_CHECK_MODULES(GUDEV, gudev-1.0, has_gudev=true, has_gudev=false)
+AC_SUBST(GUDEV_CFLAGS)
+AC_SUBST(GUDEV_LIBS)
+
AM_CONDITIONAL([USE_GTK3], [test "x$with_gtk" = "x3"])
AS_IF([test "x$with_gtk" = x3], [
AC_DEFINE(HAVE_GTK3, 1, [whether gtk3 is available])
@@ -199,7 +201,9 @@ AM_GLIB_GNU_GETTEXT
# Files
###########################
-AC_OUTPUT([
+AM_CONDITIONAL([HAS_GUDEV], [test "x$has_gudev" = "xtrue"])
+
+AC_CONFIG_FILES([
Makefile
src/Makefile
data/Makefile
@@ -223,6 +227,8 @@ data/extra-sessions/Makefile
po/Makefile.in
])
+AC_OUTPUT
+
###########################
# Results
###########################