* commit 'ef5d41a5':
  x86inc: Rename "program_name" to "private_prefix"
  configure: Run SHFLAGS through ldflags_filter()

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