Mercurial > octave-nkf
changeset 19787:bc2a8db22831
build: Use the missing script for icotool and rsvg-convert
* acinclude.m4 (OCTAVE_PROG_ICOTOOL): If the icotool program is missing,
print a warning and set ICOTOOL to use the missing script.
(OCTAVE_PROG_RSVG_CONVERT): Likewise for RSVG_CONVERT.
author | Mike Miller <mtmiller@ieee.org> |
---|---|
date | Wed, 18 Feb 2015 19:22:59 -0500 |
parents | 3d60d347e64b |
children | f87233a45901 |
files | m4/acinclude.m4 |
diffstat | 1 files changed, 20 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/m4/acinclude.m4 Wed Feb 18 14:56:47 2015 -0500 +++ b/m4/acinclude.m4 Wed Feb 18 19:22:59 2015 -0500 @@ -2120,6 +2120,16 @@ dnl AC_DEFUN([OCTAVE_PROG_ICOTOOL], [ AC_CHECK_PROG(ICOTOOL, icotool, icotool, []) + if test -z "$ICOTOOL"; then + ICOTOOL='$(top_srcdir)/build-aux/missing icotool' + warn_icotool=" + +I didn't find icotool, but it's only a problem if you need to +reconstruct octave-logo.ico, which is the case if you're building from +VCS sources. +" + OCTAVE_CONFIGURE_WARNING([warn_icotool]) + fi AC_SUBST(ICOTOOL) ]) dnl @@ -2181,6 +2191,16 @@ dnl AC_DEFUN([OCTAVE_PROG_RSVG_CONVERT], [ AC_CHECK_PROG(RSVG_CONVERT, rsvg-convert, rsvg-convert, []) + if test -z "$RSVG_CONVERT"; then + RSVG_CONVERT='$(top_srcdir)/build-aux/missing rsvg-convert' + warn_rsvg_convert=" + +I didn't find rsvg-convert, but it's only a problem if you need to +reconstruct octave-logo-*.png, which is the case if you're building +from VCS sources. +" + OCTAVE_CONFIGURE_WARNING([warn_rsvg_convert]) + fi AC_SUBST(RSVG_CONVERT) ]) dnl