]> git.ipfire.org Git - thirdparty/squid.git/commitdiff
Fixed some indentation.
authorFrancesco Chemolli <kinkie@squid-cache.org>
Sat, 31 Jul 2010 13:35:51 +0000 (15:35 +0200)
committerFrancesco Chemolli <kinkie@squid-cache.org>
Sat, 31 Jul 2010 13:35:51 +0000 (15:35 +0200)
Moved some help texts to proper AS_HELP_STRING

configure.in

index 2e0f79d9b6fcf4c80885d4e74ed20586d96047a5..f702f897a0776f3f1f19c08fd776bcf8c6f7af8d 100644 (file)
@@ -437,15 +437,15 @@ case $enableval in
   yes)
     ${TRUE}
     #do nothing, "auto" is ok
-       ;;
+    ;;
   no)
     squid_opt_enable_diskio="no"
-       ;;
+    ;;
   *)
     squid_opt_enable_diskio="yes"
     squid_disk_module_candidates=" `echo $enableval| sed -e 's/,/ /g;s/  */ /g'` "
     SQUID_CLEANUP_MODULES_LIST([squid_disk_module_candidates])
-       ;;
+    ;;
   esac
 ])
 
@@ -480,153 +480,153 @@ DISK_LINKOBJS=
 for module in $squid_disk_module_candidates none; do
   # maybe not needed
   if test "x$module" = "xnone"; then
-       continue
+    continue
   fi
   if ! test -d "$srcdir/src/DiskIO/$module"; then
     AC_MSG_ERROR(disk-io $module does not exist)
   fi
   case "$module" in
     DiskDaemon)
-       AC_MSG_NOTICE([Enabling DiskDaemon DiskIO module])
-       DISK_LIBS="$DISK_LIBS libDiskDaemon.a"
-       DISK_MODULES="$DISK_MODULES DiskDaemon"
-       DISK_PROGRAMS="$DISK_PROGRAMS DiskIO/DiskDaemon/diskd"
-       DISK_LINKOBJS="$DISK_LINKOBJS DiskIO/DiskDaemon/DiskDaemonDiskIOModule.o"
-       ;;
+      AC_MSG_NOTICE([Enabling DiskDaemon DiskIO module])
+      DISK_LIBS="$DISK_LIBS libDiskDaemon.a"
+      DISK_MODULES="$DISK_MODULES DiskDaemon"
+      DISK_PROGRAMS="$DISK_PROGRAMS DiskIO/DiskDaemon/diskd"
+      DISK_LINKOBJS="$DISK_LINKOBJS DiskIO/DiskDaemon/DiskDaemonDiskIOModule.o"
+      ;;
     DiskThreads)
