build-sys: make check for libnotify explicit
This commit is contained in:
parent
010e310f29
commit
2fa47da53e
|
@ -931,6 +931,7 @@ systemd_gnome_ask_password_agent_SOURCES = \
|
||||||
systemd_gnome_ask_password_agent_CFLAGS = \
|
systemd_gnome_ask_password_agent_CFLAGS = \
|
||||||
$(AM_CFLAGS) \
|
$(AM_CFLAGS) \
|
||||||
$(DBUSGLIB_CFLAGS) \
|
$(DBUSGLIB_CFLAGS) \
|
||||||
|
$(LIBNOTIFY_CFLAGS) \
|
||||||
$(GTK_CFLAGS) \
|
$(GTK_CFLAGS) \
|
||||||
-Wno-unused-variable \
|
-Wno-unused-variable \
|
||||||
-Wno-unused-function \
|
-Wno-unused-function \
|
||||||
|
@ -948,6 +949,7 @@ systemd_gnome_ask_password_agent_VALAFLAGS = \
|
||||||
|
|
||||||
systemd_gnome_ask_password_agent_LDADD = \
|
systemd_gnome_ask_password_agent_LDADD = \
|
||||||
$(DBUSGLIB_LIBS) \
|
$(DBUSGLIB_LIBS) \
|
||||||
|
$(LIBNOTIFY_LIBS) \
|
||||||
$(GTK_LIBS)
|
$(GTK_LIBS)
|
||||||
|
|
||||||
systemd_tty_ask_password_agent_SOURCES = \
|
systemd_tty_ask_password_agent_SOURCES = \
|
||||||
|
|
|
@ -241,7 +241,7 @@ AM_CONDITIONAL(HAVE_LIBCRYPTSETUP, [test "$have_libcryptsetup" = "yes"])
|
||||||
have_gtk=no
|
have_gtk=no
|
||||||
AC_ARG_ENABLE(gtk, AS_HELP_STRING([--disable-gtk], [disable GTK tools]))
|
AC_ARG_ENABLE(gtk, AS_HELP_STRING([--disable-gtk], [disable GTK tools]))
|
||||||
if test "x$enable_gtk" != "xno"; then
|
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_DEFINE(HAVE_GTK, 1, [Define if GTK is available]) have_gtk=yes], have_gtk=no)
|
||||||
AC_SUBST(GTK_CFLAGS)
|
AC_SUBST(GTK_CFLAGS)
|
||||||
AC_SUBST(GTK_LIBS)
|
AC_SUBST(GTK_LIBS)
|
||||||
|
@ -255,6 +255,10 @@ if test "$have_gtk" = "yes"; then
|
||||||
PKG_CHECK_MODULES(DBUSGLIB, [ dbus-glib-1 ])
|
PKG_CHECK_MODULES(DBUSGLIB, [ dbus-glib-1 ])
|
||||||
AC_SUBST(DBUSGLIB_CFLAGS)
|
AC_SUBST(DBUSGLIB_CFLAGS)
|
||||||
AC_SUBST(DBUSGLIB_LIBS)
|
AC_SUBST(DBUSGLIB_LIBS)
|
||||||
|
|
||||||
|
PKG_CHECK_MODULES(LIBNOTIFY, [ libnotify ])
|
||||||
|
AC_SUBST(LIBNOTIFY_CFLAGS)
|
||||||
|
AC_SUBST(LIBNOTIFY_LIBS)
|
||||||
fi
|
fi
|
||||||
|
|
||||||
AM_PROG_VALAC([0.9])
|
AM_PROG_VALAC([0.9])
|
||||||
|
|
Loading…
Reference in a new issue