Summary: Miscellaneous fixes from Guido.

Keywords:

Missing fde.h include in comm_select.cc
Prevent make from trying to build diskd even if not configured

diff --git a/configure.in b/configure.in
index 862d400395c28f34bd5760eb4f8c362333d100f0..69eeeb8b9b1c07c1812930a886af398560490d40 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -3,7 +3,7 @@ dnl  Configuration input file for Squid
 dnl
 dnl  Duane Wessels, wessels@nlanr.net, February 1996 (autoconf v2.9)
 dnl
-dnl  $Id: configure.in,v 1.317 2003/02/01 13:42:13 hno Exp $
+dnl  $Id: configure.in,v 1.318 2003/02/02 12:55:23 robertc Exp $
 dnl
 dnl
 dnl
@@ -13,7 +13,7 @@ AC_CONFIG_SRCDIR([src/main.cc])
 AC_CONFIG_AUX_DIR(cfgaux)
 AM_INIT_AUTOMAKE(squid, 3.0-DEVEL)
 AM_CONFIG_HEADER(include/autoconf.h)
-AC_REVISION($Revision: 1.317 $)dnl
+AC_REVISION($Revision: 1.318 $)dnl
 AC_PREFIX_DEFAULT(/usr/local/squid)
 AM_MAINTAINER_MODE
 
@@ -389,6 +389,7 @@ for fs in $STORE_MODULES none; do
     case "$fs" in
     diskd)
         STORE_MODULE_SUBDIRS="$STORE_MODULE_SUBDIRS $fs"
+       STORE_PROGRAMS="$STORE_PROGRAMS diskd/diskd"
        ;;
     aufs)
        if test -z "$with_pthreads"; then
@@ -417,6 +418,7 @@ if test -z "$UFS_FOUND"; then
 fi
   
 AC_SUBST(STORE_MODULES)
+AC_SUBST(STORE_PROGRAMS)
 AC_SUBST(STORE_MODULE_SUBDIRS)
 
 dnl --enable-heap-replacement compability option

diff --git a/src/comm_select.cc b/src/comm_select.cc
index 8a041564f87459a89b824caa91d1521e8afe2c6c..b63f801b6a3e707d9995ae18fabe77f3c7422e21 100644 (file)
--- a/src/comm_select.cc
+++ b/src/comm_select.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: comm_select.cc,v 1.66 2003/01/29 03:45:20 hno Exp $
+ * $Id: comm_select.cc,v 1.67 2003/02/02 12:55:23 robertc Exp $
  *
  * DEBUG: section 5     Socket Functions
  *
@@ -33,9 +33,10 @@
  */
 
 #include "squid.h"
-#include "Store.h"
 
 #ifdef USE_SELECT
+#include "Store.h"
+#include "fde.h"
 
 static int MAX_POLL_TIME = 1000;       /* see also comm_quick_poll_required() */
 

diff --git a/src/fs/Makefile.am b/src/fs/Makefile.am
index 6907a0b3745fedfa2a252988c88cad01efcfd521..5e9342685fa3472861f0b15ca5639765f3026bb4 100644 (file)
--- a/src/fs/Makefile.am
+++ b/src/fs/Makefile.am
@@ -1,6 +1,6 @@
 #  Makefile for storage modules in the Squid Object Cache server
 #
-#  $Id: Makefile.am,v 1.5 2003/01/27 09:49:08 robertc Exp $
+#  $Id: Makefile.am,v 1.6 2003/02/02 12:55:27 robertc Exp $
 #
 
 AUTOMAKE_OPTIONS = subdir-objects
@@ -20,7 +20,8 @@ libdiskd_a_SOURCES = diskd/diskd.cc diskd/store_dir_diskd.cc \
        diskd/store_diskd.h \
        diskd/store_io_diskd.cc
 
-libexec_PROGRAMS = diskd/diskd
+EXTRA_PROGRAMS = diskd/diskd
+libexec_PROGRAMS = @STORE_PROGRAMS@
 diskd_diskd_SOURCES = diskd/diskd.cc diskd/dio.h
 diskd_diskd_LDADD = $(top_builddir)/lib/libmiscutil.a @XTRA_LIBS@