From: Amos Jeffries <squid3@treenet.co.nz>
Date: Thu, 16 Oct 2008 12:56:48 +0000 (+1300)
Subject: Default enable error page localization
X-Git-Tag: SQUID_3_2_0_1~1399
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=8db7a54b118d0fcd8f06a4b8a439e19400f5b1f5;p=thirdparty%2Fsquid.git

Default enable error page localization
---

diff --git a/configure.in b/configure.in
index 72b218ae80..96d9adb1d4 100755
--- a/configure.in
+++ b/configure.in
@@ -3684,19 +3684,22 @@ AC_SUBST(PO2HTML)
 
 dnl Squid now has limited locale handling ...
 dnl on error pages
+use_errlocale=yes
 AC_ARG_ENABLE(auto-locale,
-[  --enable-auto-locale  This enables squid to lookup translated error pages
-                          based on the clients request headers. Without it squid
-                          is limited to a single language set in squid.conf],
-[ if test "$enableval" = "yes" ; then
+	AC_HELP_STRING([--disable-auto-locale],
+			[This prevets Squid providing localized error pages based on the clients request headers.
+			 When disabled Squid requires explicit language configuration.]),
+[ if test "$enableval" = "no" ; then
+    use_errlocale=no
+  fi
+])
+if test "$use_errlocale" = "yes" ; then
     echo "Enabling Multi-Language Support"
     AC_DEFINE(USE_ERR_LOCALES,1,[Use multi-language support on error pages])
- else
+else
     echo "Disabling Multi-Language Support"
     AC_DEFINE(USE_ERR_LOCALES,0,[Use multi-language support on error pages])
-  fi
-])
-
+fi
 
 dnl Need the debugging version of malloc if available
 XTRA_OBJS=''
@@ -3708,7 +3711,6 @@ if test "$ac_cv_lib_malloc_main" = "yes" ; then
 		XTRA_OBJS="$XTRA_OBJS /usr/lib/debug/mallocmap.o"
 	fi
 fi
-
 AC_SUBST(XTRA_OBJS)
 
 if test -z "$XTRA_LIBS"; then