From: Alex Rousskov <rousskov@measurement-factory.com>
Date: Fri, 11 Apr 2008 23:46:30 +0000 (-0600)
Subject: Merge from trunk
X-Git-Tag: SQUID_3_1_0_1~49^2~302^2~2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=6df0cee85926d89335a73d9f5a737fbd51d1ee4b;p=thirdparty%2Fsquid.git

Merge from trunk
---

6df0cee85926d89335a73d9f5a737fbd51d1ee4b
diff --cc src/Makefile.am
index c92cbc3a1b,3c463b31a8..be95f6f47e
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@@ -1189,9 -1179,10 +1189,9 @@@ check_PROGRAMS+= testHeaders 
  
  ## Special Universal .h dependency test script
  ## aborts if error encountered
 -testHeaders: *.h DiskIO/*.h ICAP/*.h
 +testHeaders: *.h DiskIO/*.h
- 	../test-suite/testheaders.sh "$(CXXCOMPILE)" "." || exit 1
- 	../test-suite/testheaders.sh "$(CXXCOMPILE)" "DiskIO" || exit 1
+ 	$(SHELL) $(top_srcdir)/test-suite/testheaders.sh "$(CXXCOMPILE)" "." || exit 1
+ 	$(SHELL) $(top_srcdir)/test-suite/testheaders.sh "$(CXXCOMPILE)" "DiskIO" || exit 1
 -	$(SHELL) $(top_srcdir)/test-suite/testheaders.sh "$(CXXCOMPILE)" "ICAP" || exit 1
  ## src/repl/ has no .h files and its own makefile.