diff options
| author | Nick Mathewson <nickm@torproject.org> | 2011-11-30 17:51:01 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2011-11-30 17:51:01 -0500 |
| commit | 0530e80e5de325ba9d36a13c924950ccd49dbf72 (patch) | |
| tree | 20e3e592f17b6017e5de1f90cbc2be9bea11aa67 /configure.in | |
| parent | d04f21bf394eb9e1781a89d9827476e13cc11086 (diff) | |
| parent | a65212e371334c95292da1ca460d9d1d9a84d38e (diff) | |
| download | tor-0530e80e5de325ba9d36a13c924950ccd49dbf72.tar.gz tor-0530e80e5de325ba9d36a13c924950ccd49dbf72.zip | |
Merge remote-tracking branch 'sjmurdoch/bug1983-port-tor-fw-helper-to-windows'
Diffstat (limited to 'configure.in')
| -rw-r--r-- | configure.in | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/configure.in b/configure.in index b723f610f7..ef05d7bbfa 100644 --- a/configure.in +++ b/configure.in @@ -555,9 +555,12 @@ dnl There are no packages for Debian or Redhat as of this patch if test "$natpmp" = "true"; then AC_DEFINE(NAT_PMP, 1, [Define to 1 if we are building with nat-pmp.]) - TOR_SEARCH_LIBRARY(libnatpmp, $trylibnatpmpdir, [-lnatpmp], - [#include <natpmp.h>], + TOR_SEARCH_LIBRARY(libnatpmp, $trylibnatpmpdir, [-lnatpmp $TOR_LIB_WS32 $TOR_LIB_IPHLPAPI], [#include <natpmp.h>], + [#ifdef MS_WINDOWS + #define STATICLIB + #endif + #include <natpmp.h>], [ int r; natpmp_t natpmp; natpmpresp_t response; |