Update for Cogl API breaks

Conflicts:
	configure.ac