-       squid_opt_use_diskthreads="yes"
-       LIBPTHREADS=
-       SQUID_STATE_SAVE([diskthreads_state],[SQUID_CFLAGS SQUID_CXXFLAGS])
-       if test "x$with_pthreads" != "xno"; then
-               dnl TODO: this needs to be extended to handle more systems and better
-               dnl REF: http://www.openldap.org/lists/openldap-bugs/200006/msg00070.html
-               dnl REF: http://autoconf-archive.cryp.to/acx_pthread.html
-               case "$squid_host_os" in
-               mingw)
-                       USE_AIOPS_WIN32=1
-                       AC_MSG_NOTICE([Windows threads support automatically enabled])
-                       ;;
-               freebsd)
-                       SQUID_CFLAGS="$SQUID_CFLAGS -D_REENTRANT"
-                       SQUID_CXXFLAGS="$SQUID_CXXFLAGS -D_REENTRANT"
-                       if test "x$GCC" = "xyes" -a "x$PRESET_LDFLAGS" = "x" ; then
-                               LDFLAGS="$LDFLAGS -pthread"
-                       fi
-                       ;;
-               solaris)
-                   if test "x$GCC" = "xyes" ; then
-                       SQUID_CFLAGS="$SQUID_CFLAGS -D_REENTRANT -pthreads"
-                       SQUID_CXXFLAGS="$SQUID_CXXFLAGS -D_REENTRANT -pthreads"
-                       AC_CHECK_LIB(pthread, pthread_create ,[LIBPTHREADS="-lpthread"],
-                         [ AC_MSG_NOTICE(pthread library required but cannot be found.)
-                           squid_opt_use_diskthreads="no"
-                         ])
-                   else
-                       dnl test for -lpthread first. libc version is a stub apparently on Solaris.
-                       SQUID_CFLAGS="$SQUID_CFLAGS -D_REENTRANT -lpthread"
-                       SQUID_CXXFLAGS="$SQUID_CXXFLAGS -D_REENTRANT -lpthread"
-            AC_SEARCH_LIBS([pthread_create],[pthread thread],[
-              LIBPTHREADS="" #in LIBS 
-            ],[
+      squid_opt_use_diskthreads="yes"
+      LIBPTHREADS=
+      SQUID_STATE_SAVE([diskthreads_state],[SQUID_CFLAGS SQUID_CXXFLAGS])
+      if test "x$with_pthreads" != "xno"; then
+      dnl TODO: this needs to be extended to handle more systems and better
+      dnl REF: http://www.openldap.org/lists/openldap-bugs/200006/msg00070.html
+      dnl REF: http://autoconf-archive.cryp.to/acx_pthread.html
+        case "$squid_host_os" in
+          mingw)
+            USE_AIOPS_WIN32=1
+            AC_MSG_NOTICE([Windows threads support automatically enabled])
+            ;;
+          freebsd)
+            SQUID_CFLAGS="$SQUID_CFLAGS -D_REENTRANT"
+            SQUID_CXXFLAGS="$SQUID_CXXFLAGS -D_REENTRANT"
+            if test "x$GCC" = "xyes" -a "x$PRESET_LDFLAGS" = "x" ; then
+              LDFLAGS="$LDFLAGS -pthread"
+            fi
+            ;;
+          solaris)
+            if test "x$GCC" = "xyes" ; then
+              SQUID_CFLAGS="$SQUID_CFLAGS -D_REENTRANT -pthreads"
+              SQUID_CXXFLAGS="$SQUID_CXXFLAGS -D_REENTRANT -pthreads"
+              AC_CHECK_LIB(pthread, pthread_create ,[LIBPTHREADS="-lpthread"], [
+                AC_MSG_NOTICE(pthread library required but cannot be found.)
+                squid_opt_use_diskthreads="no"
+               ])
+            else
+              dnl test for -lpthread first. libc version is a stub apparently on Solaris.
+              SQUID_CFLAGS="$SQUID_CFLAGS -D_REENTRANT -lpthread"
+              SQUID_CXXFLAGS="$SQUID_CXXFLAGS -D_REENTRANT -lpthread"
+              AC_SEARCH_LIBS([pthread_create],[pthread thread],[
+                LIBPTHREADS="" #in LIBS 
+              ],[
+                AC_MSG_NOTICE(pthread library required but cannot be found.)
+                squid_opt_use_diskthreads="no"
+              ])
+            fi
+            ;;
+          *)
+            SQUID_CFLAGS="$SQUID_CFLAGS -D_REENTRANT"
+            SQUID_CXXFLAGS="$SQUID_CXXFLAGS -D_REENTRANT"
+            AC_CHECK_LIB(pthread, pthread_create ,[LIBPTHREADS="-lpthread"], [
               AC_MSG_NOTICE(pthread library required but cannot be found.)
               squid_opt_use_diskthreads="no"
             ])
