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

configure.ac: Prefer pkg-config over freetype-config.

This commit is contained in:
Nicolas Le Cam 2012-04-07 22:46:58 +02:00 committed by Alexandre Julliard
parent 1ca6ed7748
commit a37f74f5ad
2 changed files with 21 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
configure vendored
View File

@ -10262,7 +10262,12 @@ fi
if test "x$with_freetype" != "xno"
then
for ac_prog in freetype-config freetype2-config
if test "$PKG_CONFIG" != "false"
then
ac_freetype_incl="`$PKG_CONFIG --cflags freetype2 2>/dev/null`"
ac_freetype_libs="`$PKG_CONFIG --libs freetype2 2>/dev/null`"
else
for ac_prog in freetype-config freetype2-config
do
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
@ -10305,10 +10310,11 @@ fi
done
test -n "$ft_devel" || ft_devel="no"
if test "$ft_devel" != "no"
then
ac_freetype_incl=`$ft_devel --cflags`
ac_freetype_libs=`$ft_devel --libs`
if test "$ft_devel" != "no"
then
ac_freetype_incl=`$ft_devel --cflags`
ac_freetype_libs=`$ft_devel --libs`
fi
fi
ac_freetype_libs=${ac_freetype_libs:-"-lfreetype"}
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for -lfreetype" >&5

14
configure.ac
View File

@ -1384,11 +1384,17 @@ WINE_NOTICE_WITH(cms,[test "$ac_cv_lib_lcms_cmsOpenProfileFromFile" != "yes"],
dnl **** Check for FreeType 2 ****
if test "x$with_freetype" != "xno"
then
AC_CHECK_PROGS(ft_devel,[freetype-config freetype2-config],no)
if test "$ft_devel" != "no"
if test "$PKG_CONFIG" != "false"
then
ac_freetype_incl=`$ft_devel --cflags`
ac_freetype_libs=`$ft_devel --libs`
ac_freetype_incl="`$PKG_CONFIG --cflags freetype2 2>/dev/null`"
ac_freetype_libs="`$PKG_CONFIG --libs freetype2 2>/dev/null`"
else
AC_CHECK_PROGS(ft_devel,[freetype-config freetype2-config],no)
if test "$ft_devel" != "no"
then
ac_freetype_incl=`$ft_devel --cflags`
ac_freetype_libs=`$ft_devel --libs`
fi
fi
ac_freetype_libs=${ac_freetype_libs:-"-lfreetype"}
WINE_CHECK_SONAME(freetype,FT_Init_FreeType,[ft_lib=yes],[ft_lib=no],[$ac_freetype_libs])