diff options
| author | Owen Taylor <otaylor@redhat.com> | 2003-05-27 20:56:15 +0000 |
|---|---|---|
| committer | Owen Taylor <otaylor@src.gnome.org> | 2003-05-27 20:56:15 +0000 |
| commit | 93a41fbb72a6758f899e45f1740a1182a9edb705 (patch) | |
| tree | e6aa30262d36b2cfd91398c5e0700dd2c4ae82f1 /configure.in | |
| parent | cae7211594d3c2b8c0aacee1f067e53c0e9823ba (diff) | |
| download | pango-93a41fbb72a6758f899e45f1740a1182a9edb705.tar.gz | |
Clean up so that tests for Xft/FreeType are only run when we find
Tue May 27 16:51:32 2003 Owen Taylor <otaylor@redhat.com>
* configure.in: Clean up so that tests for Xft/FreeType
are only run when we find fontconfig. (#112027,
Tim Mooney)
* README: Rewrite the text about fontconfig dependencies
to be clearer and not to have stale links to
http://keithp.com/fonts/. (#112027, Tim Mooney)
Diffstat (limited to 'configure.in')
| -rw-r--r-- | configure.in | 66 |
1 files changed, 35 insertions, 31 deletions
diff --git a/configure.in b/configure.in index bc02436e..bf9e701e 100644 --- a/configure.in +++ b/configure.in @@ -187,47 +187,51 @@ fi AM_CONDITIONAL(HAVE_X, $have_x) # -# Checks for FreeType -# -FREETYPE_LIBS= -FREETYPE_CFLAGS= -have_freetype=false -AC_PATH_PROG(FREETYPE_CONFIG, freetype-config, no) -if test "x$FREETYPE_CONFIG" != "xno" ; then - FREETYPE_CFLAGS=`$FREETYPE_CONFIG --cflags` - FREETYPE_LIBS=`$FREETYPE_CONFIG --libs` - - pango_save_ldflags=$LDFLAGS - LDFLAGS="$LDFLAGS $FREETYPE_LIBS" - AC_CHECK_LIB(freetype, FT_Get_Next_Char, have_freetype=true, :) - LDFLAGS=$pango_save_ldflags -fi - -# # Check for fontconfig # have_fontconfig=false +have_freetype=false +have_xft=false PKG_CHECK_MODULES(FONTCONFIG, fontconfig >= 1.0.1, have_fontconfig=true, :) -FREETYPE_LIBS="$FONTCONFIG_LIBS $FREETYPE_LIBS" -FREETYPE_CFLAGS="$FONTCONFIG_CFLAGS $FREETYPE_CFLAGS" +if $have_fontconfig ; then + # + # Checks for FreeType + # + FREETYPE_LIBS= + FREETYPE_CFLAGS= + AC_PATH_PROG(FREETYPE_CONFIG, freetype-config, no) + if test "x$FREETYPE_CONFIG" != "xno" ; then + FREETYPE_CFLAGS=`$FREETYPE_CONFIG --cflags` + FREETYPE_LIBS=`$FREETYPE_CONFIG --libs` + + pango_save_ldflags=$LDFLAGS + LDFLAGS="$LDFLAGS $FREETYPE_LIBS" + AC_CHECK_LIB(freetype, FT_Get_Next_Char, have_freetype=true, :) + LDFLAGS=$pango_save_ldflags + fi + + FREETYPE_LIBS="$FONTCONFIG_LIBS $FREETYPE_LIBS" + FREETYPE_CFLAGS="$FONTCONFIG_CFLAGS $FREETYPE_CFLAGS" -AC_SUBST(FREETYPE_LIBS) -AC_SUBST(FREETYPE_CFLAGS) - -AM_CONDITIONAL(HAVE_FREETYPE, $have_freetype && $have_fontconfig) -# -# Checks for Xft/XRender -# -have_xft=false + AC_SUBST(FREETYPE_LIBS) + AC_SUBST(FREETYPE_CFLAGS) + + # + # Checks for Xft/XRender + # + if $have_x && $have_freetype ; then + PKG_CHECK_MODULES(XFT, xft >= 2.0.0, have_xft=true, :) + fi -if $have_x && $have_freetype ; then - PKG_CHECK_MODULES(XFT, xft >= 2.0.0, have_xft=true, :) + AC_SUBST(XFT_LIBS) + AC_SUBST(XFT_CFLAGS) +else + AC_MSG_WARN([No fontconfig found, skipping tests for FreeType and Xft]) fi -AC_SUBST(XFT_LIBS) -AC_SUBST(XFT_CFLAGS) +AM_CONDITIONAL(HAVE_FREETYPE, $have_freetype) AM_CONDITIONAL(HAVE_XFT, $have_xft) # |