-                       fi
-                       ;;
-               *)
-                       SQUID_CFLAGS="$SQUID_CFLAGS -D_REENTRANT"
-                       SQUID_CXXFLAGS="$SQUID_CXXFLAGS -D_REENTRANT"
-                       AC_CHECK_LIB(pthread, pthread_create ,[LIBPTHREADS="-lpthread"],
-                               [ AC_MSG_NOTICE(pthread library required but cannot be found.)
-                                 squid_opt_use_diskthreads="no"
-                               ])
-                       ;;
-               esac
-       else
-               AC_MSG_NOTICE([Native pthreads support manually disabled.])
-               squid_opt_use_diskthreads="no"
-       fi
-       if test "x$squid_opt_use_diskthreads" = "xyes" ; then
-         AC_DEFINE(USE_DISKIO_DISKTHREADS, 1, [Whether pthreads support is needed. Automatic])
-         AC_MSG_NOTICE([Enabling DiskThreads DiskIO module])
-         DISK_LIBS="$DISK_LIBS libDiskThreads.a"
-         DISK_OS_LIBS="$DISK_OS_LIBS $LIBPTHREADS"
-         DISK_MODULES="$DISK_MODULES DiskThreads"
-         DISK_LINKOBJS="$DISK_LINKOBJS DiskIO/DiskThreads/DiskThreadsDiskIOModule.o"
-       else
-         AC_DEFINE(USE_DISKIO_DISKTHREADS, 0, [Whether pthreads support is needed. Automatic])
-         AC_MSG_NOTICE([Native pthreads support disabled. DiskThreads module automaticaly disabled.])
+            ;;
+          esac
+        else
+          AC_MSG_NOTICE([Native pthreads support manually disabled.])
+          squid_opt_use_diskthreads="no"
+        fi
+        if test "x$squid_opt_use_diskthreads" = "xyes" ; then
+          AC_DEFINE(USE_DISKIO_DISKTHREADS, 1, [Whether pthreads support is needed. Automatic])
+          AC_MSG_NOTICE([Enabling DiskThreads DiskIO module])
+          DISK_LIBS="$DISK_LIBS libDiskThreads.a"
+          DISK_OS_LIBS="$DISK_OS_LIBS $LIBPTHREADS"
+          DISK_MODULES="$DISK_MODULES DiskThreads"
+          DISK_LINKOBJS="$DISK_LINKOBJS DiskIO/DiskThreads/DiskThreadsDiskIOModule.o"
+        else
+          AC_DEFINE(USE_DISKIO_DISKTHREADS, 0, [Whether pthreads support is needed. Automatic])
+          AC_MSG_NOTICE([Native pthreads support disabled. DiskThreads module automaticaly disabled.])
           SQUID_STATE_ROLLBACK([diskthreads_state])
-       fi
-       ;;
+        fi
+      ;;
 
     AIO)
-       dnl Check for POSIX AIO availability
-       squid_opt_use_aio="yes"
-       AIOLIB=
-       if test "x$with_aio" != "xno"; then
-           have_aio_header=no
-           AC_CHECK_HEADERS(aio.h,[have_aio_header=yes])
-           dnl On some systems POSIX AIO functions are in librt
-           dnl On some systems POSIX AIO functions are in libaio
-           AC_CHECK_LIB(rt,aio_read,[AIOLIB="-lrt"],AC_CHECK_LIB(aio,aio_read,[AIOLIB="-laio"],[]))
-         dnl Enable AIO if the library and headers are found
-         if test "x$AIOLIB" != "x" && test "x$have_aio_header" = "xyes"; then
-           AC_MSG_NOTICE([Native POSIX AIO support detected.])
-           squid_opt_use_aio="yes"
-         else
-           dnl Windows does things differently. We provide wrappers.
-           dnl TODO: Windows really needs its own DiskIO module or its Overlaped IO
-           case "$host_os" in
-             mingw|mingw32)
-               squid_opt_use_aio="yes"
-               AC_MSG_NOTICE([Windows being built. Maybe-enable POSIX AIO.])
-             ;;
-             *)
-               AC_MSG_NOTICE([Native POSIX AIO support not detected. AIO automatically disabled.])
-               squid_opt_use_aio="no"
-             ;;
-           esac
-         fi
-       else
-         AC_MSG_NOTICE([POSIX AIO support manually disabled.])
-         squid_opt_use_aio="no"
-       fi
-       dnl Use the POSIX AIO pieces if we actually need them.
-       if test "x$squid_opt_use_aio" = "xyes" ; then
-         AC_DEFINE(USE_DISKIO_AIO, 1, [Whether POSIX AIO support is needed. Automatic])
-         DISK_MODULES="$DISK_MODULES AIO"
-         DISK_LIBS="$DISK_LIBS libAIO.a"
-         DISK_LINKOBJS="$DISK_LINKOBJS DiskIO/AIO/AIODiskIOModule.o"
-         case "$host_os" in
-           mingw|mingw32)
-               USE_AIO_WIN32=1
-               AC_MSG_NOTICE([Replacing AIO DiskIO module with: Windows overlapped I/O support])
-               ;;
-           *)
-               AC_MSG_NOTICE([Enabling AIO DiskIO module])
-               DISK_OS_LIBS="$DISK_OS_LIBS $AIOLIB"
-               ;;
-         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
-       ;;
+      dnl Check for POSIX AIO availability
+      squid_opt_use_aio="yes"
+      AIOLIB=
+      if test "x$with_aio" != "xno"; then
+        have_aio_header=no
+        AC_CHECK_HEADERS(aio.h,[have_aio_header=yes])
+        dnl On some systems POSIX AIO functions are in librt
+        dnl On some systems POSIX AIO functions are in libaio
+        AC_CHECK_LIB(rt,aio_read,[AIOLIB="-lrt"],AC_CHECK_LIB(aio,aio_read,[AIOLIB="-laio"],[]))
+        dnl Enable AIO if the library and headers are found
+        if test "x$AIOLIB" != "x" && test "x$have_aio_header" = "xyes"; then
+          AC_MSG_NOTICE([Native POSIX AIO support detected.])
+          squid_opt_use_aio="yes"
+        else
+          dnl Windows does things differently. We provide wrappers.
+          dnl TODO: Windows really needs its own DiskIO module or its Overlaped IO
+          case "$host_os" in
+            mingw|mingw32)
+              squid_opt_use_aio="yes"
+              AC_MSG_NOTICE([Windows being built. Maybe-enable POSIX AIO.])
+              ;;
+            *)
+              AC_MSG_NOTICE([Native POSIX AIO support not detected. AIO automatically disabled.])
+              squid_opt_use_aio="no"
+              ;;
+          esac
+        fi
+      else
+        AC_MSG_NOTICE([POSIX AIO support manually disabled.])
+        squid_opt_use_aio="no"
+      fi
+      dnl Use the POSIX AIO pieces if we actually need them.
+      if test "x$squid_opt_use_aio" = "xyes" ; then
+        AC_DEFINE(USE_DISKIO_AIO, 1, [Whether POSIX AIO support is needed. Automatic])
+        DISK_MODULES="$DISK_MODULES AIO"
+        DISK_LIBS="$DISK_LIBS libAIO.a"
+        DISK_LINKOBJS="$DISK_LINKOBJS DiskIO/AIO/AIODiskIOModule.o"
+        case "$host_os" in
+          mingw|mingw32)
+            USE_AIO_WIN32=1
+            AC_MSG_NOTICE([Replacing AIO DiskIO module with: Windows overlapped I/O support])
+            ;;
+          *)
+            AC_MSG_NOTICE([Enabling AIO DiskIO module])
+            DISK_OS_LIBS="$DISK_OS_LIBS $AIOLIB"
+            ;;
+        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
+      ;;
 
     Blocking)
