[tor-commits] [tor/master] Merge remote-tracking branch 'public/bug5210'

[nickm at torproject.org]

commit 62a77f1117335f2ddee86f696379dde106ad1ee0
Merge: 9dd4e5a 4717951
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Jun 13 11:37:11 2012 -0400

    Merge remote-tracking branch 'public/bug5210'

 acinclude.m4    |   42 ++++++++++++++++++++++++++++++++++++++++++
 changes/bug5210 |    2 ++
 configure.in    |   39 +++++++++++++++++++++++++++------------
 3 files changed, 71 insertions(+), 12 deletions(-)

diff --cc configure.in
index 656a324,051c924..18869a1
--- a/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(