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 627772d13c95278f1654d259cf3b58a5d1a86720..92bd0115a5e548958ffa51627190b537004a0416 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -3367,15 +3367,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 210265b806b277bba782faff51059438897c5a2b..7330c39cf1b316f80016ba8f7d506fbec8385875 100755 (executable)
--- 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/test-suite/buildtests/layer-04-noauth-everything.opts b/test-suite/buildtests/layer-04-noauth-everything.opts
index 44f70c0b5aa4565137473b1e87d048c8510f49ba..39085765b38c0470cc37ad788c887c0553f1b37b 100644 (file)
--- a/test-suite/buildtests/layer-04-noauth-everything.opts
+++ b/test-suite/buildtests/layer-04-noauth-everything.opts
@@ -95,7 +95,7 @@ DISTCHECK_CONFIGURE_FLAGS=" \
        --enable-x-accelerator-vary \
        --enable-ipv6 \
        --enable-auto-locale \
-       --enable-translation \
+       --disable-translation \
        --enable-zph-qos \
        --enable-esi \
        --with-aio \