diff options
| author | Michael Biebl <biebl@debian.org> | 2010-11-27 13:29:14 +0100 |
|---|---|---|
| committer | Michael Biebl <biebl@debian.org> | 2010-11-27 13:29:14 +0100 |
| commit | ab85c225e0bf0ea432027715976cea00182f03c5 (patch) | |
| tree | 44393270457feba0951c147a6f36330acae769b1 | |
| parent | c1c8ca815bb1ef040c0a84cccd51282e4ce8f4de (diff) | |
Ensure LIBNOTIFY07 conditional is always set
Also use PKG_CHECK_EXISTS to test if libnotify is recent enough
| -rw-r--r-- | configure.ac | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/configure.ac b/configure.ac index dfbce11ad3..4d29d5fafe 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) |