chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
update TODO
[elogind.git]
/
configure.ac
diff --git
a/configure.ac
b/configure.ac
index 12cdb0c1e96e9866fb0485bc0b9dfdfbc4e8f060..d0838516e1021aa796037dc123563777a0767c2b 100644
(file)
--- a/
configure.ac
+++ b/
configure.ac
@@
-17,7
+17,7
@@
AC_PREREQ(2.63)
AC_PREREQ(2.63)
-AC_INIT([systemd],[1
1
],[systemd-devel@lists.freedesktop.org])
+AC_INIT([systemd],[1
2
],[systemd-devel@lists.freedesktop.org])
AC_CONFIG_SRCDIR([src/main.c])
AC_CONFIG_MACRO_DIR([m4])
AC_CONFIG_HEADERS([config.h])
AC_CONFIG_SRCDIR([src/main.c])
AC_CONFIG_MACRO_DIR([m4])
AC_CONFIG_HEADERS([config.h])
@@
-112,10
+112,6
@@
PKG_CHECK_MODULES(DBUS, [ dbus-1 >= 1.3.2 ])
AC_SUBST(DBUS_CFLAGS)
AC_SUBST(DBUS_LIBS)
AC_SUBST(DBUS_CFLAGS)
AC_SUBST(DBUS_LIBS)
-PKG_CHECK_MODULES(DBUSGLIB, [ dbus-glib-1 ])
-AC_SUBST(DBUSGLIB_CFLAGS)
-AC_SUBST(DBUSGLIB_LIBS)
-
have_selinux=no
AC_ARG_ENABLE(selinux, AS_HELP_STRING([--disable-selinux], [Disable optional SELINUX support]))
if test "x$enable_selinux" != "xno"; then
have_selinux=no
AC_ARG_ENABLE(selinux, AS_HELP_STRING([--disable-selinux], [Disable optional SELINUX support]))
if test "x$enable_selinux" != "xno"; then
@@
-245,7
+241,7
@@
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
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
libnotify
],
+ PKG_CHECK_MODULES(GTK, [ gtk+-2.0 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)
[AC_DEFINE(HAVE_GTK, 1, [Define if GTK is available]) have_gtk=yes], have_gtk=no)
AC_SUBST(GTK_CFLAGS)
AC_SUBST(GTK_LIBS)
@@
-255,6
+251,16
@@
if test "x$enable_gtk" != "xno"; then
fi
AM_CONDITIONAL(HAVE_GTK, [test "$have_gtk" = "yes"])
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 ])
+ AC_SUBST(LIBNOTIFY_CFLAGS)
+ AC_SUBST(LIBNOTIFY_LIBS)
+fi
+
AM_PROG_VALAC([0.9])
AC_SUBST(VAPIDIR)
AM_CONDITIONAL(HAVE_VALAC, test x"$VALAC" != x)
AM_PROG_VALAC([0.9])
AC_SUBST(VAPIDIR)
AM_CONDITIONAL(HAVE_VALAC, test x"$VALAC" != x)