Alexandre Julliard : configure:
Make the font warning more explicit about what package is missing.
Alexandre Julliard
julliard at wine.codeweavers.com
Thu Jun 8 05:06:16 CDT 2006
Module: wine
Branch: refs/heads/master
Commit: baf3f5d6f9fe0440c999ed4b2a9fbaeb2505c260
URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=baf3f5d6f9fe0440c999ed4b2a9fbaeb2505c260
Author: Alexandre Julliard <julliard at winehq.org>
Date: Thu Jun 8 11:26:44 2006 +0200
configure: Make the font warning more explicit about what package is missing.
---
configure | 12 +++++++-----
configure.ac | 12 +++++++-----
2 files changed, 14 insertions(+), 10 deletions(-)
diff --git a/configure b/configure
index fe99f62..b2cd31e 100755
--- a/configure
+++ b/configure
@@ -12237,9 +12237,6 @@ if test "$FONTFORGE" != "false" -a -n "$
then
FONTSSUBDIRS="fonts"
- wine_cv_msg_fonts=no
-else
- wine_cv_msg_fonts=yes
fi
{ echo "$as_me:$LINENO: checking for parport header/ppdev.h" >&5
@@ -22836,10 +22833,15 @@ then
exitcode=1
fi
-if test "$wine_cv_msg_fonts" = "yes"
+if test -z "$FONTSSUBDIRS"
then
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."
exitcode=1
fi
diff --git a/configure.ac b/configure.ac
index ba6b1b3..81c79b2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -719,9 +719,6 @@ dnl Only build the fonts dir if we have
if test "$FONTFORGE" != "false" -a -n "$FREETYPELIBS"
then
AC_SUBST(FONTSSUBDIRS,"fonts")
- wine_cv_msg_fonts=no
-else
- wine_cv_msg_fonts=yes
fi
dnl **** Check for parport (currently Linux only) ****
@@ -1854,10 +1851,15 @@ then
exitcode=1
fi
-if test "$wine_cv_msg_fonts" = "yes"
+if test -z "$FONTSSUBDIRS"
then
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."
exitcode=1
fi
More information about the wine-cvs
mailing list