* commit '604abd02':
  configure: Provide an option to override the environment

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