---------------------
PatchSet 1449 
Date: 2005/06/07 17:26:25
Author: nlewycky
Branch: prefetching
Tag: (none) 
Log:
Fix up makefile template for automake-1.6; avoids variable "redeclaration".

Members: 
	src/Makefile.am:1.57.2.4->1.57.2.5 

Index: squid3/src/Makefile.am
===================================================================
RCS file: /cvsroot/squid-sf//squid3/src/Makefile.am,v
retrieving revision 1.57.2.4
retrieving revision 1.57.2.5
diff -u -r1.57.2.4 -r1.57.2.5
--- squid3/src/Makefile.am	6 Mar 2005 23:44:51 -0000	1.57.2.4
+++ squid3/src/Makefile.am	7 Jun 2005 17:26:25 -0000	1.57.2.5
@@ -1,7 +1,7 @@
 #
 #  Makefile for the Squid Object Cache server
 #
-#  $Id: Makefile.am,v 1.57.2.4 2005/03/06 23:44:51 nlewycky Exp $
+#  $Id: Makefile.am,v 1.57.2.5 2005/06/07 17:26:25 nlewycky Exp $
 #
 #  Uncomment and customize the following to suit your needs:
 #
@@ -166,6 +166,12 @@
 ARP_ACL_SOURCE =
 endif
 
+if USE_HTMLPREFETCH
+HTMLPREFETCH_INC = -I/usr/include/libxml2
+else
+HTMLPREFETCH_INC =
+endif
+
 AM_CFLAGS = @SQUID_CFLAGS@
 AM_CXXFLAGS = @SQUID_CXXFLAGS@
 
@@ -174,10 +180,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 @SQUID_CPPUNIT_INC@
-if USE_HTMLPREFETCH
-INCLUDES	+= -I/usr/include/libxml2
-endif
+INCLUDES        = -I. -I$(srcdir) -I$(top_builddir)/include -I$(top_srcdir)/include -I$(top_srcdir)/lib/libTrie/include @SQUID_CPPUNIT_INC@ @HTMLPREFETCH_INC@
 
 EXTRA_PROGRAMS = \
 	DiskIO/DiskDaemon/diskd \