Revert "remove man3x from from xorg-macros.m4"

This reverts commit eb3559ebc2822a2aca0f4916c80956aeaa4359ef.
- updated to 1.17.1
- make (man)x patch (b)conditional to choose between Xorg upstream and FHS 2.3 layout