From 68fecb7ab6c24c13a2693464e62228601d0af10b Mon Sep 17 00:00:00 2001
From: Nick Mathewson <nickm@torproject.org>
Date: Wed, 7 May 2008 20:29:11 +0000
Subject: [PATCH]  r19633@catbus:  nickm | 2008-05-07 16:10:00 -0400  Fix bug
 1958901: stop overriding CPPFLAGS in test directory.

svn:r783
---
 ChangeLog        | 3 ++-
 test/Makefile.am | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index c2f3ebc6..2314a58b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -90,8 +90,9 @@ Changes in current version:
  o support for periodic timeouts
  o support for virtual HTTP hosts.
  o turn event_initialized() into a function, and add function equivalents to EVENT_SIGNAL and EVENT_FD so that people don't need to include event_struct.h
+ o Build test directory correctly with CPPFLAGS set.
+
 
-	
 Changes in 1.4.0:
  o allow \r or \n individually to separate HTTP headers instead of the standard "\r\n"; from Charles Kerr.
  o demote most http warnings to debug messages
diff --git a/test/Makefile.am b/test/Makefile.am
index 6ba6c461..339db91b 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -1,6 +1,6 @@
 AUTOMAKE_OPTIONS = foreign no-dependencies
 
-CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/compat -I$(top_srcdir)/include 
+AM_CFLAGS = -I$(top_srcdir) -I$(top_srcdir)/compat -I$(top_srcdir)/include 
 
 EXTRA_DIST = regress.rpc regress.gen.h regress.gen.c