-       AC_MSG_NOTICE([Enabling Blocking DiskIO module])
-       DISK_LIBS="$DISK_LIBS libBlocking.a"
-       DISK_MODULES="$DISK_MODULES Blocking"
-       DISK_LINKOBJS="$DISK_LINKOBJS DiskIO/Blocking/BlockingDiskIOModule.o"
-       ;;
+      AC_MSG_NOTICE([Enabling Blocking DiskIO module])
+      DISK_LIBS="$DISK_LIBS libBlocking.a"
+      DISK_MODULES="$DISK_MODULES Blocking"
+      DISK_LINKOBJS="$DISK_LINKOBJS DiskIO/Blocking/BlockingDiskIOModule.o"
+      ;;
 
     *)
-       AC_MSG_NOTICE([Enabling $module DiskIO module])
-       DISK_LIBS="$DISK_LIBS lib${module}.a"
-       DISK_MODULES="$DISK_MODULES ${module}"
-       DISK_LINKOBJS="$DISK_LINKOBJS DiskIO/${module}/${module}DiskIOModule.o"
-       ;;
+      AC_MSG_NOTICE([Enabling $module DiskIO module])
+      DISK_LIBS="$DISK_LIBS lib${module}.a"
+      DISK_MODULES="$DISK_MODULES ${module}"
+      DISK_LINKOBJS="$DISK_LINKOBJS DiskIO/${module}/${module}DiskIOModule.o"
+      ;;
     esac
 done
 AC_MSG_NOTICE([IO Modules built: $DISK_MODULES])
@@ -648,21 +648,21 @@ AC_ARG_ENABLE([storeio],
                   The default is only to build the "ufs" module.
                   See src/fs for a list of available modules, or
                   Programmers Guide section <not yet written>
-                  for details on how to build your custom store module]),
-case $enableval in
+                  for details on how to build your custom store module]), [
+case $enableval in
   yes)
     squid_opt_enable_storeio=auto
-       ;;
+    ;;
   no)
     squid_opt_enable_storeio=no
-       ;;
+    ;;
   *)
     squid_opt_enable_storeio=yes
-       squid_storeio_module_candidates="`echo $enableval| sed -e 's/,/ /g;s/  */ /g'`"
+    squid_storeio_module_candidates="`echo $enableval| sed -e 's/,/ /g;s/  */ /g'`"
     # ufs is really always needed as it has low-level routines
     # if it is a dupe it will be cleaned-up later
     squid_storeio_module_candidates="$squid_storeio_module_candidates ufs"
