Correct checking for XRender. Patch by Yen-Ju Chen <yjchenx@gmail.com>.

git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/back/trunk@25450 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Fred Kiefer 2007-09-04 22:40:43 +00:00
parent bc449e6b65
commit 6652a87b27
4 changed files with 1445 additions and 498 deletions

View file

@ -1,3 +1,10 @@
2007-09-05 Fred Kiefer <FredKiefer@gmx.de>
* configure.ac,
* configure: Move checking for Xrender extension.
* Source/cairo/XGCairoXImageSurface.m: Add includefor config.h.
Patch by Yen-Ju Chen <yjchenx@gmail.com>.
2007-09-04 Fred Kiefer <FredKiefer@gmx.de>
* Source\winlib\WIN32FontInfo.m (-coveredCharacterSet): Create the

View file

@ -20,6 +20,7 @@
Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
#include "config.h"
#include "x11/XGServer.h"
#include "x11/XGServerWindow.h"
#include "x11/XWindowBuffer.h"

1921
configure vendored

File diff suppressed because it is too large Load diff

View file

@ -377,13 +377,6 @@ PKG_CHECK_MODULES(CAIRO_GLITZ, cairo-glitz, have_cairo_glitz=yes, have_cairo_gli
have_xrender=no
AC_CHECK_LIB(Xrender, XRenderFindVisualFormat, have_xrender=yes)
if test "$have_xrender" = yes; then
# we'll use it only if we want cairo
if test x"$BUILD_GRAPHICS" = "xcairo"; then
AC_DEFINE(XRENDER,1,[Define if you have X11 XRender extension])
LIBS="$LIBS -lXrender"
fi
fi
#--------------------------------------------------------------------
# Glitz libraries
@ -505,6 +498,13 @@ elif test x"$BUILD_GRAPHICS" = "xcairo"; then
AC_MSG_CHECKING(Cairo backend)
CAIRO_LIBS="$CAIRO_FT_LIBS"
CAIRO_CFLAGS="$CAIRO_FT_CFLAGS"
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])
CAIRO_LIBS="$CAIRO_LIBS -lXrender"
fi
fi
if test "x$WITH_GLITZ" = "xyes" -a "x$have_cairo_glitz" = "xyes"; then
if test $BUILD_SERVER = win32 -a "x$have_cairo_win32" = "xyes"; then
CAIRO_GLITZ_LIBS="$CAIRO_GLITZ_LIBS $GLITZ_WGL_LIBS"