Use gnulib-tool --import to import the gnulib code, rather than the odd way we were...