Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wine-winehq
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
wine
wine-winehq
Commits
b9eae1ef
Commit
b9eae1ef
authored
May 16, 2010
by
Joel Holdsworth
Committed by
Alexandre Julliard
May 17, 2010
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
configure: Added a check for ImageMagick v6.6 or newer in maintainer mode.
parent
9571f781
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
52 additions
and
2 deletions
+52
-2
configure
configure
+27
-1
configure.ac
configure.ac
+25
-1
No files found.
configure
View file @
b9eae1ef
...
@@ -5110,7 +5110,33 @@ if test "${enable_maintainer_mode+set}" = set
...
@@ -5110,7 +5110,33 @@ if test "${enable_maintainer_mode+set}" = set
then
then
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_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
"
$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
if
test
"
$ICOTOOL
"
=
false
then
then
...
...
configure.ac
View file @
b9eae1ef
...
@@ -285,7 +285,31 @@ if test "${enable_maintainer_mode+set}" = set
...
@@ -285,7 +285,31 @@ if test "${enable_maintainer_mode+set}" = set
then
then
if test "$FONTFORGE" = "false"; then WINE_WARNING([fontforge is missing, fonts can't be rebuilt.]); fi
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 "$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
dnl Check the icotool version
if test "$ICOTOOL" = false
if test "$ICOTOOL" = false
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment