Bug 344818 - "Linking - missing library deps" (check cairo-xlib-xrender for system cairo) [p=fta+bugzilla@sofaraway.org (Fabien Tassin) r=vlad a=blocking1.9+]
authorreed@reedloden.com
Wed, 06 Feb 2008 13:17:39 -0800
changeset 11270 f63ae96302c0125ff6180256f4808f767766a88d
parent 11269 df1fdeb18340bd5f193b3190e3cd826252478812
child 11271 9c7742801a0e56b425e040496e5a1bb2b3879caf
push idunknown
push userunknown
push dateunknown
reviewersvlad, blocking1.9
bugs344818
milestone1.9b4pre
Bug 344818 - "Linking - missing library deps" (check cairo-xlib-xrender for system cairo) [p=fta+bugzilla@sofaraway.org (Fabien Tassin) r=vlad a=blocking1.9+]
configure.in
--- a/configure.in
+++ b/configure.in
@@ -7077,16 +7077,21 @@ if test "$MOZ_TREE_CAIRO"; then
                 MOZ_CAIRO_LIBS="$MOZ_CAIRO_LIBS "'-L$(DEPTH)/gfx/cairo/glitz/src/wgl -lmozglitzwgl'
             fi
         fi
     fi
 else
    PKG_CHECK_MODULES(CAIRO, cairo >= $CAIRO_VERSION freetype2 fontconfig)
    MOZ_CAIRO_CFLAGS=$CAIRO_CFLAGS
    MOZ_CAIRO_LIBS=$CAIRO_LIBS
+   if test "$MOZ_X11"; then
+        PKG_CHECK_MODULES(CAIRO_XRENDER, cairo-xlib-xrender >= $CAIRO_VERSION)
+        MOZ_CAIRO_LIBS="$MOZ_CAIRO_LIBS $XLDFLAGS $CAIRO_XRENDER_LIBS"
+        MOZ_CAIRO_CFLAGS="$MOZ_CAIRO_CFLAGS $CAIRO_XRENDER_CFLAGS"
+   fi
 fi
 
 AC_SUBST(MOZ_TREE_CAIRO)
 AC_SUBST(MOZ_CAIRO_CFLAGS)
 AC_SUBST(MOZ_CAIRO_LIBS)
 
 dnl ========================================================
 dnl Check for lcms