Remove liburi as an included dependency
Update m4 macros