[tor-commits] [tor/master] XXX Hack to allow tor-fw-helper to be built on Windows

[nickm@xxxxxxxxxxxxxx]

commit 2eca0165945f4caddf0585f3f9a33e422f1deeb1
Author: Steven Murdoch <Steven.Murdoch@xxxxxxxxxxxx>
Date:   Wed Jul 20 16:07:13 2011 +0100

    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.
---
 configure.in |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/configure.in b/configure.in
index 0a01862..f111355 100644
--- a/configure.in
+++ b/configure.in
@@ -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



_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits