diff options
| author | Kristian Høgsberg <krh@bitplanet.net> | 2011-01-26 15:33:24 -0500 |
|---|---|---|
| committer | Kristian Høgsberg <krh@bitplanet.net> | 2011-01-26 15:33:24 -0500 |
| commit | 26ef22e3f479259890bf856a66a8a5fbf6fc7d30 (patch) | |
| tree | 3d38cabb9af94b044191469c3560a70030d4e9c1 | |
| parent | f58d8ca1bd20180bfae3a3a047e8098e0b22b5aa (diff) | |
Test for rsvg-convert in configure.ac
If it's not present, we just don't install the icon.
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | data/Makefile.am | 8 |
2 files changed, 8 insertions, 2 deletions
diff --git a/configure.ac b/configure.ac index c6d33ca..226d87c 100644 --- a/configure.ac +++ b/configure.ac @@ -30,6 +30,8 @@ PKG_CHECK_MODULES(POPPLER, [poppler-glib gdk-2.0 gio-2.0], [have_poppler=yes], [have_poppler=no]) 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],, enable_x11_compositor=yes) diff --git a/data/Makefile.am b/data/Makefile.am index d03a58c..320a226 100644 --- a/data/Makefile.am +++ b/data/Makefile.am @@ -20,7 +20,11 @@ dist_waylanddata_DATA = \ top_side.png \ xterm.png \ wayland.svg \ - wayland.png + $(wayland_icon_png) + +if HAVE_RSVG_CONVERT +wayland_icon_png = wayland.png 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 |