From: amosjeffries <>
Date: Fri, 24 Aug 2007 08:26:52 +0000 (+0000)
Subject: Cleanup display of 'configure --help' (whitespace)
X-Git-Tag: SQUID_3_0_PRE7~34
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f5e5c4cf9ef9314a0332672743b2351159d2eca5;p=thirdparty%2Fsquid.git

Cleanup display of 'configure --help' (whitespace)
Also move AC_REPLACE_FUNCS next to AC_CHECK_FUNCS and label it properly.
---

diff --git a/configure.in b/configure.in
index 941d838a89..255b3f3632 100644
--- a/configure.in
+++ b/configure.in
@@ -1,7 +1,7 @@
 
 dnl  Configuration input file for Squid
 dnl
-dnl  $Id: configure.in,v 1.464 2007/08/17 18:56:24 serassio Exp $
+dnl  $Id: configure.in,v 1.465 2007/08/24 02:26:52 amosjeffries Exp $
 dnl
 dnl
 dnl
@@ -11,7 +11,7 @@ AM_CONFIG_HEADER(include/autoconf.h)
 AC_CONFIG_AUX_DIR(cfgaux)
 AC_CONFIG_SRCDIR([src/main.cc])
 AM_INIT_AUTOMAKE([tar-ustar])
-AC_REVISION($Revision: 1.464 $)dnl
+AC_REVISION($Revision: 1.465 $)dnl
 AC_PREFIX_DEFAULT(/usr/local/squid)
 AM_MAINTAINER_MODE
 
@@ -95,8 +95,8 @@ AC_DEFINE_UNQUOTED(CACHE_HTTP_PORT, $CACHE_HTTP_PORT,
 [What default TCP port to use for HTTP listening?])
 AC_SUBST(CACHE_HTTP_PORT)
 AC_DEFINE_UNQUOTED(CACHE_ICP_PORT, $CACHE_ICP_PORT,
-AC_SUBST(CACHE_ICP_PORT)
 [What default UDP port to use for ICP listening?])
+AC_SUBST(CACHE_ICP_PORT)
 
 AC_DEFINE_UNQUOTED(CONFIG_HOST_TYPE, "$host",[Host type from configure])
 
@@ -213,7 +213,7 @@ fi
 
 dnl Enable optional modules
 AC_ARG_ENABLE(dlmalloc,
-[  --enable-dlmalloc[=LIB] Compile & use the malloc package by Doug Lea],
+[  --enable-dlmalloc[=LIB]   Compile & use the malloc package by Doug Lea],
 [
  case "$enableval" in
  'yes')
@@ -382,7 +382,7 @@ AC_ARG_ENABLE(xmalloc-statistics,
 
 use_carp=1
 AC_ARG_ENABLE(carp,
-[  --disable-carp           Disable CARP support],
+[  --disable-carp          Disable CARP support],
 [ if test "$enableval" = "no" ; then
     echo "CARP disabled"
     use_carp=0
@@ -1677,7 +1677,7 @@ fi
 AC_SUBST(EXTERNAL_ACL_HELPERS)
 
 AC_ARG_WITH(valgrind,
-[  --with-valgrind       Include debug instrumentation for use with valgrind],
+[  --with-valgrind        Include debug instrumentation for use with valgrind],
 [ case $withval in
   yes)
 	valgrind=1
@@ -1805,7 +1805,8 @@ AC_ARG_ENABLE(x_accelerator_vary,
 ])
 
 AC_ARG_WITH(filedescriptors,
-[  --with-filedescriptors=NUMBER Force squid to support NUMBER filedescriptors],
+[  --with-filedescriptors=NUMBER
+                          Force squid to support NUMBER filedescriptors],
 [ squid_filedescriptors_num=$withval ])
 
 AC_PATH_PROG(CPPUNITCONFIG, cppunit-config, false)
@@ -2627,6 +2628,13 @@ AC_CHECK_FUNCS(\
 	timegm \
 	vsnprintf \
 )
+dnl ... and some we provide local replacements for
+AC_REPLACE_FUNCS(\
+	drand48 \
+	initgroups \
+	strerror \
+	tempnam \
+)
 
 # check for crypt, may require -lcrypt
 SAVED_LIBS="$LIBS"
@@ -2949,13 +2957,6 @@ fi
 AC_SUBST(REGEXLIB)
 AC_SUBST(LIBREGEX)
 
-AC_REPLACE_FUNCS(\
-	drand48 \
-	tempnam \
-	strerror \
-    initgroups
-)
-
 dnl Not cached since people are likely to tune this
 AC_MSG_CHECKING(Default FD_SETSIZE value)
 AC_TRY_RUN([
@@ -3240,7 +3241,7 @@ else
 	mingw|mingw32)
 	  echo "Using Win32 resolver instead."
 	  ;;
-	*)      
+	*)
 	  echo "Will use our own inet_ntoa()."
 	  AC_LIBOBJ(inet_ntoa)
 #	  echo "WARNING: This looks bad, and probably prevents Squid from working."