[cairo] build fails

[James Cloos]

Toaday’s master fails to build due to conflicts between
cairo-xlib-xcb-surface.c and cairo-xlib-surface.c.

An example is:

 .libs/cairo-xlib-xcb-surface.o: In function `cairo_xlib_surface_get_drawable':
 cairo-9999/src/cairo-xlib-xcb-surface.c:467: multiple definition of `cairo_xlib_surface_get_drawable'
 .libs/cairo-xlib-surface.o:cairo-9999/src/cairo-xlib-surface.c:3674: first defined here

The bug bisects to the commit:

commit 45665c0d48396af7bd653d546115a5f36cfa9ae1
Author: Andrea Canciani <ranma42 at gmail.com>
Date:   Tue Jun 14 10:44:54 2011 +0200

    Remove if's from Makefile.sources
    
    make on win32 complains that:
    
    make[1]: Entering directory `/home/ranma42/Code/fdo/cairo/src'
    ../src/Makefile.sources:220: *** missing separator.  Stop.
    
    Makefile.sources should not contain if's, which are aoutomake-only
    conditionals.  The correct way to conditionally include files is to
    enable/disable them using C preprocessor macros.


Reverting that one commit fixes the compilation.

-JimC
-- 
James Cloos <cloos at jhcloos.com>         OpenPGP: 1024D/ED7DAEA6