From: Amos Jeffries <squid3@treenet.co.nz>
Date: Wed, 16 Dec 2009 01:13:35 +0000 (+1300)
Subject: Author: Alex Rousskov <rousskov@measurement-factory.com>
X-Git-Tag: SQUID_3_1_0_16~49
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=fc103d9d6285e27fb1529717851e069033a6211a;p=thirdparty%2Fsquid.git

Author: Alex Rousskov <rousskov@measurement-factory.com>
Remove the following ./configure warnings:

  conftest.cpp:34:1: warning: "USE_DISKIO_AIO" redefined
  conftest.cpp:35:1: warning: "USE_DISKIO_DISKTHREADS" redefined

The patch allows Squid v3.1 to build on RHEL 5.4 which has autoconf v2.59.
Without the patch, USE_DISKIO_AIO is zero but the corresponding AIO files
are compiled, leading to errors. I do not know if other platforms are
affected.
---

diff --git a/configure.in b/configure.in
index 51edf7778b..ace5fe14c5 100644
--- a/configure.in
+++ b/configure.in
@@ -479,8 +479,6 @@ AC_ARG_ENABLE(disk-io,
 fi ])
 
 dnl Some autoconf.h defines we might enable later...
-AC_DEFINE(USE_DISKIO_AIO, 0, [Whether POSIX AIO support is needed. Automatic])
-AC_DEFINE(USE_DISKIO_DISKTHREADS, 0, [Whether pthreads support is needed. Automatic])
 USE_AIOPS_WIN32=0
 use_aio=
 use_diskthreads=
@@ -646,6 +644,7 @@ for module in $MAYBE_DISK_MODULES none; do
 		;;
 	  esac
 	else
+	  AC_DEFINE(USE_DISKIO_AIO, 0, [Whether POSIX AIO support is needed. Automatic])
 	  AC_MSG_NOTICE([AIO DiskIO Module disabled. Missing POSIX AIO support.])
 	fi
 	;;