Upstream

Two changes to configure.in and upnp_stubs.c
See respective comments.