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

configure: Maintainer mode requires imagemagick.

This commit is contained in:
Joel Holdsworth 2010-04-05 11:15:03 +01:00 committed by Alexandre Julliard
parent 425f138402
commit 476a2bee64
3 changed files with 48 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Make.rules.in
View File

@ -48,6 +48,7 @@ LINT = @LINT@
LINTFLAGS = @LINTFLAGS@ LINTFLAGS = @LINTFLAGS@
FONTFORGE = @FONTFORGE@ FONTFORGE = @FONTFORGE@
RSVG = @RSVG@ RSVG = @RSVG@
CONVERT = @CONVERT@
ICOTOOL = @ICOTOOL@ ICOTOOL = @ICOTOOL@
CROSSCC = @CROSSCC@ CROSSCC = @CROSSCC@
CROSSTARGET = @CROSSTARGET@ CROSSTARGET = @CROSSTARGET@

45
configure vendored
View File

@ -671,6 +671,7 @@ OPENGL_LIBS
XLIB XLIB
PRELINK PRELINK
ICOTOOL ICOTOOL
CONVERT
RSVG RSVG
PKG_CONFIG PKG_CONFIG
FONTFORGE FONTFORGE
@ -5020,6 +5021,49 @@ fi
done done
test -n "$RSVG" || RSVG="false" test -n "$RSVG" || RSVG="false"
for ac_prog in convert
do
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
if test "${ac_cv_prog_CONVERT+set}" = set; then :
$as_echo_n "(cached) " >&6
else
if test -n "$CONVERT"; then
ac_cv_prog_CONVERT="$CONVERT" # Let the user override the test.
else
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_CONVERT="$ac_prog"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
done
IFS=$as_save_IFS
fi
fi
CONVERT=$ac_cv_prog_CONVERT
if test -n "$CONVERT"; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $CONVERT" >&5
$as_echo "$CONVERT" >&6; }
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
fi
test -n "$CONVERT" && break
done
test -n "$CONVERT" || CONVERT="false"
for ac_prog in icotool for ac_prog in icotool
do do
# Extract the first word of "$ac_prog", so it can be a program name with args. # Extract the first word of "$ac_prog", so it can be a program name with args.
@ -5068,6 +5112,7 @@ 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 "$ICOTOOL" = false if test "$ICOTOOL" = false
then then

2
configure.ac
View File

@ -281,12 +281,14 @@ dnl Check for various programs
AC_CHECK_PROGS(FONTFORGE, fontforge, false) AC_CHECK_PROGS(FONTFORGE, fontforge, false)
AC_CHECK_PROGS(PKG_CONFIG, pkg-config, false) AC_CHECK_PROGS(PKG_CONFIG, pkg-config, false)
AC_CHECK_PROGS(RSVG, rsvg, false) AC_CHECK_PROGS(RSVG, rsvg, false)
AC_CHECK_PROGS(CONVERT, convert, false)
AC_CHECK_PROGS(ICOTOOL, icotool, false) AC_CHECK_PROGS(ICOTOOL, icotool, false)
if test "${enable_maintainer_mode+set}" = set 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 icotool version dnl Check the icotool version
if test "$ICOTOOL" = false if test "$ICOTOOL" = false