--------------------- PatchSet 6875 Date: 2008/02/19 11:36:45 Author: amosjeffries Branch: cleanup Tag: (none) Log: testheaders needs to use CXX not CC variables. - TODO: make this change in all users of testheaders.sh Members: include/List.h:1.7->1.7.38.1 lib/Makefile.am:1.26.4.1->1.26.4.2 test-suite/testheaders.sh:1.1.2.1->1.1.2.2 Index: squid3/include/List.h =================================================================== RCS file: /cvsroot/squid-sf//squid3/include/List.h,v retrieving revision 1.7 retrieving revision 1.7.38.1 diff -u -r1.7 -r1.7.38.1 --- squid3/include/List.h 21 Aug 2006 01:51:48 -0000 1.7 +++ squid3/include/List.h 19 Feb 2008 11:36:45 -0000 1.7.38.1 @@ -1,6 +1,5 @@ - /* - * $Id: List.h,v 1.7 2006/08/21 01:51:48 squidadm Exp $ + * $Id: List.h,v 1.7.38.1 2008/02/19 11:36:45 amosjeffries Exp $ * * * SQUID Web Proxy Cache http://www.squid-cache.org/ @@ -37,7 +36,6 @@ #include "cbdata.h" template - class List { @@ -58,7 +56,6 @@ }; template - class ListContainer { @@ -97,6 +94,7 @@ MemPool *List::Pool(NULL); #endif + template cbdata_type List::CBDATA_List = CBDATA_UNKNOWN; Index: squid3/lib/Makefile.am =================================================================== RCS file: /cvsroot/squid-sf//squid3/lib/Makefile.am,v retrieving revision 1.26.4.1 retrieving revision 1.26.4.2 diff -u -r1.26.4.1 -r1.26.4.2 --- squid3/lib/Makefile.am 19 Feb 2008 03:53:06 -0000 1.26.4.1 +++ squid3/lib/Makefile.am 19 Feb 2008 11:36:46 -0000 1.26.4.2 @@ -1,6 +1,6 @@ ## Process this file with automake to produce Makefile.in # -# $Id: Makefile.am,v 1.26.4.1 2008/02/19 03:53:06 amosjeffries Exp $ +# $Id: Makefile.am,v 1.26.4.2 2008/02/19 11:36:46 amosjeffries Exp $ # DIST_SUBDIRS = libTrie @@ -101,7 +101,7 @@ ## Special Universal .h dependency test script ## aborts if error encountered testHeaders: - cd ../include && ../test-suite/testheaders.sh "$(CC)" "$(LDFLAGS)" "$(INCLUDES)" || exit 1 + cd ../include && ../test-suite/testheaders.sh "$(CXX)" "$(CXXFLAGS)" "$(INCLUDES)" || exit 1 tests_testAll_SOURCES= \ tests/testArray.h \ Index: squid3/test-suite/testheaders.sh =================================================================== RCS file: /cvsroot/squid-sf//squid3/test-suite/Attic/testheaders.sh,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 diff -u -r1.1.2.1 -r1.1.2.2 --- squid3/test-suite/testheaders.sh 19 Feb 2008 03:53:07 -0000 1.1.2.1 +++ squid3/test-suite/testheaders.sh 19 Feb 2008 11:36:46 -0000 1.1.2.2 @@ -20,7 +20,8 @@ ) >./testHeaderDeps_${f/.h/}.cc # run compile test on the new file. - echo "TRY: ${cc} -o testHeaderDeps.o ${flags} ./testHeaderDeps_${f/.h/}.cc ${libs}" + # DEBUG: +echo "TRY: ${cc} -o testHeaderDeps.o ${flags} ./testHeaderDeps_${f/.h/}.cc ${libs}" ${cc} -o testHeaderDeps.o ${flags} ./testHeaderDeps_${f/.h/}.cc ${libs} || exit 1 done