Bugfixes for compiling Cairo from source

Looks like I've got some indentation fixes in here as well.  :P