---------------------
PatchSet 4245 
Date: 2007/04/13 10:54:57
Author: amosjeffries
Branch: nocpp
Tag: (none) 
Log:
re-configured

Members: 
	configure.in:1.129->1.129.2.1 

Index: squid3/configure.in
===================================================================
RCS file: /cvsroot/squid-sf//squid3/configure.in,v
retrieving revision 1.129
retrieving revision 1.129.2.1
diff -u -r1.129 -r1.129.2.1
--- squid3/configure.in	13 Apr 2007 00:17:35 -0000	1.129
+++ squid3/configure.in	13 Apr 2007 10:54:57 -0000	1.129.2.1
@@ -1,7 +1,7 @@
 
 dnl  Configuration input file for Squid
 dnl
-dnl  $Id: configure.in,v 1.129 2007/04/13 00:17:35 squidadm Exp $
+dnl  $Id: configure.in,v 1.129.2.1 2007/04/13 10:54:57 amosjeffries Exp $
 dnl
 dnl
 dnl
@@ -11,7 +11,7 @@
 AC_CONFIG_AUX_DIR(cfgaux)
 AC_CONFIG_SRCDIR([src/main.cc])
 AM_INIT_AUTOMAKE([tar-ustar])
-AC_REVISION($Revision: 1.129 $)dnl
+AC_REVISION($Revision: 1.129.2.1 $)dnl
 AC_PREFIX_DEFAULT(/usr/local/squid)
 AM_MAINTAINER_MODE
 
@@ -1774,17 +1774,17 @@
   SQUID_CPPUNIT_LA=''
   SQUID_CPPUNIT_INC="`$CPPUNITCONFIG --cflags`"
 else
-  SQUID_CPPUNIT_DIR='cppunit-1.10.0'
-  SQUID_CPPUNIT_LA='$(top_builddir)/lib/cppunit-1.10.0/src/cppunit/libcppunit.la' 
-  SQUID_CPPUNIT_LIBS='$(SQUID_CPPUNIT_LA)'
-  SQUID_CPPUNIT_INC='-I$(top_builddir)/lib/cppunit-1.10.0/include -I $(top_srcdir)/lib/cppunit-1.10.0/include'
+  echo "cppunit does not apear to be installed. squid does not require this, but code testing with 'make check' will fail."
+  SQUID_CPPUNIT_DIR=''
+  SQUID_CPPUNIT_LA='' 
+  SQUID_CPPUNIT_LIBS=''
+  SQUID_CPPUNIT_INC=''
 fi
 
 AC_ARG_WITH(cppunit-basedir,
 [  --with-cppunit-basedir=/path/to/cppunit-base
                           Path where the cppunit headers are libraries are found
-			  for unit testing. (defaults to use internal copies -
-			  version 1.10.0)
+			  for unit testing. ('make check' will fail without it)
 			  ],
 [ if test -f $withval/include/cppunit/TestCase.h; then
 	echo "Using cppunit includes from $withval"
@@ -3266,6 +3266,5 @@
 ])
 
 AC_CONFIG_SUBDIRS(lib/libTrie)
-AC_CONFIG_SUBDIRS(lib/cppunit-1.10.0)
 
 AC_OUTPUT