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

Don't define HAVE_FREETYPE unless we have freetype.h.

This commit is contained in:
Huw D M Davies 2002-01-29 17:09:28 +00:00 committed by Alexandre Julliard
parent e2a55be486
commit 9b1d37260b
3 changed files with 167 additions and 150 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

296
configure vendored
View File

File diff suppressed because it is too large Load Diff

15
configure.in
View File

@ -406,7 +406,6 @@ else
FREETYPEINCL="" FREETYPEINCL=""
wine_cv_msg_freetype=yes wine_cv_msg_freetype=yes
else else
AC_DEFINE(HAVE_FREETYPE, 1, [Define if FreeType 2 is installed])
FREETYPELIBS=`$ft_devel --libs` FREETYPELIBS=`$ft_devel --libs`
FREETYPEINCL=`$ft_devel --cflags` FREETYPEINCL=`$ft_devel --cflags`
ac_save_CPPFLAGS="$CPPFLAGS" ac_save_CPPFLAGS="$CPPFLAGS"
@ -424,7 +423,16 @@ else
AC_DEFINE(HAVE_FREETYPE_FTTRIGON_H, 1, AC_DEFINE(HAVE_FREETYPE_FTTRIGON_H, 1,
[Define if you have the <freetype/fttrigon.h> header file.])) [Define if you have the <freetype/fttrigon.h> header file.]))
CPPFLAGS="$ac_save_CPPFLAGS" CPPFLAGS="$ac_save_CPPFLAGS"
wine_cv_msg_freetype=no dnl Check that we have at least freetype/freetype.h
if test "$ac_cv_header_freetype_freetype_h" = "yes"
then
AC_DEFINE(HAVE_FREETYPE, 1, [Define if FreeType 2 is installed])
wine_cv_msg_freetype=no
else
FREETYPELIBS=""
FREETYPEINCL=""
wine_cv_msg_freetype=yes
fi
fi fi
fi fi
AC_SUBST(FREETYPELIBS) AC_SUBST(FREETYPELIBS)
@ -1426,7 +1434,8 @@ if test "$wine_cv_msg_freetype" = "yes"
then then
echo echo
echo "*** Note: Your system appears to have the FreeType 2 runtime libraries" echo "*** Note: Your system appears to have the FreeType 2 runtime libraries"
echo "*** installed, but 'freetype-config' is not in your PATH. Install the" echo "*** installed, but either 'freetype-config' is not in your PATH or"
echo "*** you do not have the FreeType include files. Install the"
echo "*** freetype-devel package (or its equivalent on your distribution) to" echo "*** freetype-devel package (or its equivalent on your distribution) to"
echo "*** enable Wine to use TrueType fonts." echo "*** enable Wine to use TrueType fonts."
fi fi

6
include/config.h.in
View File

@ -472,12 +472,12 @@
/* Define if we have CUPS */ /* Define if we have CUPS */
#undef HAVE_CUPS #undef HAVE_CUPS
/* Define if FreeType 2 is installed */
#undef HAVE_FREETYPE
/* Define if you have the <freetype/fttrigon.h> header file. */ /* Define if you have the <freetype/fttrigon.h> header file. */
#undef HAVE_FREETYPE_FTTRIGON_H #undef HAVE_FREETYPE_FTTRIGON_H
/* Define if FreeType 2 is installed */
#undef HAVE_FREETYPE
/* Define if we can use ppdev.h for parallel port access */ /* Define if we can use ppdev.h for parallel port access */
#undef HAVE_PPDEV #undef HAVE_PPDEV