Merge from gnulib: lib/gnulib.mk, m4/*.m4.