Avoid spurious translation warnings in default "make install" (#1095)

Squid defaults to --disable-translation, but the corresponding "make
install" produces dozens of alias-link.sh warnings like these:

    WARNING: az translations do not exist. Nothing to do for: az-az
    WARNING: bg translations do not exist. Nothing to do for: bg-bg
    ...
    WARNING: vi translations do not exist. Nothing to do for: vi-vn

With this change, --disable-translation builds do not attempt to
"locate" and install/link translation-related files. The following
warning is still shown, even in explicit --disable-translation builds:

    WARNING: Translation is disabled.

This change also stops exposing --disable-translation builds to
alias-link.sh bugs that generate warnings for boilerplate statements.

diff --git a/configure.ac b/configure.ac
index 2d65559ea9396d3e8f7899053cbaed5b6c99457b..e343cfbb916780a20e750a8004a30b587c08e24a 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -3514,6 +3514,7 @@ else
 fi
 AC_SUBST(PO2HTML)
 AC_SUBST(PO2TEXT)
+AM_CONDITIONAL(ENABLE_TRANSLATION, test "x${enable_translation:=no}" = "xyes")
 
 dnl Squid now has limited locale handling ...
 dnl on error pages

diff --git a/doc/manuals/language.am b/doc/manuals/language.am
index 1270c4a28d9d37d027b93458f06769cc20f7192f..072450a09a13f25c3cade8ac42d3acda6e4cc381 100644 (file)
--- a/doc/manuals/language.am
+++ b/doc/manuals/language.am
@@ -8,7 +8,7 @@
 
 ## This file is generated by scripts/source-maintenance.sh.
 
-TRANSLATE_LANGUAGES = \
+LANGUAGE_FILES = \
        ar.lang \
        cs.lang \
        de.lang \

diff --git a/errors/Makefile.am b/errors/Makefile.am
index e19c320e1a153e43382810cd7f5b7306c3c10d39..19a48e2fb69ba89f5399818807683ae09f11532d 100644 (file)
--- a/errors/Makefile.am
+++ b/errors/Makefile.am
@@ -16,6 +16,12 @@ DEFAULT_STYLESHEET   = $(sysconfdir)/errorpage.css
 include $(srcdir)/template.am
 include $(srcdir)/language.am
 
+if ENABLE_TRANSLATION
+TRANSLATE_LANGUAGES = $(LANGUAGE_FILES)
+else !ENABLE_TRANSLATION
+TRANSLATE_LANGUAGES =
+endif
+
 CLEANFILES = $(TRANSLATE_LANGUAGES) translate-warn
 EXTRA_DIST = \
        $(ERROR_TEMPLATES) \
@@ -24,6 +30,12 @@ EXTRA_DIST = \
        template.am \
        aliases alias-link.sh alias-upgrade errorpage.css TRANSLATORS COPYRIGHT
 
+if ENABLE_TRANSLATION
+ALIAS_LINKER=$(SHELL) $(srcdir)/alias-link.sh "$(LN)" "$(RM)" "$(DESTDIR)$(DEFAULT_ERROR_DIR)"
+else !ENABLE_TRANSLATION
+ALIAS_LINKER=$(TRUE)
+endif
+
 all: all-am
 
 translate: translate-warn $(TRANSLATE_LANGUAGES)
@@ -88,7 +100,7 @@ install-data-local: translate
        $(INSTALL_DATA) $(srcdir)/TRANSLATORS $(DESTDIR)$(DEFAULT_ERROR_DIR)/TRANSLATORS; \
        $(INSTALL_DATA) $(srcdir)/COPYRIGHT $(DESTDIR)$(DEFAULT_ERROR_DIR)/COPYRIGHT; \
        $(INSTALL_DATA) $(srcdir)/errorpage.css $(DESTDIR)$(DEFAULT_STYLESHEET).default; \
-       $(SHELL) $(srcdir)/alias-link.sh "$(LN)" "$(RM)" "$(DESTDIR)$(DEFAULT_ERROR_DIR)" "$(srcdir)/aliases" || exit 1 ;
+       $(ALIAS_LINKER) "$(srcdir)/aliases" || exit 1 ;
 
 uninstall-local:
        for l in $(TRANSLATE_LANGUAGES) templates; do \
@@ -116,7 +128,7 @@ uninstall-local:
 
 ## Upgrade requires the new files to be pre-installed
 upgrade: install
-       $(SHELL) $(srcdir)/alias-link.sh "$(LN)" "$(RM)" "$(DESTDIR)$(DEFAULT_ERROR_DIR)" "$(srcdir)/alias-upgrade" || exit 1 ;
+       $(ALIAS_LINKER) "$(srcdir)/alias-upgrade" || exit 1 ;
 
 dist-hook: translate
        for lang in $(TRANSLATE_LANGUAGES); do \

diff --git a/errors/language.am b/errors/language.am
index e91130b828c78f4552850a7a4095d40a8b995973..e15cc2022ee5e03cf1859aaa77c8c8e14daf54b8 100644 (file)
--- a/errors/language.am
+++ b/errors/language.am
@@ -8,7 +8,7 @@
 
 ## This file is generated by scripts/source-maintenance.sh.
 
-TRANSLATE_LANGUAGES = \
+LANGUAGE_FILES = \
        af.lang \
        ar.lang \
        az.lang \

diff --git a/scripts/format-makefile-am.pl b/scripts/format-makefile-am.pl
index e41f200f7b5e27c5b1d773635eac13567a03c369..1ee4c743175aad6dfea7206e026360e2fe880261 100755 (executable)
--- a/scripts/format-makefile-am.pl
+++ b/scripts/format-makefile-am.pl
@@ -20,7 +20,7 @@ while (<>) {
     # accumulate files and prep for sorting
     my %files = ();
     # TODO: Handle or rename /\S+SOURCE=/ and /\S*[^_]SOURCES=/
-    my $groupNameRx = qr/\S+_SOURCES|ICONS|\S+_TEMPLATES|\S+_LANGUAGES|STUB_SOURCE/;
+    my $groupNameRx = qr/\S+_SOURCES|ICONS|\S+_TEMPLATES|\S+_FILES|STUB_SOURCE/;
     if (/^($groupNameRx)\s*(\+?=)\s*(.*[^\\])$/ ) {
         my @parts = split(/\s+/, $3);
         if ($#parts == 0) { # one file only specified on same line as SOURCES

diff --git a/scripts/source-maintenance.sh b/scripts/source-maintenance.sh
index 3872d7a0d456924929014840dfa1bab3cd966c3d..ea35b4fc82ba4a42e485d8deaee4cbfd1aee3b69 100755 (executable)
--- a/scripts/source-maintenance.sh
+++ b/scripts/source-maintenance.sh
@@ -524,10 +524,10 @@ generateAmFile icons/icon.am ICONS "icons/" "silk/*"
 generateAmFile errors/template.am ERROR_TEMPLATES "errors/" "templates/ERR_*"
 
 # Build errors translation install include from current .PO available
-generateAmFile errors/language.am TRANSLATE_LANGUAGES "errors/" "*.po"
+generateAmFile errors/language.am LANGUAGE_FILES "errors/" "*.po"
 
 # Build manuals translation install include from current .PO available
-generateAmFile doc/manuals/language.am TRANSLATE_LANGUAGES "doc/manuals/" "*.po"
+generateAmFile doc/manuals/language.am LANGUAGE_FILES "doc/manuals/" "*.po"
 
 # Build STUB framework include from current stub_* available
 generateAmFile src/tests/Stub.am STUB_SOURCE "src/" "tests/stub_*.cc"