-       ;;
+    ;;
   esac
 ])
 if test "x$squid_opt_enable_storeio" = "xauto"; then
@@ -679,32 +679,30 @@ SQUID_CHECK_EXISTING_MODULES([$srcdir/src/fs],[squid_storeio_module_candidates])
 AC_MSG_NOTICE([Store modules built: $squid_storeio_module_candidates])
 
 for fs in $squid_storeio_module_candidates none; do
-    case "$fs" in
+  case "$fs" in
     diskd)
-       if test "x$squid_disk_module_candidates_Blocking" != "xyes" -a \
+      if test "x$squid_disk_module_candidates_Blocking" != "xyes" -a \
         "$squid_disk_module_candidates_DiskDaemon" != "yes" ; then
-         AC_MSG_ERROR([Storage diskd module requires DiskIO module: Blocking or DiskDaemon])
-       fi
-       ;;
+        AC_MSG_ERROR([Storage diskd module requires DiskIO module: Blocking or DiskDaemon])
+      fi
+      ;;
     aufs)
-       if test "x$squid_disk_module_candidates_Blocking" != "xyes" -a \
+      if test "x$squid_disk_module_candidates_Blocking" != "xyes" -a \
         "$squid_disk_module_candidates_DiskThreads" != "yes" ; then
-         AC_MSG_ERROR([Storage module aufs requires DiskIO module: Blocking or DiskThreads])
-       fi
-       ;;
+        AC_MSG_ERROR([Storage module aufs requires DiskIO module: Blocking or DiskThreads])
+      fi
+      ;;
     coss)
       AC_MSG_WARN([COSS Support is not stable yet in Squid-3. Please do not use.\a])
-       if ! test "x$squid_disk_module_candidates_AIO" = "xyes"; then
-         AC_MSG_ERROR([COSS requires POSIX AIO which is not available.])
-       fi
-       dnl
-       dnl Automake om MinGW needs explicit exe extension
-       dnl for STORE_TESTS substition
-       dnl
-       STORE_TESTS="$STORE_TESTS tests/testCoss$EXEEXT"
-       ;;
+      if ! test "x$squid_disk_module_candidates_AIO" = "xyes"; then
+        AC_MSG_ERROR([COSS requires POSIX AIO which is not available.])
+      fi
+      # Automake om MinGW needs explicit exe extension
+      # for STORE_TESTS substition
+      STORE_TESTS="$STORE_TESTS tests/testCoss$EXEEXT"
+      ;;
     ufs)
-       STORE_TESTS="$STORE_TESTS tests/testUfs$EXEEXT"
+      STORE_TESTS="$STORE_TESTS tests/testUfs$EXEEXT"
     esac
 done
 
@@ -744,16 +742,16 @@ AC_ARG_ENABLE(removal-policies,
                   The default is only to build the "lru" module.
                   See src/repl for a list of available modules, or
                   Programmers Guide section 9.9 for details on how
-                  to build your custom policy]),
-case $enableval in
+                  to build your custom policy]), [
+case $enableval in
   yes)
     SQUID_LOOK_FOR_MODULES([$srcdir/src/repl],[REPL_POLICIES])
-       ;;
+    ;;
   no)
-       ;;
+    ;;
   *)
-       REPL_POLICIES="`echo $enableval| sed -e 's/,/ /g;s/  */ /g'`"
-       ;;
+    REPL_POLICIES="`echo $enableval| sed -e 's/,/ /g;s/  */ /g'`"
+    ;;
   esac
 ])
 if test "x$REPL_POLICIES" != "x" ; then
@@ -797,7 +795,7 @@ AC_ARG_ENABLE(esi,
                  [Enable ESI for accelerators. Benefits from expat or libxml2.
                   Enabling ESI will cause squid reverse proxies to be capable
                   of the Edge Acceleration Specification (www.esi.org).]),
-                   [squid_opt_use_esi=$enableval], [squid_opt_use_esi=no])
+                 [squid_opt_use_esi=$enableval], [squid_opt_use_esi=no])
 HAVE_LIBEXPAT=0
 EXPATLIB=
 HAVE_LIBXML2=0
