Merge remote-tracking branch 'public/bug5210'

diff --cc acinclude.m4
Simple merge

diff --cc configure.in
index 656a3243fa7e0a3b00c457cb58a29ebace60a98d,051c924a9d961a4e6c96f495a4bac154cbe144a7..18869a115887b602300cd83cf673a9df457231dc
--- 1/configure.in
--- 2/configure.in
+++ b/configure.in
@@@ -595,36 -606,18 +609,37 @@@ dnl There are no packages for Debian o
  
  if test "$upnp" = "true"; then
      AC_DEFINE(MINIUPNPC, 1, [Define to 1 if we are building with UPnP.])
 -    TOR_SEARCH_LIBRARY(libminiupnpc, $trylibminiupnpcdir, [-lminiupnpc $TOR_LIB_WS32 $TOR_LIB_IPHLPAPI],
 -        [#include <miniupnpc/miniwget.h>
 -         #include <miniupnpc/miniupnpc.h>
 -         #include <miniupnpc/upnpcommands.h>],
 -        [void upnpDiscover(int delay, const char * multicastif,
 -         const char * minissdpdsock, int sameport);],
 -        [upnpDiscover(1, 0, 0, 0); exit(0);],
 -        [--with-libminiupnpc-dir],
 -        [/usr/lib/])
 +
 +    dnl Before we call TOR_SEARCH_LIBRARY we'll do a quick compile test
 +    dnl to see if we have miniupnpc-1.5 or -1.6
 +    AC_COMPILE_IFELSE([AC_LANG_PROGRAM([#include <miniupnpc/miniupnpc.h>],
 +        [upnpDiscover(1, 0, 0, 0);exit(0);])],[miniupnpc15="true"],[miniupnpc15="false"])
 +
 +    if test "$miniupnpc15" = "true" ; then
 +        AC_DEFINE([MINIUPNPC15],[1],[libminiupnpc version 1.5 found])
 +        TOR_SEARCH_LIBRARY(libminiupnpc, $trylibminiupnpcdir, [-lminiupnpc $TOR_LIB_WS32 $TOR_LIB_IPHLPAPI],
 +            [#include <miniupnpc/miniwget.h>
 +             #include <miniupnpc/miniupnpc.h>
 +             #include <miniupnpc/upnpcommands.h>],
 +            [void upnpDiscover(int delay, const char * multicastif,
 +             const char * minissdpdsock, int sameport);],
 +            [upnpDiscover(1, 0, 0, 0); exit(0);],
 +            [--with-libminiupnpc-dir],
 +            [/usr/lib/])
 +    else
 +        TOR_SEARCH_LIBRARY(libminiupnpc, $trylibminiupnpcdir, [-lminiupnpc $TOR_LIB_WS32 $TOR_LIB_IPHLPAPI],
 +            [#include <miniupnpc/miniwget.h>
 +             #include <miniupnpc/miniupnpc.h>
 +             #include <miniupnpc/upnpcommands.h>],
 +            [void upnpDiscover(int delay, const char * multicastif,
 +             const char * minissdpdsock, int sameport, int ipv6, int * error);],
 +            [upnpDiscover(1, 0, 0, 0, 0, 0); exit(0);],
 +            [--with-libminiupnpc-dir],
 +            [/usr/lib/])
 +    fi
  fi
  
+ dnl Make sure to enable support for large off_t if available.
  AC_SYS_LARGEFILE
  
  AC_CHECK_HEADERS(