Author: Amos Jeffries <squid3@treenet.co.nz>

Remove cppunit from the Squid distribution

Packaging of cppunit within the squid sources has caused more trouble
than was solved. Ease of install independently of squid combined with
the apparently widespread use of cppunit as a standard tool we feel
there is no need for it to be included.

Maintainers and source testers will need to have cppunit installed on
their systems or not use "make check".

diff --git a/bootstrap.sh b/bootstrap.sh
index cc350d162504a58eb1688c0404efd8226f179b12..ca20a20593019bdd128530ba0238c19fa72e02a2 100755 (executable)
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -66,8 +66,7 @@ echo "libtool  : $ltver"
 
 for dir in \
        "" \
-       lib/libTrie \
-       lib/cppunit-1.10.0
+       lib/libTrie
 do
     if [ -z "$dir" ] || [ -d $dir ]; then
        if (

diff --git a/configure.in b/configure.in
index 7169b597892b329395d4393dc91ccd3c450d894a..3fdb54b0ad5a30bf7525497a97c3920b9a9d0c01 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1,7 +1,7 @@
 
 dnl  Configuration input file for Squid
 dnl
-dnl  $Id: configure.in,v 1.450 2007/04/15 14:46:11 serassio Exp $
+dnl  $Id: configure.in,v 1.451 2007/04/16 14:12:06 hno Exp $
 dnl
 dnl
 dnl
@@ -11,7 +11,7 @@ AM_CONFIG_HEADER(include/autoconf.h)
 AC_CONFIG_AUX_DIR(cfgaux)
 AC_CONFIG_SRCDIR([src/main.cc])
 AM_INIT_AUTOMAKE([tar-ustar])
-AC_REVISION($Revision: 1.450 $)dnl
+AC_REVISION($Revision: 1.451 $)dnl
 AC_PREFIX_DEFAULT(/usr/local/squid)
 AM_MAINTAINER_MODE
 
@@ -1784,22 +1784,20 @@ AC_ARG_WITH(filedescriptors,
 AC_PATH_PROG(CPPUNITCONFIG, cppunit-config, false)
 if $CPPUNITCONFIG --help >/dev/null; then
   echo "using system installed cppunit"
-  SQUID_CPPUNIT_DIR=''
   SQUID_CPPUNIT_LIBS="`$CPPUNITCONFIG --libs`"
   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_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.
                          ],
 [ if test -f $withval/include/cppunit/TestCase.h; then
        echo "Using cppunit includes from $withval"
@@ -1816,12 +1814,10 @@ AC_ARG_WITH(cppunit-basedir,
        echo "ERROR: Cannot find cppunit at $withval"
        exit 1
     fi
-  SQUID_CPPUNIT_DIR=''
 ])
 AC_SUBST(SQUID_CPPUNIT_LIBS)
 AC_SUBST(SQUID_CPPUNIT_LA)
 AC_SUBST(SQUID_CPPUNIT_INC)
-AC_SUBST(SQUID_CPPUNIT_DIR)
 
 # Force some compilers to use ANSI features
 #
@@ -3304,7 +3300,4 @@ AC_CONFIG_FILES([\
        tools/Makefile
 ])
 
-AC_CONFIG_SUBDIRS(lib/libTrie)
-AC_CONFIG_SUBDIRS(lib/cppunit-1.10.0)
-
 AC_OUTPUT

diff --git a/lib/Makefile.am b/lib/Makefile.am
index 5dcadd970678df48ef2a9e9b02448b510b851ef1..7523ddf1322429a1b2cef1a0eec1e9767ab31bc0 100644 (file)
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -1,10 +1,10 @@
 ## Process this file with automake to produce Makefile.in
 #
-#  $Id: Makefile.am,v 1.23 2006/09/02 13:48:53 serassio Exp $
+#  $Id: Makefile.am,v 1.24 2007/04/16 14:12:06 hno Exp $
 #
 
-DIST_SUBDIRS = libTrie cppunit-1.10.0
-SUBDIRS= libTrie @SQUID_CPPUNIT_DIR@
+DIST_SUBDIRS = libTrie
+SUBDIRS= libTrie
 
 install: all
 install-strip: all