Merge commit '76eb0950b8d82b1e9617b9c854f091e13bb23131'

* commit '76eb0950b8d82b1e9617b9c854f091e13bb23131':
  configure: Don't run "export $e" for an empty string

Conflicts:
	configure

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

configure

@@ -3078,8 +3078,7 @@ for opt do
     esac
 done
 
-[ "$env" != "" ] &&
-for e in "$env"; do
+for e in $env; do
     eval "export $e"
 done