The "automake" branch is quiet ready and could be pulled up to
a0523a2408f9095f0dac9fe6b204912829f3917e (Use AS_IF instead of plain if/then/fi)
since those are basic fixes/updates to the current build system.
Only the two last commits then introduce automake. I can also send them as
single patches if preferred.
The "gnulib" branch is currently just one big commit which needs to be split
before being ready. Besides, this one needs some testing on exotic platforms
since it changes/updates a lot of compat code.
The "win32" is currently basically a collection of "#ifdef WIN32".