nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-28 14:23:30 +01:00
Code Issues Packages Projects Releases Wiki Activity

XXX Hack to allow tor-fw-helper to be built on Windows

Browse Source 
For some reason, --with-libminiupnpc-dir doesn't work on Windows, so this
hardcodes /local/lib as the path in which libminiupnpc.a can be found.
Also, libminiupnpc needs libws2_32 and libiphlpapi under Windows, so this
hardcodes these libraries when building the ./configure test program.
These changes almost certainly break *nix, so should be fixed before merge.
This commit is contained in:
Steven Murdoch 2011-07-20 16:07:13 +01:00
parent c2d3da6303
commit 2eca016594
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
configure.in
View File

@ -559,7 +559,7 @@ dnl There are no packages for Debian or Redhat as of this patch
if test "$upnp" = "true"; then if test "$upnp" = "true"; then
AC_DEFINE(MINIUPNPC, 1, [Define to 1 if we are building with UPnP.]) AC_DEFINE(MINIUPNPC, 1, [Define to 1 if we are building with UPnP.])
TOR_SEARCH_LIBRARY(libminiupnpc, $trylibminiupnpcdir, [-lminiupnpc], TOR_SEARCH_LIBRARY(libminiupnpc, $trylibminiupnpcdir, [-lminiupnpc -lws2_32 -liphlpapi],
[#include <miniupnpc/miniwget.h> [#include <miniupnpc/miniwget.h>
#include <miniupnpc/miniupnpc.h> #include <miniupnpc/miniupnpc.h>
#include <miniupnpc/upnpcommands.h>], #include <miniupnpc/upnpcommands.h>],
@ -567,7 +567,7 @@ if test "$upnp" = "true"; then
const char * minissdpdsock, int sameport);], const char * minissdpdsock, int sameport);],
[upnpDiscover(1, 0, 0, 0); exit(0);], [upnpDiscover(1, 0, 0, 0); exit(0);],
[--with-libminiupnpc-dir], [--with-libminiupnpc-dir],
[/usr/lib/]) [/local/lib/])
fi fi
AC_SYS_LARGEFILE AC_SYS_LARGEFILE