Made configure.ac smarter for router
Merge branch 'testing'