diff options
Diffstat (limited to 'configure.in')
| -rw-r--r-- | configure.in | 41 |
1 files changed, 15 insertions, 26 deletions
diff --git a/configure.in b/configure.in index afc8a1f8..10ce63fe 100644 --- a/configure.in +++ b/configure.in @@ -78,8 +78,6 @@ AC_LANG_RESTORE AC_LIBTOOL_WIN32_DLL AM_DISABLE_STATIC AM_PROG_LIBTOOL -AM_PROG_LEX -AC_PROG_YACC AC_MSG_CHECKING([for some Win32 platform]) case "$host" in @@ -195,33 +193,26 @@ AC_CHECK_FUNCS(FT_Get_First_Char) LIBS=$pango_save_libs # +# Check for fontconfig +# +have_fontconfig=false + +PKG_CHECK_MODULES(FONTCONFIG, fontconfig >= 1.0.1, have_fontconfig=true) + +AC_SUBST(FONTCONFIG_LIBS) +AC_SUBST(FONTCONFIG_CFLAGS) +AM_CONDITIONAL(HAVE_FONTCONFIG, $have_fontconfig) + +# # Checks for Xft/XRender # have_xft=false -XFT_LIBS="" -XFT_CFLAGS="" -if test $have_x = true ; then - if test $have_freetype = true ; then - pango_save_cppflags="$CPPFLAGS" - CPPFLAGS="$CPPFLAGS $FREETYPE_CFLAGS" - - AC_CHECK_LIB(Xrender, XRenderFindFormat, - [AC_CHECK_LIB(Xft, XftFontOpen, - [AC_CHECK_HEADER(X11/Xft/XftFreetype.h, - have_xft=true,:)], - :,-lXrender -lXext $X_LIBS $FREETYPE_LIBS)] - ,:,-lXext $X_LIBS) - CPPFLAGS="$pango_save_cppflags" - - if $have_xft ; then - XFT_LIBS="-lXft -lXrender -lXext $X_LIBS $FREETYPE_LIBS $X_EXTRA_LIBS" - fi - fi -fi +PKG_CHECK_MODULES(XFT, xft >= 2.0.0, have_xft=true) AC_SUBST(XFT_LIBS) -AM_CONDITIONAL(HAVE_XFT, $have_xft) +AC_SUBST(XFT_CFLAGS) +AM_CONDITIONAL(HAVE_XFT, $have_xft) # # Checks for Win32 GDI @@ -345,7 +336,7 @@ basic_modules="basic-ft2,basic-win32,basic-x,basic-xft" hangul_modules="hangul-x" hebrew_modules="hebrew-ft2,hebrew-x,hebrew-xft" indic_modules="bengali-x,devanagari-x,gurmukhi-x,gujarati-x,myanmar-x,indic-xft" -tamil_modules="tamil-x,tamil-xft" +tamil_modules="tamil-x" thai_modules="thai-x" all_modules="$arabic_modules,$basic_modules,$hangul_modules,$hebrew_modules,$indic_modules,$tamil_modules,$thai_modules" @@ -417,7 +408,6 @@ AM_CONDITIONAL(INCLUDE_GURMUKHI_X,echo $included_modules | grep '\(^\|,\)gurmukh AM_CONDITIONAL(INCLUDE_MYANMAR_X,echo $included_modules | grep '\(^\|,\)myanmar-x\($\|,\)' > /dev/null) AM_CONDITIONAL(INCLUDE_TAMIL_X,echo $included_modules | grep '\(^\|,\)tamil-x\($\|,\)' > /dev/null) -AM_CONDITIONAL(INCLUDE_TAMIL_XFT,echo $included_modules | grep '\(^\|,\)tamil-xft\($\|,\)' > /dev/null) AM_CONDITIONAL(INCLUDE_THAI_X,echo $included_modules | grep '\(^\|,\)thai-x\($\|,\)' > /dev/null) @@ -745,7 +735,6 @@ AC_OUTPUT([ Makefile pango/Makefile pango/mini-fribidi/Makefile -pango/mini-xft/Makefile pango/opentype/Makefile pango/makefile.mingw pango/pango.rc |