Bug 506493 - Resync' configure.in between c-c and m-c; (Lv1) Copy bug 518506.
authorSerge Gautherie <sgautherie.bz@free.fr>
Mon, 05 Apr 2010 20:37:37 +0200
changeset 5377 2b335d50b7f58f7d1a2b14458b10d906924bc92f
parent 5376 6360778aa57dfb8eb753a92a8b4ab0aee434735f
child 5378 655ab6620778355d7833776ec103d8182c9decd6
push idunknown
push userunknown
push dateunknown
bugs506493, 518506
Bug 506493 - Resync' configure.in between c-c and m-c; (Lv1) Copy bug 518506. r=Callek. Bug 518506 - Horrible flicker when scrolling windowed plugins living out-of-process
configure.in
--- a/configure.in
+++ b/configure.in
@@ -6900,17 +6900,21 @@ if test "$MOZ_TREE_CAIRO"; then
     else
         MOZ_CAIRO_LIBS='$(DEPTH)/mozilla/gfx/cairo/cairo/src/$(LIB_PREFIX)mozcairo.$(LIB_SUFFIX) $(DEPTH)/mozilla/gfx/cairo/libpixman/src/$(LIB_PREFIX)mozlibpixman.$(LIB_SUFFIX)'" $CAIRO_FT_LIBS"
 
         if test "$MOZ_X11"; then
             MOZ_CAIRO_LIBS="$MOZ_CAIRO_LIBS $XLDFLAGS -lXrender -lfreetype -lfontconfig"
         fi
     fi
 else
+  if test "$MOZILLA_1_9_2_BRANCH" = "1"; then
    PKG_CHECK_MODULES(CAIRO, cairo >= $CAIRO_VERSION freetype2 fontconfig)
+  else
+   PKG_CHECK_MODULES(CAIRO, cairo >= $CAIRO_VERSION pixman-1 freetype2 fontconfig)
+  fi
    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"
    fi
 fi
 
 AC_SUBST(MOZ_CAIRO_LIBS)