commit d3c0b137aff9ae506778c74d885088cbdb535922 Author: cypherpunks <cypherpunks@torproject.org> Date: Thu Dec 15 21:17:04 2016 +0000 Remove dead code related to the old tor-fw-helper This commit removes more code related to the old tor-fw-helper which was removed in ticket 13338. Closes ticket 21024. --- .gitignore | 11 ----------- configure.ac | 3 --- doc/include.am | 12 +++--------- 3 files changed, 3 insertions(+), 23 deletions(-) diff --git a/.gitignore b/.gitignore index dc6738c..e7ef61f 100644 --- a/.gitignore +++ b/.gitignore @@ -94,11 +94,6 @@ uptime-*.json /doc/tor.html /doc/tor.html.in /doc/tor.1.xml -/doc/tor-fw-helper.1 -/doc/tor-fw-helper.1.in -/doc/tor-fw-helper.html -/doc/tor-fw-helper.html.in -/doc/tor-fw-helper.1.xml /doc/tor-gencert.1 /doc/tor-gencert.1.in /doc/tor-gencert.html @@ -214,12 +209,6 @@ uptime-*.json /src/trunnel/libor-trunnel-testing.a /src/trunnel/libor-trunnel.a -# /src/tools/tor-fw-helper/ -/src/tools/tor-fw-helper/tor-fw-helper -/src/tools/tor-fw-helper/tor-fw-helper.exe -/src/tools/tor-fw-helper/Makefile -/src/tools/tor-fw-helper/Makefile.in - # /src/win32/ /src/win32/Makefile /src/win32/Makefile.in diff --git a/configure.ac b/configure.ac index 721f5cd..1689cbe 100644 --- a/configure.ac +++ b/configure.ac @@ -208,9 +208,6 @@ AC_PATH_PROGS([A2X], [a2x a2x.py], none) AM_CONDITIONAL(USE_ASCIIDOC, test "x$asciidoc" = "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_PROG_CC_C99 diff --git a/doc/include.am b/doc/include.am index 7164a4b..0e8de23 100644 --- a/doc/include.am +++ b/doc/include.am @@ -12,17 +12,11 @@ # part of the source distribution, so that people without asciidoc can # just use the .1 and .html files. -base_mans = doc/tor doc/tor-gencert doc/tor-resolve doc/torify -all_mans = $(base_mans) -if USE_FW_HELPER -install_mans = $(all_mans) -else -install_mans = $(base_mans) -endif +all_mans = doc/tor doc/tor-gencert doc/tor-resolve doc/torify if USE_ASCIIDOC -nodist_man1_MANS = $(install_mans:=.1) -doc_DATA = $(install_mans:=.html) +nodist_man1_MANS = $(all_mans:=.1) +doc_DATA = $(all_mans:=.html) html_in = $(all_mans:=.html.in) man_in = $(all_mans:=.1.in) txt_in = $(all_mans:=.1.txt)