From: Amos Jeffries <squid3@treenet.co.nz>
Date: Fri, 23 Jan 2009 23:38:10 +0000 (+1300)
Subject: Bug 2576: Make translate target obey --disable-auto-locale
X-Git-Tag: SQUID_3_2_0_1~1247
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e420a18f7ae01088f4a6dcfd816cdcff4d939610;p=thirdparty%2Fsquid.git

Bug 2576: Make translate target obey --disable-auto-locale
---

diff --git a/configure.in b/configure.in
index 70d847769c..42f52641d5 100644
--- a/configure.in
+++ b/configure.in
@@ -3764,7 +3764,6 @@ fi
 
 dnl Squid now has .po translation capability, given the right toolkit
 AX_WITH_PROG([PO2HTML],[po2html])
-AC_SUBST(PO2HTML)
 
 dnl Squid now has limited locale handling ...
 dnl on error pages
@@ -3784,7 +3783,10 @@ if test "$use_errlocale" = "yes" ; then
 else
     echo "Disabling Multi-Language Support"
     AC_DEFINE(USE_ERR_LOCALES,0,[Use multi-language support on error pages])
+    dnl So we don't want to even attempt translation if its forcibly disabled.
+    PO2HTML="off"
 fi
+AC_SUBST(PO2HTML)
 
 dnl Need the debugging version of malloc if available
 XTRA_OBJS=''
diff --git a/errors/Makefile.am b/errors/Makefile.am
index f4d9bad0d2..0480a0c678 100644
--- a/errors/Makefile.am
+++ b/errors/Makefile.am
@@ -142,7 +142,7 @@ dist-hook:
 	cp -p $(srcdir)/errorpage.css  $(distdir)/errorpage.css
 
 translate:
-	@ if test "$(PO2HTML)" != "" && test "$(PO2HTML)" != "no"; then \
+	@ if test "$(PO2HTML)" != "" && test "$(PO2HTML)" != "no" && test "$(PO2HTML)" != "off"; then \
 	  for lang in $(TRANSLATIONS); do \
 		test -d $$lang && rm -r $$lang; \
 		mkdir $$lang; \
@@ -155,7 +155,11 @@ translate:
 		cd ..; \
 	  done; \
 	else \
-	  echo "WARNING: Translation toolkit was not detected."; \
+	  if test "$(PO2HTML)" = "off" ; then \
+	    echo "WARNING: Translation is disabled."; \
+	  else \
+	    echo "WARNING: Translation toolkit was not detected."; \
+	  fi; \
 	  echo "A drop-in bundle of pre-translated files is available from"; \
 	  echo "http://www.squid-cache.org/Versions/langpack/"; \
 	fi