Make the location of the diskd program a configurable parameter.

(YAY!).

This is configurable through the "diskd_program" entry in the squid
config file. It defaults to $(libexecdir). This means that
./configure --prefix="" --with-libexec-dir="" should now work properly.

diff --git a/src/Makefile.in b/src/Makefile.in
index c4fb1f62abf48ba8b7ef7f5ad544bc6ff2f56511..ac0f50a2fcebd364c810090dfa9979de62431a1f 100644 (file)
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -1,7 +1,7 @@
 #
 #  Makefile for the Squid Object Cache server
 #
-#  $Id: Makefile.in,v 1.199 2001/02/10 14:39:33 hno Exp $
+#  $Id: Makefile.in,v 1.200 2001/04/03 20:22:10 adrian Exp $
 #
 #  Uncomment and customize the following to suit your needs:
 #
@@ -31,6 +31,7 @@ UNLINKD_EXE   = @OPT_UNLINKD_EXE@
 OPT_PINGER_EXE = pinger$(exec_suffix)
 PINGER_EXE     = @OPT_PINGER_EXE@
 CACHEMGR_EXE   = cachemgr$(cgi_suffix)
+DISKD_EXE      = diskd$(exec_suffix)
 
 DEFAULT_PREFIX         = $(prefix)
 DEFAULT_CONFIG_FILE     = $(sysconfdir)/squid.conf
@@ -43,6 +44,7 @@ DEFAULT_PID_FILE        = $(localstatedir)/logs/squid.pid
 DEFAULT_SWAP_DIR        = $(localstatedir)/cache
 DEFAULT_PINGER         = $(libexecdir)/$(PINGER_EXE)
 DEFAULT_UNLINKD                = $(libexecdir)/$(UNLINKD_EXE)
+DEFAULT_DISKD          = $(libexecdir)/$(DISKD_EXE)
 DEFAULT_ICON_DIR       = $(sysconfdir)/icons
 DEFAULT_ERROR_DIR      = $(sysconfdir)/errors
 DEFAULT_MIB_PATH       = $(sysconfdir)/mib.txt
@@ -268,6 +270,7 @@ cf.data: cf.data.pre Makefile
        s%@DEFAULT_DNSSERVER@%$(DEFAULT_DNSSERVER)%g;\
        s%@DEFAULT_UNLINKD@%$(DEFAULT_UNLINKD)%g;\
        s%@DEFAULT_PINGER@%$(DEFAULT_PINGER)%g;\
+       s%@DEFAULT_DISKD@%$(DEFAULT_DISKD)%g;\
        s%@DEFAULT_CACHE_LOG@%$(DEFAULT_CACHE_LOG)%g;\
        s%@DEFAULT_ACCESS_LOG@%$(DEFAULT_ACCESS_LOG)%g;\
        s%@DEFAULT_STORE_LOG@%$(DEFAULT_STORE_LOG)%g;\

diff --git a/src/cf.data.pre b/src/cf.data.pre
index eb49b8df129bdb87d62d729a28c94a53aa84b819..32badc31edb41b98f7ea5ae9a45feb81e247c9b4 100644 (file)
--- a/src/cf.data.pre
+++ b/src/cf.data.pre
@@ -1,6 +1,6 @@
 
 #
-# $Id: cf.data.pre,v 1.215 2001/02/20 22:49:23 hno Exp $
+# $Id: cf.data.pre,v 1.216 2001/04/03 20:22:10 adrian Exp $
 #
 #
 # SQUID Web Proxy Cache          http://www.squid-cache.org/
@@ -1083,6 +1083,16 @@ DOC_START
        containing any dot character) host definitions.
 DOC_END
 
+NAME: diskd_program
+TYPE: string
+DEFAULT: @DEFAULT_DISKD@
+LOC: Config.Program.diskd
+DOC_START
+       Specify the location of the diskd executable.
+       Note that this is only useful if you have compiled in
+       diskd as one of the store io modules.
+DOC_END
+
 NAME: unlinkd_program
 IFDEF: USE_UNLINKD
 TYPE: string

diff --git a/src/fs/diskd/store_dir_diskd.cc b/src/fs/diskd/store_dir_diskd.cc
index ea8c76f1bef58aeec2a3abc64978611f8c6deacd..6b507c17ba27f0c0dab3ca6e451b479c08b755e8 100644 (file)
--- a/src/fs/diskd/store_dir_diskd.cc
+++ b/src/fs/diskd/store_dir_diskd.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: store_dir_diskd.cc,v 1.47 2001/03/14 22:28:40 wessels Exp $
+ * $Id: store_dir_diskd.cc,v 1.48 2001/04/03 20:22:11 adrian Exp $
  *
  * DEBUG: section 47    Store Directory Routines
  * AUTHOR: Duane Wessels
@@ -419,7 +419,7 @@ storeDiskdDirInit(SwapDir * sd)
 #else
     x = ipcCreate(IPC_FIFO,
 #endif
-       SQUID_PREFIX "/libexec/squid/diskd",
+       Config.Program.diskd,
        args,
        "diskd",
        &rfd,

diff --git a/src/structs.h b/src/structs.h
index c31487c515b5e54bcb2c7f8409e3daa83b09948d..aba260fa49a986f770912b0a185ac14a564dc6e9 100644 (file)
--- a/src/structs.h
+++ b/src/structs.h
@@ -1,6 +1,6 @@
 
 /*
- * $Id: structs.h,v 1.384 2001/02/20 22:49:24 hno Exp $
+ * $Id: structs.h,v 1.385 2001/04/03 20:22:10 adrian Exp $
  *
  *
  * SQUID Web Proxy Cache          http://www.squid-cache.org/
@@ -427,6 +427,7 @@ struct _SquidConfig {
 #if USE_UNLINKD
        char *unlinkd;
 #endif
+       char *diskd;
     } Program;
 #if USE_DNSSERVERS
     int dnsChildren;