瀏覽代碼

Merge remote-tracking branch 'public/bug11296'

Nick Mathewson 10 年之前
父節點
當前提交
0b43c499b2
共有 2 個文件被更改,包括 4 次插入1 次删除
  1. 3 0
      changes/bug11296
  2. 1 1
      src/tools/tor-fw-helper/include.am

+ 3 - 0
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.

+ 1 - 1
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"