From: robertc <>
Date: Tue, 21 Dec 2004 01:14:31 +0000 (+0000)
Subject: append CPPUNIT include path to the src Make flags, to fix systems without cppunit
X-Git-Tag: SQUID_3_0_PRE4~973
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=327ec83adc5ddd8d0c336d9b71696991789bfb05;p=thirdparty%2Fsquid.git

append CPPUNIT include path to the src Make flags, to fix systems without cppunit
---

diff --git a/Makefile.in b/Makefile.in
index 7a03987a4a..bd2b0b306f 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -15,7 +15,7 @@
 @SET_MAKE@
 
 #
-# $Id: Makefile.in,v 1.63 2004/12/20 18:01:05 robertc Exp $
+# $Id: Makefile.in,v 1.64 2004/12/20 18:14:31 robertc Exp $
 #
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
diff --git a/configure b/configure
index 143a7f5b40..a492542768 100755
--- a/configure
+++ b/configure
@@ -1,5 +1,5 @@
 #! /bin/sh
-# From configure.in Revision: 1.365 .
+# From configure.in Revision: 1.366 .
 # Guess values for system-dependent variables and create Makefiles.
 # Generated by GNU Autoconf 2.59.
 #
@@ -2136,7 +2136,7 @@ INSTALL_STRIP_PROGRAM="\${SHELL} \$(install_sh) -c -s"
 
 AMTAR=${AMTAR-"${am_missing_run}tar"}
 
-am__tar='${AMTAR} chf - "$$tardir"'; am__untar='${AMTAR} xf -'
+am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'
 
 
 
diff --git a/src/Makefile.am b/src/Makefile.am
index d0056bee7b..118f51a831 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,7 +1,7 @@
 #
 #  Makefile for the Squid Object Cache server
 #
-#  $Id: Makefile.am,v 1.99 2004/12/20 18:01:06 robertc Exp $
+#  $Id: Makefile.am,v 1.100 2004/12/20 18:14:31 robertc Exp $
 #
 #  Uncomment and customize the following to suit your needs:
 #
@@ -171,6 +171,7 @@ EXTRA_LIBRARIES = libAIO.a libBlocking.a libDiskDaemon.a libDiskThreads.a
 noinst_LIBRARIES = @DISK_LIBS@
 
 INCLUDES        = -I. -I$(srcdir) -I$(top_builddir)/include -I$(top_srcdir)/include -I$(top_srcdir)/lib/libTrie/include
+INCLUDES	+= @SQUID_CPPUNIT_INC@
 
 EXTRA_PROGRAMS = \
 	DiskIO/DiskDaemon/diskd \
diff --git a/src/Makefile.in b/src/Makefile.in
index 4b2b4fa250..692e9e72c1 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -17,7 +17,7 @@
 #
 #  Makefile for the Squid Object Cache server
 #
-#  $Id: Makefile.in,v 1.330 2004/12/20 18:01:06 robertc Exp $
+#  $Id: Makefile.in,v 1.331 2004/12/20 18:14:31 robertc Exp $
 #
 #  Uncomment and customize the following to suit your needs:
 #
@@ -799,7 +799,9 @@ AM_CXXFLAGS = @SQUID_CXXFLAGS@
 SUBDIRS = fs repl auth
 EXTRA_LIBRARIES = libAIO.a libBlocking.a libDiskDaemon.a libDiskThreads.a
 noinst_LIBRARIES = @DISK_LIBS@
-INCLUDES = -I. -I$(srcdir) -I$(top_builddir)/include -I$(top_srcdir)/include -I$(top_srcdir)/lib/libTrie/include
+INCLUDES = -I. -I$(srcdir) -I$(top_builddir)/include \
+	-I$(top_srcdir)/include -I$(top_srcdir)/lib/libTrie/include \
+	@SQUID_CPPUNIT_INC@ $(am__empty)
 cf_gen_SOURCES = cf_gen.cc defines.h
 nodist_cf_gen_HEADER = cf_gen_defines.h
 squidclient_SOURCES = client.cc