diff options
| author | Nick Mathewson <nickm@torproject.org> | 2014-03-26 11:46:51 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2014-03-26 11:46:51 -0400 |
| commit | 0b43c499b20da76aca2d43f149b8291a8dfd90d5 (patch) | |
| tree | 7b7da8c9ae5995d8fba6587d95b5db308ca93f23 | |
| parent | 6da2544f207a541b90a5c5fddbd038800e19d903 (diff) | |
| parent | e83eddd113481eac5c717c95867f761190f229ea (diff) | |
| download | tor-0b43c499b20da76aca2d43f149b8291a8dfd90d5.tar.gz tor-0b43c499b20da76aca2d43f149b8291a8dfd90d5.zip | |
Merge remote-tracking branch 'public/bug11296'
| -rw-r--r-- | changes/bug11296 | 3 | ||||
| -rw-r--r-- | src/tools/tor-fw-helper/include.am | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/changes/bug11296 b/changes/bug11296 new file mode 100644 index 0000000000..a281e3969b --- /dev/null +++ b/changes/bug11296 @@ -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. diff --git a/src/tools/tor-fw-helper/include.am b/src/tools/tor-fw-helper/include.am index 275a0e237c..1f862e6f06 100644 --- a/src/tools/tor-fw-helper/include.am +++ b/src/tools/tor-fw-helper/include.am @@ -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" |