Mercurial > octave

comparison m4/acinclude.m4 @ 19753:bc2a8db22831

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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 1687269e31e4
children 81078b0e39e8
comparison
equal deleted inserted replaced
19752:3d60d347e64b 19753:bc2a8db22831
2118 dnl 2118 dnl
2119 dnl Find icotool program. 2119 dnl Find icotool program.
2120 dnl 2120 dnl
2121 AC_DEFUN([OCTAVE_PROG_ICOTOOL], [ 2121 AC_DEFUN([OCTAVE_PROG_ICOTOOL], [
2122 AC_CHECK_PROG(ICOTOOL, icotool, icotool, []) 2122 AC_CHECK_PROG(ICOTOOL, icotool, icotool, [])
2123 if test -z "$ICOTOOL"; then
2124 ICOTOOL='$(top_srcdir)/build-aux/missing icotool'
2125 warn_icotool="
2126
2127 I didn't find icotool, but it's only a problem if you need to
2128 reconstruct octave-logo.ico, which is the case if you're building from
2129 VCS sources.
2130 "
2131 OCTAVE_CONFIGURE_WARNING([warn_icotool])
2132 fi
2123 AC_SUBST(ICOTOOL) 2133 AC_SUBST(ICOTOOL)
2124 ]) 2134 ])
2125 dnl 2135 dnl
2126 dnl Check for makeinfo. 2136 dnl Check for makeinfo.
2127 dnl 2137 dnl
2179 dnl 2189 dnl
2180 dnl Find rsvg-convert program. 2190 dnl Find rsvg-convert program.
2181 dnl 2191 dnl
2182 AC_DEFUN([OCTAVE_PROG_RSVG_CONVERT], [ 2192 AC_DEFUN([OCTAVE_PROG_RSVG_CONVERT], [
2183 AC_CHECK_PROG(RSVG_CONVERT, rsvg-convert, rsvg-convert, []) 2193 AC_CHECK_PROG(RSVG_CONVERT, rsvg-convert, rsvg-convert, [])
2194 if test -z "$RSVG_CONVERT"; then
2195 RSVG_CONVERT='$(top_srcdir)/build-aux/missing rsvg-convert'
2196 warn_rsvg_convert="
2197
2198 I didn't find rsvg-convert, but it's only a problem if you need to
2199 reconstruct octave-logo-*.png, which is the case if you're building
2200 from VCS sources.
2201 "
2202 OCTAVE_CONFIGURE_WARNING([warn_rsvg_convert])
2203 fi
2184 AC_SUBST(RSVG_CONVERT) 2204 AC_SUBST(RSVG_CONVERT)
2185 ]) 2205 ])
2186 dnl 2206 dnl
2187 dnl Find sed program. 2207 dnl Find sed program.
2188 dnl 2208 dnl