From: Amos Jeffries <squid3@treenet.co.nz>
Date: Tue, 1 Sep 2009 09:18:17 +0000 (+1200)
Subject: Default-enable all DiskIO modules
X-Git-Tag: SQUID_3_2_0_1~753^2~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4910f49d680f1f79ea57abaf60f82629191a5c0a;p=thirdparty%2Fsquid.git

Default-enable all DiskIO modules
---

diff --git a/configure.in b/configure.in
index f49d543ec0..a1e9d15255 100644
--- a/configure.in
+++ b/configure.in
@@ -422,8 +422,7 @@ fi
 
 AC_ARG_ENABLE(disk-io,
   AS_HELP_STRING([--enable-disk-io="list of modules"],[Build support for the list of disk I/O modules.
-                  If unset only the "Blocking" module will be built.
-                  Set without a value all available modules will be built.
+                  Set without a value or omitted, all available modules will be built.
                   See src/DiskIO for a list of available modules, or
                   Programmers Guide section on DiskIO
                   for details on how to build your custom disk module]),
@@ -448,11 +447,16 @@ AC_ARG_ENABLE(disk-io,
   esac
 ],
 [ if test -z "$MAYBE_DISK_MODULES"; then
-    MAYBE_DISK_MODULES="Blocking"
-    AC_MSG_NOTICE([Enabling Blocking DiskIO module (required default)])
-    AC_DEFINE(USE_DISKIO,1,[DiskIO modules are expected to be available.])
-  fi
-])
+  AC_MSG_NOTICE([Enabling all available DiskIO modules (default)...])
+  for dir in $srcdir/src/DiskIO/*; do
+    module="`basename $dir`"
+    if test -d "$dir" && test "$module" != CVS; then
+	AC_MSG_NOTICE([Autodetected $module DiskIO module])
+	MAYBE_DISK_MODULES="$MAYBE_DISK_MODULES $module"
+    fi
+  done
+  AC_DEFINE(USE_DISKIO,1,[DiskIO modules are expected to be available.])
+fi ])
 
 dnl Some autoconf.h defines we might enable later...
 AC_DEFINE(USE_DISKIO_AIO, 0, [Whether POSIX AIO support is needed. Automatic])