ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

configure: Added a check for ImageMagick v6.6 or newer in maintainer mode.

This commit is contained in:
Joel Holdsworth 2010-05-16 23:07:40 +01:00 committed by Alexandre Julliard
parent 9571f781fb
commit b9eae1ef8e
2 changed files with 52 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
configure vendored
View File

@ -5110,7 +5110,33 @@ if test "${enable_maintainer_mode+set}" = set
then
if test "$FONTFORGE" = "false"; then as_fn_append wine_warnings "|fontforge is missing, fonts can't be rebuilt."; fi
if test "$RSVG" = "false"; then as_fn_append wine_warnings "|rsvg is missing, icons can't be rebuilt."; fi
if test "$CONVERT" = "false"; then as_fn_append wine_warnings "|imagemagick is missing, icons can't be rebuilt."; fi
if test "$CONVERT" = false
then
as_fn_append wine_warnings "|imagemagick is missing, icons can't be rebuilt."
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for recent enough imagemagick" >&5
$as_echo_n "checking for recent enough imagemagick... " >&6; }
convert_version=`convert --version | head -n1`
if test "x$convert_version" != "x"
then
convert_version_major=`expr "$convert_version" : '.* \([0-9]*\)\.[0-9]*'`
convert_version_minor=`expr "$convert_version" : '.* [0-9]*\.\([0-9]*\)'`
if test "$convert_version_major" -eq 6 -a "$convert_version_minor" -lt 6
then
CONVERT=false
as_fn_append wine_warnings "|imagemagick version 6.6 or newer is needed to rebuild icons."
fi
fi
if test "$CONVERT" = false
then
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no ($convert_version_major.$convert_version_minor)" >&5
$as_echo "no ($convert_version_major.$convert_version_minor)" >&6; }
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes ($convert_version_major.$convert_version_minor)" >&5
$as_echo "yes ($convert_version_major.$convert_version_minor)" >&6; }
fi
fi
if test "$ICOTOOL" = false
then

26
configure.ac
View File

@ -285,7 +285,31 @@ if test "${enable_maintainer_mode+set}" = set
then
if test "$FONTFORGE" = "false"; then WINE_WARNING([fontforge is missing, fonts can't be rebuilt.]); fi
if test "$RSVG" = "false"; then WINE_WARNING([rsvg is missing, icons can't be rebuilt.]); fi
if test "$CONVERT" = "false"; then WINE_WARNING([imagemagick is missing, icons can't be rebuilt.]); fi
dnl Check the imagemagick version
if test "$CONVERT" = false
then
WINE_WARNING([imagemagick is missing, icons can't be rebuilt.])
else
AC_MSG_CHECKING([for recent enough imagemagick])
convert_version=`convert --version | head -n1`
if test "x$convert_version" != "x"
then
convert_version_major=`expr "$convert_version" : '.* \([[0-9]]*\)\.[[0-9]]*'`
convert_version_minor=`expr "$convert_version" : '.* [[0-9]]*\.\([[0-9]]*\)'`
if test "$convert_version_major" -eq 6 -a "$convert_version_minor" -lt 6
then
CONVERT=false
WINE_WARNING([imagemagick version 6.6 or newer is needed to rebuild icons.])
fi
fi
if test "$CONVERT" = false
then
AC_MSG_RESULT([no ($convert_version_major.$convert_version_minor)])
else
AC_MSG_RESULT([yes ($convert_version_major.$convert_version_minor)])
fi
fi
dnl Check the icotool version
if test "$ICOTOOL" = false