gnustep/libs-back
0
0
Fork 0
mirror of https://github.com/gnustep/libs-back.git synced 2025-05-30 00:40:55 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Check/add fontconfig to cairo for win32

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/back/branches/gnustep_testplant_branch@35378 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Marcian Lytwyn 2012-08-08 23:04:52 +00:00
parent f7d566721c
commit e9391da130
2 changed files with 1992 additions and 5096 deletions
Download patch file Download diff file Expand all files Collapse all files

7076
configure vendored
View file

File diff suppressed because it is too large Load diff

12
configure.ac
View file

@ -423,6 +423,8 @@ PKG_CAIRO_WIN32=no
PKG_CHECK_MODULES(CAIRO_WIN32, cairo-win32, have_cairo_win32=yes, have_cairo_win32=no)
PKG_CAIRO_GLITZ=no
PKG_CHECK_MODULES(CAIRO_GLITZ, cairo-glitz, have_cairo_glitz=yes, have_cairo_glitz=no)
PKG_FONTCONFIG=no
PKG_CHECK_MODULES(FONTCONFIG, fontconfig, have_fontconfig=yes, have_fontconfig=no)
#--------------------------------------------------------------------
# XRender support
@ -535,11 +537,19 @@ if test x"$BUILD_GRAPHICS" = "xcairo"; then
BUILD_GRAPHICS=art
fi
AC_MSG_NOTICE([Switching to $BUILD_GRAPHICS])
elif test $BUILD_SERVER = win32 -a test "$have_fontconfig" = no ; then
AC_MSG_WARN([can't find fontconfig, required for graphics=cairo!])
BUILD_GRAPHICS=winlib
AC_MSG_NOTICE([Switching to $BUILD_GRAPHICS])
else
AC_MSG_CHECKING(Cairo backend)
CAIRO_LIBS="$CAIRO_FT_LIBS"
CAIRO_CFLAGS="$CAIRO_FT_CFLAGS"
if test $BUILD_SERVER = win32; then
CAIRO_LIBS="$CAIRO_LIBS $FONTCONFIG_LIBS"
CAIRO_CFLAGS="$CAIRO_CFLAGS $FONTCONFIG_CFLAGS"
fi
if test "$have_xrender" = yes; then
if test $BUILD_SERVER = x11 -a "x$have_cairo_xlib" = "xyes"; then
AC_DEFINE(XRENDER,1,[Define if you have X11 XRender extension])