From: Michael Biebl <biebl@debian.org>
Date: Sat, 27 Nov 2010 12:29:14 +0000 (+0100)
Subject: Ensure LIBNOTIFY07 conditional is always set
X-Git-Tag: v16~60
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=commitdiff_plain;h=ab85c225e0bf0ea432027715976cea00182f03c5

Ensure LIBNOTIFY07 conditional is always set

Also use PKG_CHECK_EXISTS to test if libnotify is recent enough
---

diff --git a/configure.ac b/configure.ac
index dfbce11ad..4d29d5faf 100644
--- a/configure.ac
+++ b/configure.ac
@@ -259,14 +259,13 @@ if test "$have_gtk" = "yes"; then
         AC_SUBST(DBUSGLIB_CFLAGS)
         AC_SUBST(DBUSGLIB_LIBS)
 
-        PKG_CHECK_MODULES(LIBNOTIFY, [ libnotify >= 0.7.0 ],
-          [ libnotify07=yes ],
-          [ PKG_CHECK_MODULES(LIBNOTIFY, [ libnotify ]) ]
-        )
-        AM_CONDITIONAL(LIBNOTIFY07, [ test "$libnotify07" = "yes" ])
+        PKG_CHECK_MODULES(LIBNOTIFY, [ libnotify ])
+        PKG_CHECK_EXISTS([ libnotify >= 0.7.0 ], [ libnotify07=yes ])
+
         AC_SUBST(LIBNOTIFY_CFLAGS)
         AC_SUBST(LIBNOTIFY_LIBS)
 fi
+AM_CONDITIONAL(LIBNOTIFY07, [ test "$libnotify07" = "yes" ])
 
 AM_PROG_VALAC([0.10])
 AC_SUBST(VAPIDIR)