@@ -805,7 +803,7 @@ XMLLIB=
 if test "x$squid_opt_use_esi" = "xyes" ; then
   AC_MSG_NOTICE([Enabling ESI processor and Surrogate header support.])
   AC_DEFINE(USE_SQUID_ESI,1,
-                 [Compile the ESI processor and Surrogate header support])
+    [Compile the ESI processor and Surrogate header support])
 else
   AC_MSG_NOTICE([Disabling ESI processor])
 fi
@@ -853,7 +851,8 @@ AC_SUBST(XMLLIB)
 # icap argument handling
 AC_ARG_ENABLE(icap-client,
   AS_HELP_STRING([--enable-icap-client],[Enable the ICAP client.]),
-                    [squid_opt_use_icap_client=$enableval], [squid_opt_use_icap_client=no])
+    [squid_opt_use_icap_client=$enableval],
+    [squid_opt_use_icap_client=no])
 SQUID_DEFINE_BOOL(ICAP_CLIENT,$squid_opt_use_icap_client,
      [Enable ICAP client features in Squid])
 AM_CONDITIONAL(USE_ICAP_CLIENT, [test "x$squid_opt_use_icap_client" = "xyes" ])
@@ -1029,28 +1028,28 @@ AC_ARG_ENABLE(eui,
 SQUID_YESNO([$enableval],[--disable-eui expects no arguments])
 ])
 if test "x${enable_eui:=yes}" = "xyes" ; then
