Re-arrange paths for -I and -L.

So that paths passed on the command line, or in ENV are preferred
to ones which we auto-add

Manual port of 74b688b39b
Work around autoconf and shell issues.

Which expect paths to NOT have spaces in them.  Which they do
on OSX.