Removed upstreamed patch. Remove other patch and replace with a simple configure variable. Add another configure variable to avoid linking to libatopology. Signed-off-by: Rosen Penev <rosenp@gmail.com>