diff options
| author | woglinde <woglinde@ffa7fe5e-494d-0410-b361-a75ebd5db220> | 2011-02-06 00:36:20 +0000 |
|---|---|---|
| committer | woglinde <woglinde@ffa7fe5e-494d-0410-b361-a75ebd5db220> | 2011-02-06 00:36:20 +0000 |
| commit | 71e52d34facc76ae86f67a080b28efcfde5d30cd (patch) | |
| tree | 284c7d3ef8b504278ec685fbdb8dad558532b6fd /configure.in | |
| parent | 5d80dac725515ab688a4ae99586413e929a9d59a (diff) | |
| download | navit-71e52d34facc76ae86f67a080b28efcfde5d30cd.tar.gz | |
Fix:font/freetype:Fix the usage of libfribidi with new and oldapi, stolen from wesnoth
git-svn-id: http://svn.code.sf.net/p/navit/code/trunk/navit@4113 ffa7fe5e-494d-0410-b361-a75ebd5db220
Diffstat (limited to 'configure.in')
| -rw-r--r-- | configure.in | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/configure.in b/configure.in index 16a7d4c61..a9563e769 100644 --- a/configure.in +++ b/configure.in @@ -450,7 +450,7 @@ AC_SUBST(FREETYPE2_LIBS) AM_CONDITIONAL(FONT_FREETYPE, test "x${font_freetype}" = "xyes") AC_ARG_WITH(freetype-fonts, [ --with-freetype-fonts specify what fonts to use], AC_DEFINE_UNQUOTED(FREETYPE_FONTS,[${withval}],[Freetype fonts to use])) -AC_ARG_ENABLE(fontconfig, [ --disable-fontconfig don't add fontconfig support], fontconfig=$enableval;fontconfig_reason="configure parameter") +AC_ARG_ENABLE(fontconfig, [ --disable-fontconfig don't' add fontconfig support], fontconfig=$enableval;fontconfig_reason="configure parameter") if test "x${fontconfig}" = "xyes"; then PKG_CHECK_MODULES(FONTCONFIG, [fontconfig], [fontconfig=yes], [fontconfig=no]) fi @@ -465,11 +465,20 @@ AM_CONDITIONAL(FONTS, test "x${font_freetype}" = "xyes" -a "x$fontconfig" != "xy # fribidi AC_ARG_ENABLE(fribidi, [ --disable-fribidi dont build with fribidi], fribidi=$enableval;fribidi_reason="configure parameter", fribidi=yes) if test x"${fribidi}" = "xyes"; then - PKG_CHECK_MODULES(FRIBIDI, [fribidi], [fribidi=yes], [fribidi=no;fribidi_reason="FriBidi library not found"]) + PKG_CHECK_MODULES(FRIBIDI2, [fribidi >= 0.19.0], [fribidi=yes;oldfribidi=no], + [ PKG_CHECK_MODULES([FRIBIDI], [fribidi], + [fribidi=yes;oldfribidi=yes;fribid_reason="using old version"], [fribidi=no;fribidi_reason="FriBidi library not found"]) + ]) fi if test x"${fribidi}" = "xyes"; then AC_DEFINE(USE_FRIBIDI, 1, [Build with fribidi support]) fi +if test x"${oldfribidi}" = "xyes"; then + AC_DEFINE(FRIBIDIOLD, 1, [Build with fribidi support for older versions of fribidi]) +fi + +AC_SUBST(FRIBIDI2_CFLAGS) +AC_SUBST(FRIBIDI2_LIBS) AC_SUBST(FRIBIDI_CFLAGS) AC_SUBST(FRIBIDI_LIBS) |