diff options
| author | Steven Murdoch <Steven.Murdoch@cl.cam.ac.uk> | 2011-08-22 17:53:17 +0100 |
|---|---|---|
| committer | Steven Murdoch <Steven.Murdoch@cl.cam.ac.uk> | 2011-08-22 17:53:17 +0100 |
| commit | 6443a756df2a94e70bc221830d49efb024e0a2ce (patch) | |
| tree | a01dd65d0080815af9eb7b04b05343b1438b6451 /configure.in | |
| parent | cc5b6d6cee607bbafbfd512986b2eea9c7c2c5ec (diff) | |
| parent | 850d8c9eb8a847d3d35d4e39acf2d84afe8dffa4 (diff) | |
| download | tor-6443a756df2a94e70bc221830d49efb024e0a2ce.tar.gz tor-6443a756df2a94e70bc221830d49efb024e0a2ce.zip | |
Merge branch 'bug1983-port-tor-fw-helper-to-windows' into bug2046
Conflicts:
configure.in
src/tools/tor-fw-helper/Makefile.am
src/tools/tor-fw-helper/tor-fw-helper-upnp.c
src/tools/tor-fw-helper/tor-fw-helper.c
Diffstat (limited to 'configure.in')
| -rw-r--r-- | configure.in | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/configure.in b/configure.in index 16d0930c02..e59f31b7a1 100644 --- a/configure.in +++ b/configure.in @@ -325,6 +325,7 @@ dnl Where do you live, libevent? And how do we call you? if test "$bwin32" = true; then TOR_LIB_WS32=-lws2_32 + TOR_LIB_IPHLPAPI=-liphlpapi # Some of the cargo-cults recommend -lwsock32 as well, but I don't # think it's actually necessary. TOR_LIB_GDI=-lgdi32 @@ -334,6 +335,7 @@ else fi AC_SUBST(TOR_LIB_WS32) AC_SUBST(TOR_LIB_GDI) +AC_SUBST(TOR_LIB_IPHLPAPI) dnl We need to do this before we try our disgusting hack below. AC_CHECK_HEADERS([sys/types.h]) @@ -559,7 +561,7 @@ dnl There are no packages for Debian or Redhat as of this patch if test "$upnp" = "true"; then AC_DEFINE(MINIUPNPC, 1, [Define to 1 if we are building with UPnP.]) - TOR_SEARCH_LIBRARY(libminiupnpc, $trylibminiupnpcdir, [-lminiupnpc -lws2_32 -liphlpapi], + TOR_SEARCH_LIBRARY(libminiupnpc, $trylibminiupnpcdir, [-lminiupnpc $TOR_LIB_WS32 $TOR_LIB_IPHLPAPI], [#include <miniupnpc/miniwget.h> #include <miniupnpc/miniupnpc.h> #include <miniupnpc/upnpcommands.h>], |