build-sys: make check for libnotify explicit

diff --git a/Makefile.am b/Makefile.am
index f27bed2a1fa58857c5da71254674d731c85d8801..a86639d7a2f7f87be49135c60e14966aa445feb8 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -931,6 +931,7 @@ systemd_gnome_ask_password_agent_SOURCES = \
 systemd_gnome_ask_password_agent_CFLAGS = \
        $(AM_CFLAGS) \
        $(DBUSGLIB_CFLAGS) \
 systemd_gnome_ask_password_agent_CFLAGS = \
        $(AM_CFLAGS) \
        $(DBUSGLIB_CFLAGS) \

+       $(LIBNOTIFY_CFLAGS) \

        $(GTK_CFLAGS) \
        -Wno-unused-variable \
        -Wno-unused-function \
        $(GTK_CFLAGS) \
        -Wno-unused-variable \
        -Wno-unused-function \


@@ -948,6 +949,7 @@ systemd_gnome_ask_password_agent_VALAFLAGS = \
 
 systemd_gnome_ask_password_agent_LDADD = \
        $(DBUSGLIB_LIBS) \
 
 systemd_gnome_ask_password_agent_LDADD = \
        $(DBUSGLIB_LIBS) \

+       $(LIBNOTIFY_LIBS) \

        $(GTK_LIBS)
 
 systemd_tty_ask_password_agent_SOURCES = \
        $(GTK_LIBS)
 
 systemd_tty_ask_password_agent_SOURCES = \

diff --git a/configure.ac b/configure.ac
index fc0fc90c498e7e18972b3141900b8fb140b26a19..5c6379c2b4ed8cfcf2a1ef7d877b5e0fae080963 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -241,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 +255,10 @@ if test "$have_gtk" = "yes"; then
         PKG_CHECK_MODULES(DBUSGLIB, [ dbus-glib-1 ])
         AC_SUBST(DBUSGLIB_CFLAGS)
         AC_SUBST(DBUSGLIB_LIBS)
         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])
 fi
 
 AM_PROG_VALAC([0.9])