I've pushed a "uoa" branch which contains the patch with separate fixes for the
"buffer" compile problem, a compile problem when neither gSSO nor UOA were
enabled, and the configure version check. Alberto, can you double-check that
this still works?

I'm probably not going to include it in 1.3.99.6 because throroughly testing
that would delay 1.3.99.6 even further, but can merge shortly afterwards.