If you have freetype1 and freetype2 coexisting, freetype-config should

be freetype2-config.
This commit is contained in:
Marcus Meissner 2001-05-31 21:35:15 +00:00 committed by Alexandre Julliard
parent afdeba82ae
commit d28955d84e
2 changed files with 185 additions and 139 deletions

310
configure vendored

File diff suppressed because it is too large Load Diff

View File

@ -386,7 +386,15 @@ then
FREETYPEINCL=""
wine_cv_msg_freetype=no
else
AC_CHECK_PROG(ft_devel,freetype-config,yes,no)
AC_CHECK_PROG(ft_devel,freetype-config,freetype-config,no)
if test "$ft_devel" = "no"
then
AC_CHECK_PROG(ft_devel2,freetype2-config,freetype2-config,no)
if test "$ft_devel2" = "freetype2-config"
then
ft_devel=$ft_devel2
fi
fi
if test "$ft_devel" = "no"
then
FREETYPELIBS=""
@ -394,8 +402,8 @@ else
wine_cv_msg_freetype=yes
else
AC_DEFINE(HAVE_FREETYPE)
FREETYPELIBS=`freetype-config --libs`
FREETYPEINCL=`freetype-config --cflags`
FREETYPELIBS=`$ft_devel --libs`
FREETYPEINCL=`$ft_devel --cflags`
wine_cv_msg_freetype=no
fi
fi