---------------------
PatchSet 3087 
Date: 2001/10/02 21:02:58
Author: akroonmaa
Branch: cpuProfiling
Tag: (none) 
Log:
bring to automake style

Members: 
	configure.in:1.19.10.6->1.19.10.7 
	lib/Makefile.am:1.2.16.1->1.2.16.2 
	src/Makefile.am:1.5.2.1->1.5.2.2 

Index: squid/configure.in
===================================================================
RCS file: /cvsroot/squid-sf//squid/configure.in,v
retrieving revision 1.19.10.6
retrieving revision 1.19.10.7
diff -u -r1.19.10.6 -r1.19.10.7
--- squid/configure.in	1 Oct 2001 11:00:05 -0000	1.19.10.6
+++ squid/configure.in	2 Oct 2001 21:02:58 -0000	1.19.10.7
@@ -3,7 +3,7 @@
 dnl
 dnl  Duane Wessels, wessels@nlanr.net, February 1996 (autoconf v2.9)
 dnl
-dnl  $Id: configure.in,v 1.19.10.6 2001/10/01 11:00:05 akroonmaa Exp $
+dnl  $Id: configure.in,v 1.19.10.7 2001/10/02 21:02:58 akroonmaa Exp $
 dnl
 dnl
 dnl
@@ -11,7 +11,7 @@
 AC_CONFIG_AUX_DIR(cfgaux)
 AM_INIT_AUTOMAKE(Squid, 2.5-DEVEL)
 AM_CONFIG_HEADER(include/autoconf.h)
-AC_REVISION($Revision: 1.19.10.6 $)dnl
+AC_REVISION($Revision: 1.19.10.7 $)dnl
 AC_PREFIX_DEFAULT(/usr/local/squid)
 
 dnl Set default LDFLAGS
@@ -940,6 +940,7 @@
   fi
 ])
 
+AM_CONDITIONAL(ENABLE_XPROF_STATS, false)
 dnl Enable USE_XPROF_STATS
 AC_ARG_ENABLE(cpu-profiling,
 [  --enable-cpu-profiling
@@ -956,6 +957,7 @@
 [ if test "$enableval" = "yes" ; then
     echo "Enabling cpu-profiling"
     AC_DEFINE(USE_XPROF_STATS, 1)
+    AM_CONDITIONAL(ENABLE_XPROF_STATS, true)
   fi
 ])
 
Index: squid/lib/Makefile.am
===================================================================
RCS file: /cvsroot/squid-sf//squid/lib/Makefile.am,v
retrieving revision 1.2.16.1
retrieving revision 1.2.16.2
diff -u -r1.2.16.1 -r1.2.16.2
--- squid/lib/Makefile.am	1 Oct 2001 11:00:05 -0000	1.2.16.1
+++ squid/lib/Makefile.am	2 Oct 2001 21:02:58 -0000	1.2.16.2
@@ -3,12 +3,18 @@
 #  $Id$
 #
 
+if ENABLE_XPROF_STATS
+XPROF_STATS_SOURCE = Profiler.c
+else
+XPROF_STATS_SOURCE = 
+endif
+
 EXTRA_LIBRARIES = libregex.a libdlmalloc.a
 noinst_LIBRARIES = libmiscutil.a @LIBREGEX@ @LIBDLMALLOC@ libntlmauth.a
 libmiscutil_a_SOURCES = rfc1123.c rfc1738.c rfc1035.c rfc2617.c util.c \
 	getfullhostname.c base64.c uudecode.c splay.c safe_inet_addr.c \
 	iso3307.c snprintf.c md5.c radix.c stub_memaccount.c Array.c \
-	Stack.c hash.c heap.c html_quote.c 
+	Stack.c hash.c heap.c html_quote.c $(XPROF_STATS_SOURCE)
 libmiscutil_a_LIBADD = @LIBOBJS@
 # $(top_srcdir)/include/version.h should be a dependency
 libregex_a_SOURCES = GNUregex.c
Index: squid/src/Makefile.am
===================================================================
RCS file: /cvsroot/squid-sf//squid/src/Makefile.am,v
retrieving revision 1.5.2.1
retrieving revision 1.5.2.2
diff -u -r1.5.2.1 -r1.5.2.2
--- squid/src/Makefile.am	1 Oct 2001 11:00:05 -0000	1.5.2.1
+++ squid/src/Makefile.am	2 Oct 2001 21:02:58 -0000	1.5.2.2
@@ -26,6 +26,12 @@
 DELAY_POOL_SOURCE = 
 endif
 
+if ENABLE_XPROF_STATS
+XPROF_STATS_SOURCE = ProfStats.c
+else
+XPROF_STATS_SOURCE = 
+endif
+
 if ENABLE_HTCP
 HTCPSOURCE = htcp.c
 endif
@@ -160,6 +166,7 @@
 	neighbors.c \
 	net_db.c \
 	Packer.c \
+	$(XPROF_STATS_SOURCE) \
 	pconn.c \
 	peer_digest.c \
 	peer_select.c \