From: wessels <>
Date: Tue, 24 Apr 2007 06:40:25 +0000 (+0000)
Subject: Fix 'make check' for --disable-unlinkd
X-Git-Tag: SQUID_3_0_PRE6~51
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=a65d4fbb9623fc751025709cbaede03fdb44aeea;p=thirdparty%2Fsquid.git

Fix 'make check' for --disable-unlinkd

'make check' fails with --disable-unlinkd because the Makefiles refer
to unlinkd.cc, which should not be compiled when it is disabled.  Fixed
by changing references of unlinkd.cc to the $(UNLINKDSOURCE) macro.
---

diff --git a/src/Makefile.am b/src/Makefile.am
index c221b98460..2994349513 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.177 2007/04/13 17:26:37 rousskov Exp $
+#  $Id: Makefile.am,v 1.178 2007/04/24 00:40:25 wessels Exp $
 #
 #  Uncomment and customize the following to suit your needs:
 #
@@ -286,7 +286,7 @@ EXTRA_squid_SOURCES = \
 	LeakFinder.cc \
 	LeakFinder.h \
 	$(SNMP_ALL_SOURCE) \
-	unlinkd.cc \
+	$(UNLINKDSOURCE) \
 	$(SSL_ALL_SOURCE) \
 	$(WIN32_ALL_SOURCE) \
 	DiskIO/DiskThreads/aiops.cc \
@@ -692,7 +692,7 @@ ICAP_libicap_a_SOURCES = \
 	ICAP/TextException.h
 
 
-unlinkd_SOURCES = unlinkd.cc SquidNew.cc
+unlinkd_SOURCES = $(UNLINKDSOURCE) SquidNew.cc
 unlinkd_CXXFLAGS = -DUNLINK_DAEMON
 
 pinger_SOURCES = \
@@ -2146,7 +2146,7 @@ SWAP_TEST_SOURCES = \
 	store_io.cc \
 	store_swapout.cc \
 	store_swapmeta.cc \
-	unlinkd.cc \
+	$(UNLINKDSOURCE) \
 	$(WIN32_SOURCE) \
 	$(STORE_TEST_SOURCES) \
 	$(DISKIO_SOURCE)