diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2006-10-24 13:23:11 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2006-10-24 13:23:11 +0000 |
| commit | 8c03c08f4f63289f03502577853c4b15e7f2b374 (patch) | |
| tree | 25aafc1052b80cf188794a4049e738a2065aa6e5 /config_office | |
| parent | e55f45d20b0d70214d5530678dbf926ba597d2f9 (diff) | |
INTEGRATION: CWS fakebold2 (1.177.2); FILE MERGED
2006/09/19 15:20:08 hdu 1.177.2.1: #i65520# configure freetype emboldening
Diffstat (limited to 'config_office')
| -rw-r--r-- | config_office/configure.in | 25 |
1 files changed, 23 insertions, 2 deletions
diff --git a/config_office/configure.in b/config_office/configure.in index 60ada55cc632..736ea0b73f47 100644 --- a/config_office/configure.in +++ b/config_office/configure.in @@ -3,7 +3,7 @@ dnl * vi:set sw=3 ts=3 et: dnl * dnl * Name: configure.in dnl * Auth: Willem van Dorp, Ross Nicholson, Oisin Boydell - Sun Microsystems Ireland -dnl * Date: $Date: 2006-10-11 09:26:04 $ +dnl * Date: $Date: 2006-10-24 14:23:11 $ dnl * dnl * Desc: This file serves as input for the GNU autoconf package dnl * in order to create a configure script. @@ -12,7 +12,7 @@ dnl * necessary to build OpenOffice.org dnl * dnl * dnl ******************************************************************/ -AC_REVISION( $Revision: 1.182 $ ) +AC_REVISION( $Revision: 1.183 $ ) AC_PREREQ(2.50) AC_INIT() echo "$@" >config.parms @@ -2802,6 +2802,27 @@ AC_SUBST(LIBWPD_CFLAGS) AC_SUBST(LIBWPD_LIBS) dnl =================================================================== +dnl Check whether freetype2 supports emboldening +dnl =================================================================== +if test "$SYSTEM_FREETYPE" = "YES" ; then + save_CPPFLAGS="$CPPFLAGS" + save_LDFLAGS="$LDFLAGS" + save_LIBS="$LIBS" + CPPFLAGS="$CPPFLAGS $FREETYPE_CFLAGS" + LDFLAGS="$LDFLAGS $FREETYPE_LIBS" + AC_CHECK_LIB(freetype, FT_GlyphSlot_Embolden, + [USE_FT_EMBOLDEN="YES"], [USE_FT_EMBOLDEN="NO"], []) + LDFLAGS="$save_LDFLAGS" + CPPFLAGS="$save_CPPFLAGS" + LIBS="$save_LIBS" +else + # It was added in freetype-2.1.10 + USE_FT_EMBOLDEN="NO" + AC_MSG_WARN([Internal freetype2 does not support emboldening.]) +fi +AC_SUBST(USE_FT_EMBOLDEN) + +dnl =================================================================== dnl Check for system libxml dnl =================================================================== AC_MSG_CHECKING([which libxml to use]) |