[tor-commits] [tor/master] Add missing -Isrc/ext to tor-fw-helper/include.am

[nickm at torproject.org]

commit e83eddd113481eac5c717c95867f761190f229ea
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Mar 25 10:21:07 2014 -0400

    Add missing -Isrc/ext to tor-fw-helper/include.am
    
    We need this now that tor-fw-helper will pull in siphash.h
    
    Fixes bug 11296; bugfix on 0.2.5.4-alpha where siphash.h was introduced.
---
 changes/bug11296                   |    3 +++
 src/tools/tor-fw-helper/include.am |    2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/changes/bug11296 b/changes/bug11296
new file mode 100644
index 0000000..a281e39
--- /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 275a0e2..1f862e6 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"