Merge from gnulib, fixing some 'configure' typos (Bug#9696).