Merge remote-tracking branch 'qatar/master'

* qatar/master:
  configure: Update freetype check to follow upstream

Conflicts:
	configure

Not merged, as its broken (Reported by ubitux)

See: cea5812fMerged-by: Michael Niedermayer <michaelni@gmx.at>