Merge remote-tracking branch 'qatar/master'

* qatar/master:
  configure: Check for GCC diagnostic pragma support inside of functions

This commit was cherry picked previously already to prevent compilation failure on a previous merge
See: 038c4f65Merged-by: Michael Niedermayer <michaelni@gmx.at>