gnome-ask-password-agent: require libnotify >= 0.7.0

[elogind.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 99ccca47f7d40ddfc63f96289c63303965a5f955..0d34fb31bbe05b0942b95fcee563c8cceec514be 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -134,16 +134,16 @@ AM_CPPFLAGS += \
        -DKBD_SETFONT=\"/usr/bin/setfont\" \
        -DDEFAULT_FONT=\"LatArCyrHeb-16\"
 else
+if TARGET_MAGEIA
 AM_CPPFLAGS += \
        -DKBD_LOADKEYS=\"/bin/loadkeys\" \
        -DKBD_SETFONT=\"/bin/setfont\" \
-       -DDEFAULT_FONT=\"latarcyrheb-sun16\"
+       -DDEFAULT_FONT=\"LatArCyrHeb-16\"
 else
-if TARGET_MAGEIA
 AM_CPPFLAGS += \
        -DKBD_LOADKEYS=\"/bin/loadkeys\" \
        -DKBD_SETFONT=\"/bin/setfont\" \
-       -DDEFAULT_FONT=\"LatArCyrHeb-16\"
+       -DDEFAULT_FONT=\"latarcyrheb-sun16\"
 endif
 endif
 endif
@@ -1092,12 +1092,7 @@ systemd_gnome_ask_password_agent_VALAFLAGS = \
        --pkg=gtk+-2.0 \
        --pkg=linux \
        --pkg=gio-unix-2.0 \
-       --pkg=libnotify
-if LIBNOTIFY07
-systemd_gnome_ask_password_agent_VALAFLAGS += \
-       -D LIBNOTIFY07
-endif
-systemd_gnome_ask_password_agent_VALAFLAGS += \
+       --pkg=libnotify \
        -g
 
 systemd_gnome_ask_password_agent_LDADD = \