diff options
| author | Jacob Appelbaum <jacob@appelbaum.net> | 2010-09-24 12:52:07 -0700 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2010-09-30 11:39:34 -0400 |
| commit | 3eaa9a376c756b0b8f836c4a78c3cf4012d6ffd7 (patch) | |
| tree | ebc4d8429ebe5354490f45cbd5cf3199bb1bd7c4 /configure.in | |
| parent | 9cc76cf0053cad90d2ff55d24993d9a0ac4c0cdb (diff) | |
| download | tor-3eaa9a376c756b0b8f836c4a78c3cf4012d6ffd7.tar.gz tor-3eaa9a376c756b0b8f836c4a78c3cf4012d6ffd7.zip | |
Changes to tor-fw-helper, some based on Nick's review
* MINIUPNPC rather than the generic UPNP
* Nick suggested a better abstraction model for tor-fw-helper
* Fix autoconf to build with either natpmp or miniupnpc
* Add AM_PROG_CC_C_O to fix automake complaint
* update spec to address nickm's concern
* refactor nat-pmp to match upnp state
* we prefer tor_snprintf to snprintf
* link properlty for tor_snprintf
* rename test_commandline_options to log_commandline_options
* cast this uint as an int
* detect possible FD_SETSIZE errors
* make note about future enhancements for natpmp
* add upnp enhancement note
* ChangeLog entry
* doxygen and check-spaces cleanup
* create tor-fw-helper.1.txt
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 ab3689db2d..18e312b7ae 100644 --- a/configure.in +++ b/configure.in @@ -153,7 +153,10 @@ AC_PATH_PROG([A2X], [a2x], none) AM_CONDITIONAL(USE_ASCIIDOC, test x$asciidoc = xtrue) -AM_CONDITIONAL(USE_FW_HELPER, test x$natpmp = xtrue || x$upnp = xtrue) +AM_CONDITIONAL(USE_FW_HELPER, test x$natpmp = xtrue || test x$upnp = xtrue) +AM_CONDITIONAL(NAT_PMP, test x$natpmp = xtrue) +AM_CONDITIONAL(MINIUPNPC, test x$upnp = xtrue) +AM_PROG_CC_C_O AC_PATH_PROG([SHA1SUM], [sha1sum], none) AC_PATH_PROG([OPENSSL], [openssl], none) @@ -486,7 +489,7 @@ dnl Where do you live, libminiupnpc? And how do we call you? dnl There are no packages for Debian or Redhat as of this patch if test "$upnp" = "true"; then - AC_DEFINE(UPNP, 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], [#include <miniupnpc/miniwget.h> #include <miniupnpc/miniupnpc.h> |