When processing %q or %Q, transform the format string to %[...]s
Remove liburi from DIST_SUBDIRS
Update m4 macros.