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

configure: Make it a fatal error when some maintainer mode tools are not found.

This commit is contained in:
Alexandre Julliard 2010-08-31 16:50:17 +02:00
parent 333313aa2b
commit 364559b0ef
2 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
configure vendored
View File

@ -5116,12 +5116,12 @@ then
MAINTAINER_MODE=\# MAINTAINER_MODE=\#
else else
if test "$FONTFORGE" = "false"; then as_fn_append wine_warnings "|fontforge is missing, fonts can't be rebuilt."; fi if test "$FONTFORGE" = "false"; then as_fn_error "You need fontforge to rebuild fonts in maintainer mode." "$LINENO" 5; fi
if test "$RSVG" = "false"; then as_fn_append wine_warnings "|rsvg is missing, icons can't be rebuilt."; fi if test "$RSVG" = "false"; then as_fn_error "You need rsvg to rebuild icons in maintainer mode." "$LINENO" 5; fi
if test "$CONVERT" = false if test "$CONVERT" = false
then then
as_fn_append wine_warnings "|imagemagick is missing, icons can't be rebuilt." as_fn_error "You need imagemagick to rebuild icons in maintainer mode." "$LINENO" 5
else else
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for recent enough imagemagick" >&5 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for recent enough imagemagick" >&5
$as_echo_n "checking for recent enough imagemagick... " >&6; } $as_echo_n "checking for recent enough imagemagick... " >&6; }
@ -5133,13 +5133,13 @@ $as_echo_n "checking for recent enough imagemagick... " >&6; }
if test "$convert_version_major" -eq 6 -a "$convert_version_minor" -lt 6 if test "$convert_version_major" -eq 6 -a "$convert_version_minor" -lt 6
then then
CONVERT=false CONVERT=false
as_fn_append wine_warnings "|imagemagick version 6.6 or newer is needed to rebuild icons."
fi fi
fi fi
if test "$CONVERT" = false if test "$CONVERT" = false
then then
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no ($convert_version_major.$convert_version_minor)" >&5 { $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; } $as_echo "no ($convert_version_major.$convert_version_minor)" >&6; }
as_fn_error "You need imagemagick version 6.6 or newer to rebuild icons in maintainer mode." "$LINENO" 5
else else
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes ($convert_version_major.$convert_version_minor)" >&5 { $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; } $as_echo "yes ($convert_version_major.$convert_version_minor)" >&6; }
@ -5148,7 +5148,7 @@ $as_echo "yes ($convert_version_major.$convert_version_minor)" >&6; }
if test "$ICOTOOL" = false if test "$ICOTOOL" = false
then then
as_fn_append wine_warnings "|icotool is missing, icons can't be rebuilt." as_fn_error "You need icotool to rebuild icons in maintainer mode." "$LINENO" 5
else else
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for recent enough icotool" >&5 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for recent enough icotool" >&5
$as_echo_n "checking for recent enough icotool... " >&6; } $as_echo_n "checking for recent enough icotool... " >&6; }
@ -5167,6 +5167,7 @@ $as_echo_n "checking for recent enough icotool... " >&6; }
then then
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no ($icotool_version_major.$icotool_version_minor)" >&5 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no ($icotool_version_major.$icotool_version_minor)" >&5
$as_echo "no ($icotool_version_major.$icotool_version_minor)" >&6; } $as_echo "no ($icotool_version_major.$icotool_version_minor)" >&6; }
as_fn_error "You need icotool version 0.29.0 or newer to rebuild icons in maintainer mode." "$LINENO" 5
else else
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes ($icotool_version_major.$icotool_version_minor)" >&5 { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes ($icotool_version_major.$icotool_version_minor)" >&5
$as_echo "yes ($icotool_version_major.$icotool_version_minor)" >&6; } $as_echo "yes ($icotool_version_major.$icotool_version_minor)" >&6; }

11
configure.ac
View File

@ -295,13 +295,13 @@ if test "x$enable_maintainer_mode" != "xyes"
then then
AC_SUBST([MAINTAINER_MODE],[\#]) AC_SUBST([MAINTAINER_MODE],[\#])
else else
if test "$FONTFORGE" = "false"; then WINE_WARNING([fontforge is missing, fonts can't be rebuilt.]); fi if test "$FONTFORGE" = "false"; then AC_MSG_ERROR([You need fontforge to rebuild fonts in maintainer mode.]); fi
if test "$RSVG" = "false"; then WINE_WARNING([rsvg is missing, icons can't be rebuilt.]); fi if test "$RSVG" = "false"; then AC_MSG_ERROR([You need rsvg to rebuild icons in maintainer mode.]); fi
dnl Check the imagemagick version dnl Check the imagemagick version
if test "$CONVERT" = false if test "$CONVERT" = false
then then
WINE_WARNING([imagemagick is missing, icons can't be rebuilt.]) AC_MSG_ERROR([You need imagemagick to rebuild icons in maintainer mode.])
else else
AC_MSG_CHECKING([for recent enough imagemagick]) AC_MSG_CHECKING([for recent enough imagemagick])
convert_version=`convert --version | head -n1` convert_version=`convert --version | head -n1`
@ -312,12 +312,12 @@ else
if test "$convert_version_major" -eq 6 -a "$convert_version_minor" -lt 6 if test "$convert_version_major" -eq 6 -a "$convert_version_minor" -lt 6
then then
CONVERT=false CONVERT=false
WINE_WARNING([imagemagick version 6.6 or newer is needed to rebuild icons.])
fi fi
fi fi
if test "$CONVERT" = false if test "$CONVERT" = false
then then
AC_MSG_RESULT([no ($convert_version_major.$convert_version_minor)]) AC_MSG_RESULT([no ($convert_version_major.$convert_version_minor)])
AC_MSG_ERROR([You need imagemagick version 6.6 or newer to rebuild icons in maintainer mode.])
else else
AC_MSG_RESULT([yes ($convert_version_major.$convert_version_minor)]) AC_MSG_RESULT([yes ($convert_version_major.$convert_version_minor)])
fi fi
@ -326,7 +326,7 @@ else
dnl Check the icotool version dnl Check the icotool version
if test "$ICOTOOL" = false if test "$ICOTOOL" = false
then then
WINE_WARNING([icotool is missing, icons can't be rebuilt.]) AC_MSG_ERROR([You need icotool to rebuild icons in maintainer mode.])
else else
AC_MSG_CHECKING([for recent enough icotool]) AC_MSG_CHECKING([for recent enough icotool])
icotool_version=`icotool --version | head -n1` icotool_version=`icotool --version | head -n1`
@ -343,6 +343,7 @@ else
if test "$ICOTOOL" = false if test "$ICOTOOL" = false
then then
AC_MSG_RESULT([no ($icotool_version_major.$icotool_version_minor)]) AC_MSG_RESULT([no ($icotool_version_major.$icotool_version_minor)])
AC_MSG_ERROR([You need icotool version 0.29.0 or newer to rebuild icons in maintainer mode.])
else else
AC_MSG_RESULT([yes ($icotool_version_major.$icotool_version_minor)]) AC_MSG_RESULT([yes ($icotool_version_major.$icotool_version_minor)])
fi fi