Fix incorrect use of logical and
Add uri_equal()
Update m4 macros