]> err.no Git - systemd/commitdiff
Ensure LIBNOTIFY07 conditional is always set
authorMichael Biebl <biebl@debian.org>
Sat, 27 Nov 2010 12:29:14 +0000 (13:29 +0100)
committerMichael Biebl <biebl@debian.org>
Sat, 27 Nov 2010 12:29:14 +0000 (13:29 +0100)
Also use PKG_CHECK_EXISTS to test if libnotify is recent enough

configure.ac

index dfbce11ad359648a8dd089a20a420ff6f2f45e88..4d29d5fafe199901912caf994ecd70ff5217404e 100644 (file)
@@ -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)