diff options
| author | Diego 'Flameeyes' Pettenò <flameeyes@gmail.com> | 2006-10-13 20:49:39 +0000 |
|---|---|---|
| committer | Diego 'Flameeyes' Pettenò <flameeyes@gmail.com> | 2006-10-13 20:49:39 +0000 |
| commit | 8991c7bd07871fabd1e984390577f285b0e02e6d (patch) | |
| tree | 577065e7dbe09759e10c39bdaf57bf9c19109659 | |
| parent | faf6084aad5babda7dddda4f086834a17cd4e8b9 (diff) | |
| download | xine-lib-8991c7bd07871fabd1e984390577f285b0e02e6d.tar.gz xine-lib-8991c7bd07871fabd1e984390577f285b0e02e6d.tar.bz2 | |
Make freetype2 and fontconfig disabled by default, as per requests on mailing lists.
I wasn't able to get the visual appearence improved, but it's (for me) acceptable right now.
This is *not* a change compared to latest release, as before fontconfig was used as a fallback if the bitmap fonts of xine-lib weren't found (which was unlikely to be the case), resulting to pointless use of freetype2 before.
CVS patchset: 8338
CVS date: 2006/10/13 20:49:39
| -rw-r--r-- | configure.ac | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/configure.ac b/configure.ac index 1039dab28..596d0641d 100644 --- a/configure.ac +++ b/configure.ac @@ -1282,11 +1282,11 @@ dnl --------------------------------------------- dnl freetype2 lib. dnl --------------------------------------------- AC_ARG_WITH([freetype], - AS_HELP_STRING([--without-freetype], [Do not build with FreeType2 library])) + AS_HELP_STRING([--with-freetype], [Build with FreeType2 library])) -if test "x$with_freetype" != "xno"; then +if test "x$with_freetype" != "xyes"; then PKG_CHECK_MODULES([FT2], [freetype2], [have_freetype=yes], [have_freetype=no]) - if test "x$with_freetype" = "xyes" && test "x$have_freetype" = "xno"; then + if test "x$have_freetype" = "xno"; then AC_MSG_ERROR([FreeType2 support requested but FreeType2 library not found]) elif test "x$have_freetype" = "xyes"; then AC_DEFINE([HAVE_FT2], [1], [Define this if you have freetype2 library]) @@ -1299,13 +1299,15 @@ dnl --------------------------------------------- dnl fontconfig dnl --------------------------------------------- AC_ARG_WITH([fontconfig], - AS_HELP_STRING([--without-fontconfig], [Do not build with fontconfig library])) + AS_HELP_STRING([--with-fontconfig], [Build with fontconfig library])) + +if test "x$with_fontconfig" = "xyes"; then + if test "x$have_freetype" != "xyes"; then + AC_MSG_ERROR([fontconfig support requested, but FreeType2 not enabled.]) + fi -if test "x$with_fontconfig" = "xyes" && test "x$have_fontconfig" = "xno"; then - AC_MSG_ERROR([fontconfig support requested, but FreeType2 not found.]) -elif test "x$with_fontconfig" != "xno" && test "x$have_fontconfig" != "xno"; then PKG_CHECK_MODULES([FONTCONFIG], [fontconfig], [have_fontconfig=yes], [have_fontconfig=no]) - if test "x$with_fontconfig" = "xyes" && test "x$have_fontconfig" = "xno"; then + if test "x$have_fontconfig" = "xno"; then AC_MSG_ERROR([fontconfig support requested but fontconfig library not found]) elif test "x$have_fontconfig" = "xyes"; then AC_DEFINE([HAVE_FONTCONFIG], [1], [Define this if you have fontconfig library]) |