Commit 2eca0165 authored by Steven Murdoch's avatar Steven Murdoch
Browse files

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

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.
parent c2d3da63

configure.in

+2 −2
Original line number Diff line number Diff line
@@ -559,7 +559,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_SEARCH_LIBRARY(libminiupnpc, $trylibminiupnpcdir, [-lminiupnpc -lws2_32 -liphlpapi],

        [#include <miniupnpc/miniwget.h>

         #include <miniupnpc/miniupnpc.h>

         #include <miniupnpc/upnpcommands.h>],
@@ -567,7 +567,7 @@ if test "$upnp" = "true"; then 
         const char * minissdpdsock, int sameport);],

        [upnpDiscover(1, 0, 0, 0); exit(0);],

        [--with-libminiupnpc-dir],

        [/usr/lib/])

        [/local/lib/])

fi



AC_SYS_LARGEFILE