commit 850d8c9eb8a847d3d35d4e39acf2d84afe8dffa4 Author: Steven Murdoch Steven.Murdoch@cl.cam.ac.uk Date: Mon Aug 22 17:38:22 2011 +0100

Correct reference to libiphlpapi from libiphlapi --- configure.in | 6 +++--- src/tools/tor-fw-helper/Makefile.am | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/configure.in b/configure.in index f9e98f0..26792a6 100644 --- a/configure.in +++ b/configure.in @@ -325,7 +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_IPHLAPI=-liphlapi + 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 @@ -335,7 +335,7 @@ else fi AC_SUBST(TOR_LIB_WS32) AC_SUBST(TOR_LIB_GDI) -AC_SUBST(TOR_LIB_IPHLAPI) +AC_SUBST(TOR_LIB_IPHLPAPI)

dnl We need to do this before we try our disgusting hack below. AC_CHECK_HEADERS([sys/types.h]) @@ -561,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 $TOR_LIB_WS32 $TOR_LIB_IPHLAPI], + TOR_SEARCH_LIBRARY(libminiupnpc, $trylibminiupnpcdir, [-lminiupnpc $TOR_LIB_WS32 $TOR_LIB_IPHLPAPI], [#include <miniupnpc/miniwget.h> #include <miniupnpc/miniupnpc.h> #include <miniupnpc/upnpcommands.h>], diff --git a/src/tools/tor-fw-helper/Makefile.am b/src/tools/tor-fw-helper/Makefile.am index 127a000..8f64ad2 100644 --- a/src/tools/tor-fw-helper/Makefile.am +++ b/src/tools/tor-fw-helper/Makefile.am @@ -25,7 +25,7 @@ endif

if MINIUPNPC miniupnpc_ldflags = @TOR_LDFLAGS_libminiupnpc@ -miniupnpc_ldadd = -lminiupnpc -lm @TOR_LIB_IPHLAPI@ +miniupnpc_ldadd = -lminiupnpc -lm @TOR_LIB_IPHLPAPI@ miniupnpc_cppflags = @TOR_CPPFLAGS_libminiupnpc@ else miniupnpc_ldflags =