* commit '0f0d1d05':
  configure: Always use -DOPJ_STATIC when checking for openjpeg

Conflicts:
	configure
Merged-by: Michael Niedermayer <michaelni@gmx.at>