Nicolas Le Cam : configure.ac: Prefer pkg-config over freetype-config.
Alexandre Julliard
julliard at winehq.org
Mon Apr 9 13:09:15 CDT 2012
Module: wine
Branch: master
Commit: a37f74f5adec8cd3f924fc96e083a66219086091
URL: http://source.winehq.org/git/wine.git/?a=commit;h=a37f74f5adec8cd3f924fc96e083a66219086091
Author: Nicolas Le Cam <niko.lecam at gmail.com>
Date: Sat Apr 7 22:46:58 2012 +0200
configure.ac: Prefer pkg-config over freetype-config.
---
configure | 16 +++++++++++-----
configure.ac | 14 ++++++++++----
2 files changed, 21 insertions(+), 9 deletions(-)
diff --git a/configure b/configure
index 3e6e777..5b0dcba 100755
--- a/configure
+++ b/configure
@@ -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
diff --git a/configure.ac b/configure.ac
index 667d725..a57f133 100644
--- a/configure.ac
+++ b/configure.ac
@@ -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])
More information about the wine-cvs
mailing list