mirrors/wayland
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/wayland/wayland.git synced 2025-11-09 13:29:48 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Test for rsvg-convert in configure.ac

Browse source 
If it's not present, we just don't install the icon.
This commit is contained in:
Kristian Høgsberg 2011-01-26 15:33:24 -05:00
parent f58d8ca1bd
commit 26ef22e3f4
2 changed files with 8 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
configure.ac
View file

@ -30,6 +30,8 @@ PKG_CHECK_MODULES(POPPLER, [poppler-glib gdk-2.0 gio-2.0],
[have_poppler=yes], [have_poppler=no]) [have_poppler=yes], [have_poppler=no])
AM_CONDITIONAL(HAVE_POPPLER, test "x$have_poppler" = "xyes") AM_CONDITIONAL(HAVE_POPPLER, test "x$have_poppler" = "xyes")
AC_CHECK_PROG(RSVG_CONVERT, rsvg-convert, rsvg-convert)
AM_CONDITIONAL(HAVE_RSVG_CONVERT, test -n "$RSVG_CONVERT")
AC_ARG_ENABLE(x11-compositor, [ --enable-x11-compositor],, AC_ARG_ENABLE(x11-compositor, [ --enable-x11-compositor],,
enable_x11_compositor=yes) enable_x11_compositor=yes)

8
data/Makefile.am
View file

@ -20,7 +20,11 @@ dist_waylanddata_DATA = \
top_side.png \ top_side.png \
xterm.png \ xterm.png \
wayland.svg \ wayland.svg \
wayland.png $(wayland_icon_png)
if HAVE_RSVG_CONVERT
wayland_icon_png = wayland.png
wayland.png : wayland.svg wayland.png : wayland.svg
rsvg-convert -w 128 -h 128 wayland.svg -o wayland.png $(RSVG_CONVERT) -w 128 -h 128 wayland.svg -o wayland.png
endif