diff options
| author | Darren Salt <devspam@moreofthesa.me.uk> | 2012-06-09 15:27:47 +0100 |
|---|---|---|
| committer | Darren Salt <devspam@moreofthesa.me.uk> | 2012-06-09 15:27:47 +0100 |
| commit | 4227cf2d342d3803619f2ae4a34693140e9db796 (patch) | |
| tree | 8971b0aac2f956607e62f02fe40b3c0707790d80 | |
| parent | e7d207560a1e69ab3b7e8385861b4542cae60e63 (diff) | |
| download | xine-lib-4227cf2d342d3803619f2ae4a34693140e9db796.tar.gz xine-lib-4227cf2d342d3803619f2ae4a34693140e9db796.tar.bz2 | |
Use rsvg-convert, where available, for documentation images.
| -rw-r--r-- | configure.ac | 6 | ||||
| -rw-r--r-- | doc/hackersguide/Makefile.am | 7 |
2 files changed, 11 insertions, 2 deletions
diff --git a/configure.ac b/configure.ac index ae28d9310..cae88dbee 100644 --- a/configure.ac +++ b/configure.ac @@ -1196,7 +1196,11 @@ dnl --------------------------------------------- AC_CHECK_PROG(XMLTO, xmlto, xmlto, no) AM_CONDITIONAL([HAVE_XMLTO], [test "$XMLTO" != "no"]) -AC_CHECK_PROG(RSVG, rsvg, rsvg, no) +AC_CHECK_PROG(RSVG, rsvg-convert, rsvg-convert, no) +AM_CONDITIONAL([HAVE_RSVG_CONVERT], [test "$RSVG" != "no"]) +if test "$RSVG" = no; then + AC_CHECK_PROG(RSVG, rsvg, rsvg, no) +fi AM_CONDITIONAL([HAVE_RSVG], [test "$RSVG" != "no"]) dnl --------------------------------------------- diff --git a/doc/hackersguide/Makefile.am b/doc/hackersguide/Makefile.am index f117b9faa..a9bac4c9e 100644 --- a/doc/hackersguide/Makefile.am +++ b/doc/hackersguide/Makefile.am @@ -60,15 +60,20 @@ endif $(AM_V_at)$(SED) -i -e '/<img [^>]*alt=/! s/<img /<img alt="" /g' $@ # we want valid XHTML 1.1 if HAVE_RSVG +if HAVE_RSVG_CONVERT +.svg.png: + $(AM_V_GEN)rsvg-convert -f png -o $@ $^ +else .svg.png: $(AM_V_GEN)rsvg -f png $^ $@ +endif if HAVE_OPTIPNG $(AM_V_at)optipng -quiet $@ endif else .svg.png: $(AM_V_FAKE)if test x"$(fail_if_missing)" = x"yes"; then \ - echo "Please install rsvg."; \ + echo "Please install rsvg-convert."; \ exit 1; \ fi; \ if test x"$(fail_if_missing)" != x"yes"; then \ |