-     case "$squid_host_os" in
-       linux|solaris|freebsd|openbsd|netbsd)
-        ${TRUE}
-           ;;
-       cygwin|mingw)
-               EUILIB="-liphlpapi"
-           ;;
-       *)
-           AC_MSG_WARN([EUI support probably will not work on host $host.])
-           ;;
-     esac
-     AC_CHECK_HEADERS( \
-               Iphlpapi.h \
-               net/if.h \
-               net/if_arp.h \
-               net/if_dl.h \
-               net/route.h \
-               netinet/if_ether.h \
-               sys/sockio.h \
-               sys/sysctl.h \
-               sys/ioctl.h \
-       )
+  case "$squid_host_os" in
+    linux|solaris|freebsd|openbsd|netbsd)
+      ${TRUE}
+      ;;
+    cygwin|mingw)
+      EUILIB="-liphlpapi"
+      ;;
+    *)
+      AC_MSG_WARN([EUI support probably will not work on host $host.])
+      ;;
+  esac
+  AC_CHECK_HEADERS( \
+    Iphlpapi.h \
+    net/if.h \
+    net/if_arp.h \
+    net/if_dl.h \
+    net/route.h \
+    netinet/if_ether.h \
+    sys/sockio.h \
+    sys/sysctl.h \
+    sys/ioctl.h \
+  )
 fi
 AC_MSG_NOTICE([EUI (MAC address) controls enabled: $enable_eui])
 SQUID_DEFINE_BOOL(USE_SQUID_EUI,$enable_eui,
@@ -1080,17 +1079,17 @@ SQUID_YESNO([$enableval],
 # USE_OPENSSL is AC_DEFINED later
 # default for ssl is set here
 if test "x${enable_ssl:=no}" = "xyes" ; then
-    if test "x$squid_host_os" = "xmingw" ; then
-        SSLLIB='-lssleay32 -leay32 -lgdi32'
-    else
-        SSLLIB='-lssl -lcrypto'
-    fi
-    if test "x$with_openssl" = "x"; then
-       with_openssl=yes
-    fi
-    if test "x$with_openssl" = "x"; then
-       with_openssl=yes
-    fi
+  if test "x$squid_host_os" = "xmingw" ; then
+    SSLLIB='-lssleay32 -leay32 -lgdi32'
+  else
+    SSLLIB='-lssl -lcrypto'
+  fi
+  if test "x$with_openssl" = "x"; then
+    with_openssl=yes
+  fi
+  if test "x$with_openssl" = "x"; then
+    with_openssl=yes
+  fi
 fi
 AM_CONDITIONAL(ENABLE_SSL,[ test "x$enable_ssl" = "xyes" ])
 AC_MSG_NOTICE([SSL gatewaying support enabled: $enable_ssl])
@@ -1307,34 +1306,34 @@ buildmodel=""
 squid_opt_enable_large_files=no
 
 AC_ARG_WITH(large-files,
-  AS_HELP_STRING([--with-large-files],[Enable support for large files (logs etc).]),
-[ if test "x$withval" = "xyes"; then
-       squid_opt_enable_large_files=yes
+  AS_HELP_STRING([--with-large-files],[Enable support for large files (logs etc).]), [
+  if test "x$withval" = "xyes"; then
+    squid_opt_enable_large_files=yes
   fi
 ])
 
 dnl UNIX Build environment
 dnl AS_HELP_STRING is not suited here because it cannot to specify newlines
 AC_ARG_WITH(build-environment,
-[  --with-build-environment=model
-                          The build environment to use. Normally one of
-                          POSIX_V6_ILP32_OFF32   32 bits
-                          POSIX_V6_ILP32_OFFBIG  32 bits with large file support
-                          POSIX_V6_LP64_OFF64    64 bits
-                          POSIX_V6_LPBIG_OFFBIG  large pointers and files
-                          XBS5_ILP32_OFF32       32 bits (legacy)
-                          XBS5_ILP32_OFFBIG      32 bits with large file support (legacy)
-                          XBS5_LP64_OFF64        64 bits (legacy)
-                          XBS5_LPBIG_OFFBIG      large pointers and files (legacy)
-                          default                The default for your OS],
-case "$withval" in
+ AS_HELP_STRING([--with-build-environment=model],
+     [The build environment to use. Normally one of 
+      POSIX_V6_ILP32_OFF32 (32 bits),
+      POSIX_V6_ILP32_OFFBIG (32 bits with large file support),
+      POSIX_V6_LP64_OFF64 (64 bits),
+      POSIX_V6_LPBIG_OFFBIG (large pointers and files),
+      XBS5_ILP32_OFF32 i(legacy, 32 bits),
+      XBS5_ILP32_OFFBIG (legacy, 32 bits with large file support),
+      XBS5_LP64_OFF64 (legacy, 64 bits),
+      XBS5_LPBIG_OFFBIG (legacy, large pointers and files)
+      or default (The default for your OS)]), [
+case "$withval" in
   yes|no)
-       AC_MSG_FAILURE([--with-build-environment expects a build environment string as used by getconf])
-       ;;
+    AC_MSG_FAILURE([--with-build-environment expects a build environment string as used by getconf])
+    ;;
   *)
-       buildmodel="$withval"
-       ;;
-  esac
+    buildmodel="$withval"
+    ;;
+esac
 ])
 
 if test "x$squid_opt_enable_large_files" = "xyes" -a "x$buildmodel" = "x"; then
@@ -1348,26 +1347,24 @@ if test "x$squid_opt_enable_large_files" = "xyes" -a "x$buildmodel" = "x"; then
     AC_MSG_WARN([No suitable build environment found for large files. Trying to use _FILE_OFFSET_BITS=64])
   fi
 fi
-case "$buildmodel" in
-default|"")
-       if test "x$squid_opt_enable_large_files" = "xyes" ; then
-               AC_MSG_NOTICE([Enabling -D_FILE_OFFSET_BITS=64])
-               CFLAGS="-D_FILE_OFFSET_BITS=64 $CFLAGS"
-               CXXFLAGS="-D_FILE_OFFSET_BITS=64 $CXXFLAGS"
-       fi
-       ;;
-*)
-       AC_MSG_NOTICE([Using $buildmodel build environment])
-       if test "`getconf _$buildmodel 2>/dev/null || true`" = 1 || test "`getconf $buildmodel 2>/dev/null || true`" ; then
-           : # All fine
-       else
-           AC_MSG_ERROR(Build environment $buildmodel not known to getconf.)
-       fi
-       CFLAGS="`getconf ${buildmodel}_CFLAGS` $CFLAGS"
-       CXXFLAGS="`getconf ${buildmodel}_CFLAGS` $CXXFLAGS"
-       LIBS="`getconf ${buildmodel}_LIBS` $LIBS"
-       LDFLAGS="`getconf ${buildmodel}_LDFLAGS` $LDFLAGS"
-       if "$squid_host_os" = "solaris" ; then
+if "x$buildmodel" = "xdefault" -o "x$buildmodel" = "x"; then
+  if test "x$squid_opt_enable_large_files" = "xyes" ; then
+    AC_MSG_NOTICE([Enabling -D_FILE_OFFSET_BITS=64])
+    CFLAGS="-D_FILE_OFFSET_BITS=64 $CFLAGS"
+    CXXFLAGS="-D_FILE_OFFSET_BITS=64 $CXXFLAGS"
+  fi
+else
+  AC_MSG_NOTICE([Using $buildmodel build environment])
+  if test "`getconf _$buildmodel 2>/dev/null || true`" = 1 || test "`getconf $buildmodel 2>/dev/null || true`" ; then
+    : # All fine
+  else
+    AC_MSG_ERROR(Build environment $buildmodel not known to getconf.)
+  fi
+  CFLAGS="`getconf ${buildmodel}_CFLAGS` $CFLAGS"
+  CXXFLAGS="`getconf ${buildmodel}_CFLAGS` $CXXFLAGS"
+  LIBS="`getconf ${buildmodel}_LIBS` $LIBS"
+  LDFLAGS="`getconf ${buildmodel}_LDFLAGS` $LDFLAGS"
+  if "$squid_host_os" = "solaris" ; then
 
 # On Solaris getconf returns for CFLAGS -xarch=generic64, -Xa and -Usun options, and
 # for LDFLAGS -xarch=generic64, but:
