From: Amos Jeffries <squid3@treenet.co.nz>
Date: Sun, 5 Jan 2014 20:19:06 +0000 (-0800)
Subject: Disable error page translation by default in builds
X-Git-Tag: SQUID_3_5_0_1~432
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=4eb85b7abc2bd630900705862ea28c9ba5d20c3a;p=thirdparty%2Fsquid.git

Disable error page translation by default in builds

There is no need for every build from VCS to have fresh translations.

Enable explicitly for snapshot and release scripts instead so that
translated template files are still available online and pre-translated
in the distributed packages.
---

diff --git a/configure.ac b/configure.ac
index dd18fe3662..9ac6dba2b1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3322,15 +3322,14 @@ if test "x$ac_cv_header_sys_statvfs_h" = "xyes" ; then
 fi
 
 
-dnl Squid will usually attempt to translate when packaging or building from VCS 
+dnl Squid will not usually attempt to translate templates when building
 AC_ARG_ENABLE(translation,
- AS_HELP_STRING([--disable-translation],[Prevent Squid generating localized error page templates and manuals.
-		 Which is usually tried, but may not be needed.]), [ 
-SQUID_YESNO([$enableval],
-     [unrecognized argument to --disable-translation: $enableval])
+ AS_HELP_STRING([--enable-translation],[Generate the localized error page templates and manuals.
+		 Which can also be downloaded from http://www.squid-cache.org/Versions/langpack/.]), [ 
+  SQUID_YESNO([$enableval],
+     [unrecognized argument to --enable-translation: $enableval])
 ])
-dnl Squid now has .po translation capability, given the right toolkit
-if test "x${enable_translation:=yes}" = "xyes" ; then
+if test "x${enable_translation:=no}" = "xyes" ; then
   AX_WITH_PROG([PO2HTML],[po2html])
   AX_WITH_PROG([PO2TEXT],[po2txt])
 else
diff --git a/mkrelease.sh b/mkrelease.sh
index 210265b806..7330c39cf1 100755
--- a/mkrelease.sh
+++ b/mkrelease.sh
@@ -66,7 +66,7 @@ g/squid_curtime/ s//${RELEASE_TIME}/
 w
 EOS
 
-./configure --silent
+./configure --silent --enable-translation
 make dist-all
 
 cd $startdir
diff --git a/mksnapshot.sh b/mksnapshot.sh
index edf099cb7b..db9ae3da54 100755
--- a/mksnapshot.sh
+++ b/mksnapshot.sh
@@ -56,7 +56,7 @@ echo "TMPDIR: ${tmpdir}"
 
 ## Ignore extra build layers. General features building is sufficient for snapshot release.
 ./test-builds.sh --cleanup layer-00-default layer-01-minimal layer-02-maximus || exit 1
-./configure --silent --enable-build-info="DATE: ${date} REVISION: ${revision}"
+./configure --silent --enable-build-info="DATE: ${date} REVISION: ${revision}" --enable-translation
 make -s dist-all
 
 webbase=/server/httpd/htdocs/squid-cache.org/content/
diff --git a/test-suite/buildtests/layer-04-noauth-everything.opts b/test-suite/buildtests/layer-04-noauth-everything.opts
index 96ebdca3b5..a8bebd5d18 100644
--- a/test-suite/buildtests/layer-04-noauth-everything.opts
+++ b/test-suite/buildtests/layer-04-noauth-everything.opts
@@ -94,7 +94,7 @@ DISTCHECK_CONFIGURE_FLAGS=" \
 	--enable-x-accelerator-vary \
 	--enable-ipv6 \
 	--enable-auto-locale \
-	--enable-translation \
+	--disable-translation \
 	--enable-zph-qos \
 	--enable-esi \
 	--with-aio \