Removed USE_UPNP assignments from makefiles. Instead, the configure script inserts it at the beginning.