sarah
/
tor
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge remote-tracking branch 'public/bug11296'

This commit is contained in:
Nick Mathewson 2014-03-26 11:46:51 -04:00
parent 6da2544f20 e83eddd113
commit 0b43c499b2
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
changes/bug11296 Normal file
View File

@ -0,0 +1,3 @@
o Minor bugfixes:
- Allow tor-fw-helper to build again by adding src/ext to its
CPPFLAGS. Fixes bug 11296; bugfix on 0.2.5.4-alpha.

2
src/tools/tor-fw-helper/include.am
View File

@ -33,4 +33,4 @@ endif
src_tools_tor_fw_helper_tor_fw_helper_LDFLAGS = $(nat_pmp_ldflags) $(miniupnpc_ldflags)
src_tools_tor_fw_helper_tor_fw_helper_LDADD = src/common/libor.a $(nat_pmp_ldadd) $(miniupnpc_ldadd) -lm @TOR_LIB_WS32@
src_tools_tor_fw_helper_tor_fw_helper_CPPFLAGS = $(nat_pmp_cppflags) $(miniupnpc_cppflags)
src_tools_tor_fw_helper_tor_fw_helper_CPPFLAGS = $(nat_pmp_cppflags) $(miniupnpc_cppflags) -I"$(top_srcdir)/src/ext"