@@ -1387,7 +1384,7 @@ default|"")
     CFLAGS="`echo $CFLAGS | sed -e 's/-Usun//'`"
     CXXFLAGS="`echo $CXXFLAGS | sed -e 's/-Usun//'`"
   fi
-esac
+fi
 
 dnl Enable Leak Finding Functions
 AC_ARG_ENABLE(leakfinder,
@@ -1697,13 +1694,13 @@ dnl
 SQUID_STATE_SAVE([krbsave])
 
 AC_ARG_WITH(krb5-config,
[  --with-krb5-config=PATH specify path to krb5-config @<:@default=detect@:>@],
-[
-  case "$withval" in
-       yes) unset krb5confpath ;;
-       no)  krb5confpath=no ;;
-       *)   krb5confpath=$withval ;;
-       esac
 AS_HELP_STRING([--with-krb5-config=PATH],
+                 [specify path to krb5-config (default=detect)]), [
+case "$withval" in
+  yes) unset krb5confpath ;;
+  no)  krb5confpath=no ;;
+  *)   krb5confpath=$withval ;;
+esac
 ])
 if test x"$krb5confpath" != "xno"; then
     if test "x$krb5confpath" != "x"; then
@@ -1841,23 +1838,23 @@ AC_ARG_ENABLE(external-acl-helpers,
 #nothing to do, really
 ])
 if test "x${enable_external_acl_helpers:=yes}" = "xyes" ;then
-       SQUID_LOOK_FOR_MODULES([$srcdir/helpers/external_acl],
-                              [enable_external_acl_helpers])
+  SQUID_LOOK_FOR_MODULES([$srcdir/helpers/external_acl],
+    [enable_external_acl_helpers])
 fi
 if test "x$enable_external_acl_helpers" = "xnone" ; then
-       enable_external_acl_helpers=""
+  enable_external_acl_helpers=""
 fi
 EXTERNAL_ACL_HELPERS=""
 enable_external_acl_helpers="`echo $enable_external_acl_helpers| sed -e 's/,/ /g;s/  */ /g'`"
 if test "x$enable_external_acl_helpers" != "xno" ; then
   for helper in $enable_external_acl_helpers ; do
     dir="$srcdir/helpers/external_acl/$helper"
-               if test -f "$dir/config.test" && sh "$dir/config.test" "$@"; then
-                       EXTERNAL_ACL_HELPERS="$EXTERNAL_ACL_HELPERS $helper"
-               else
-                       AC_MSG_NOTICE([external acl helper $helper ... found but cannot be built])
-               fi
-       done
+    if test -f "$dir/config.test" && sh "$dir/config.test" "$@"; then
+      EXTERNAL_ACL_HELPERS="$EXTERNAL_ACL_HELPERS $helper"
+    else
+      AC_MSG_NOTICE([external acl helper $helper ... found but cannot be built])
+    fi
+  done
 fi
 AC_MSG_NOTICE([External acl helpers built: $EXTERNAL_ACL_HELPERS])
 AC_SUBST(EXTERNAL_ACL_HELPERS)
@@ -1917,7 +1914,7 @@ dnl Disable "memPools" code
 #AC_ARG_ENABLE(chunkedmempools,
 #  AS_HELP_STRING([--enable-chunkedmempools],
 #                 [Enable experimental chunked memPools. Note that this option
-#                simply sets the default behaviour. Specific classes can override this 
+#                 simply sets the default behaviour. Specific classes can override this 
 #                  at runtime, and only lib/MemPool.c needs to be altered 
 #                  to change the squid-wide default for all classes.]), [ 
 #SQUID_YESNO([$enableval],