Commit baf3f5d6 authored by Alexandre Julliard's avatar Alexandre Julliard

configure: Make the font warning more explicit about what package is missing.

parent 8e01c1b2
...@@ -12237,9 +12237,6 @@ if test "$FONTFORGE" != "false" -a -n "$FREETYPELIBS" ...@@ -12237,9 +12237,6 @@ if test "$FONTFORGE" != "false" -a -n "$FREETYPELIBS"
then then
FONTSSUBDIRS="fonts" FONTSSUBDIRS="fonts"
wine_cv_msg_fonts=no
else
wine_cv_msg_fonts=yes
fi fi
{ echo "$as_me:$LINENO: checking for parport header/ppdev.h" >&5 { echo "$as_me:$LINENO: checking for parport header/ppdev.h" >&5
...@@ -22836,10 +22833,15 @@ then ...@@ -22836,10 +22833,15 @@ then
exitcode=1 exitcode=1
fi fi
if test "$wine_cv_msg_fonts" = "yes" if test -z "$FONTSSUBDIRS"
then then
echo echo
echo "*** Warning: FreeType or FontForge is missing." if test "$FONTFORGE" = "false"
then
echo "*** Warning: FontForge is missing."
else
echo "*** Warning: FreeType is missing."
fi
echo "*** Fonts will not be built. Dialog text may be invisible or unaligned." echo "*** Fonts will not be built. Dialog text may be invisible or unaligned."
exitcode=1 exitcode=1
fi fi
......
...@@ -719,9 +719,6 @@ dnl Only build the fonts dir if we have both freetype and fontforge ...@@ -719,9 +719,6 @@ dnl Only build the fonts dir if we have both freetype and fontforge
if test "$FONTFORGE" != "false" -a -n "$FREETYPELIBS" if test "$FONTFORGE" != "false" -a -n "$FREETYPELIBS"
then then
AC_SUBST(FONTSSUBDIRS,"fonts") AC_SUBST(FONTSSUBDIRS,"fonts")
wine_cv_msg_fonts=no
else
wine_cv_msg_fonts=yes
fi fi
dnl **** Check for parport (currently Linux only) **** dnl **** Check for parport (currently Linux only) ****
...@@ -1854,10 +1851,15 @@ then ...@@ -1854,10 +1851,15 @@ then
exitcode=1 exitcode=1
fi fi
if test "$wine_cv_msg_fonts" = "yes" if test -z "$FONTSSUBDIRS"
then then
echo echo
echo "*** Warning: FreeType or FontForge is missing." if test "$FONTFORGE" = "false"
then
echo "*** Warning: FontForge is missing."
else
echo "*** Warning: FreeType is missing."
fi
echo "*** Fonts will not be built. Dialog text may be invisible or unaligned." echo "*** Fonts will not be built. Dialog text may be invisible or unaligned."
exitcode=1 exitcode=1
fi fi
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment