trans-coord/gnun/server/gnun ChangeLog Makefile...

[Ineiev]

CVSROOT:        /sources/trans-coord
Module name:    trans-coord
Changes by:     Ineiev <ineiev> 23/04/12 13:40:34

Modified files:
        gnun/server/gnun: ChangeLog Makefile.am NEWS configure.ac 

Log message:
        * configure.ac:
        * Makefile.am: Add --enable-sort-linguas.
        * Makefile.am (AM_DISTCHECK_CONFIGURE_FLAGS): New variable: reduce
        the number of locales generated in the discheck time.
        * configure.ac: replace "`" in comments and text messages with "'".
        * NEWS: Update.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/trans-coord/gnun/server/gnun/ChangeLog?cvsroot=trans-coord&r1=1.513&r2=1.514
http://cvs.savannah.gnu.org/viewcvs/trans-coord/gnun/server/gnun/Makefile.am?cvsroot=trans-coord&r1=1.56&r2=1.57
http://cvs.savannah.gnu.org/viewcvs/trans-coord/gnun/server/gnun/NEWS?cvsroot=trans-coord&r1=1.163&r2=1.164
http://cvs.savannah.gnu.org/viewcvs/trans-coord/gnun/server/gnun/configure.ac?cvsroot=trans-coord&r1=1.65&r2=1.66

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/trans-coord/trans-coord/gnun/server/gnun/ChangeLog,v
retrieving revision 1.513
retrieving revision 1.514
diff -u -b -r1.513 -r1.514
--- ChangeLog   10 Apr 2023 12:04:34 -0000      1.513
+++ ChangeLog   12 Apr 2023 17:40:34 -0000      1.514
@@ -1,3 +1,12 @@
+2023-04-12  Pavel Kharitonov  <ineiev@gnu.org>
+
+       * configure.ac:
+       * Makefile.am: Add --enable-sort-linguas.
+       * Makefile.am (AM_DISTCHECK_CONFIGURE_FLAGS): New variable: reduce
+       the number of locales generated in the discheck time.
+       * configure.ac: replace "`" in comments and text messages with "'".
+       * NEWS: Update.
+
 2023-04-10  Pavel Kharitonov  <ineiev@gnu.org>
 
        * tests/convert: Fix distcheck.

Index: Makefile.am
===================================================================
RCS file: /sources/trans-coord/trans-coord/gnun/server/gnun/Makefile.am,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -b -r1.56 -r1.57
--- Makefile.am 7 Apr 2023 08:45:02 -0000       1.56
+++ Makefile.am 12 Apr 2023 17:40:34 -0000      1.57
@@ -18,6 +18,9 @@
 
 ACLOCAL_AMFLAGS = -I m4 -I m4-external
 
+# Limit sorting locales to make the procedure faster and using less disk space.
+AM_DISTCHECK_CONFIGURE_FLAGS=--with-linguas=it,lt
+
 SUBDIRS = doc dtd
 
 bin_SCRIPTS = gnun-link-diff
@@ -159,7 +162,9 @@
 if HAVE_SORT
 stamp-i18n.mk:
        $(AM_V_GEN)mkdir i18n; \
-  $(SED) '/#/d' "$(srcdir)/sort-linguas" | while read line; do \
+  $(SED) '/#/d' "$(srcdir)/sort-linguas" \
+    | ${GREP} '${SORT_LINGUAS}' \
+    | while read line; do \
     lang=`echo $$line | sed "s, .*,,"`; loc=`echo $$line | sed "s,.* ,,"`; \
     echo Generating locale for $$lang...; \
     $(LOCALEDEF) -c -f UTF-8 -i $$loc ./i18n/$$loc || true; \

Index: NEWS
===================================================================
RCS file: /sources/trans-coord/trans-coord/gnun/server/gnun/NEWS,v
retrieving revision 1.163
retrieving revision 1.164
diff -u -b -r1.163 -r1.164
--- NEWS        9 Apr 2023 10:51:51 -0000       1.163
+++ NEWS        12 Apr 2023 17:40:34 -0000      1.164
@@ -2,6 +2,9 @@
 
 * Changes in GNUnited Nations 1.4 (????-??-??)
 
+** An option to select set of languages for sorting is added to the configure
+   script (--with-linguas).
+
 ** Support localized URLs in templates,
    https://www.gnu.org/s/trans-coord/g/Localized-URLs.html
 

Index: configure.ac
===================================================================
RCS file: /sources/trans-coord/trans-coord/gnun/server/gnun/configure.ac,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -b -r1.65 -r1.66
--- configure.ac        11 Apr 2023 05:53:35 -0000      1.65
+++ configure.ac        12 Apr 2023 17:40:34 -0000      1.66
@@ -28,13 +28,13 @@
 AC_CONFIG_SRCDIR([GNUmakefile])        
 AC_CONFIG_MACRO_DIR([m4])
 
-## 1.11 is needed for the `pkglibexecdir' definition.
+## 1.11 is needed for the 'pkglibexecdir' definition.
 AM_INIT_AUTOMAKE([1.11 -Wall silent-rules])
 
 # Checks for programs.  Missing some of them is not fatal, as the user
-# might want to use `make report' only, or some other limited
-# functionality.  Most variables are declared `precious' in order to
-# override them both via `configure' and `make' when building
+# might want to use 'make report' only, or some other limited
+# functionality.  Most variables are declared 'precious' in order to
+# override them both via 'configure' and 'make' when building
 # translations.
 CHECK_GNU_MAKE
 AS_IF([test -z "$ifGNUmake"], [decent_make=yes], [decent_make=no])
@@ -42,22 +42,14 @@
 AC_MSG_CHECKING([whether to use www.gnu.org Multiviews naming conventions])
 AC_ARG_ENABLE([multiviews],
   [AS_HELP_STRING([--disable-multiviews],
-  [Use pre-Multiviews naming conventions for English URLs (`foo.html'
- rather than `foo.en.html').])]
+  [Use pre-Multiviews naming conventions for English URLs ('foo.html'
+ rather than 'foo.en.html').])]
 )
 AS_CASE(["x$enable_multiviews"],[xno],,[enable_multiviews=yes])
 AC_MSG_RESULT([$enable_multiviews])
 AC_SUBST([MULTIVIEWS], [$enable_multiviews])
 
-AC_MSG_CHECKING([whether to enable sorting])
-AC_ARG_ENABLE([sort],
-  [AS_HELP_STRING([--disable-sort],
-  [Disable sorting lists.])]
-)
-AS_CASE(["x$enable_sort"],[xno],,[enable_sort=yes])
-AC_MSG_RESULT([$enable_sort])
-
-AC_MSG_CHECKING([whether `date' supports the `-d' option])
+AC_MSG_CHECKING([whether 'date' supports the '-d' option])
 timestamp=`date -d "2001-09-09 01:47+0000" +%s 2> /dev/null || echo FAIL`
 decent_date=no
 # Some versions of date return a result that varies
@@ -67,7 +59,7 @@
 ])
 AC_MSG_RESULT([$decent_date])
 
-AC_ARG_VAR([AWK], [the `awk' program])
+AC_ARG_VAR([AWK], [the 'awk' program])
 AX_CHECK_AWK_GSUB([decent_awk=yes], [decent_awk=no])
 AX_TRY_AWK_EXPOUT([match(a,b,c)],[],
 [
@@ -84,20 +76,20 @@
 AC_SUBST([MATCH3], [$match3])
 AM_CONDITIONAL([HAVE_MATCH3], [test $match3 = match])
 
-AX_ARG_PROG([BASH], [the `bash' program], [bash])
+AX_ARG_PROG([BASH], [the 'bash' program], [bash])
 AS_CASE(["x$BASH"], [x],
 [AC_MSG_ERROR([
 
-No `bash' program found.  Try configure BASH=/path/to/bash
+No 'bash' program found.  Try configure BASH=/path/to/bash
 if you have it.
 ])
 ])
 
-AC_ARG_VAR([GREP], [the `grep' program])
-AC_ARG_VAR([EGREP], [the `egrep' program])
+AC_ARG_VAR([GREP], [the 'grep' program])
+AC_ARG_VAR([EGREP], [the 'egrep' program])
 AC_PROG_EGREP
 
-AC_ARG_VAR([SED], [the `sed' program])
+AC_ARG_VAR([SED], [the 'sed' program])
 AC_PROG_SED
 
 # We really really really depend on GNU sed.
@@ -113,22 +105,22 @@
 [AC_MSG_RESULT([yes])],
 [AC_MSG_ERROR([
 
-Unlike GNU sed, the `sed' program doesn't support --in-place option.
+Unlike GNU sed, the 'sed' program doesn't support --in-place option.
 ])
 ])
 
-AC_MSG_CHECKING([whether sed supports the `e' option of the `s' command])
+AC_MSG_CHECKING([whether sed supports the 'e' option of the 's' command])
 test="$(echo false | ${SED} 's/.*/true/e')"
 AS_IF([test $? = 0 -a x"${test}" = x],
 [AC_MSG_RESULT([yes])],
 [AC_MSG_ERROR([
 
-Unlike GNU sed, the `sed' program doesn't support the `e' option
-of the `s' command.
+Unlike GNU sed, the 'sed' program doesn't support the 'e' option
+of the 's' command.
 ])
 ])
 
-AC_MSG_CHECKING([whether sed supports the `q' command with an exit code])
+AC_MSG_CHECKING([whether sed supports the 'q' command with an exit code])
 echo seventeen | ${SED} -n '1 {q 17}' > /dev/null
 result=$?
 echo zero | ${SED} -n '1 {q 0}' > /dev/null
@@ -136,7 +128,7 @@
 [AC_MSG_RESULT([yes])],
 [AC_MSG_ERROR([
 
-Unlike GNU sed, the `sed' program doesn't support the `q' command
+Unlike GNU sed, the 'sed' program doesn't support the 'q' command
 with an exit code.
 ])
 ])
@@ -161,10 +153,37 @@
 [AC_MSG_RESULT([yes])
  buggy_sed=yes])
 
+AC_MSG_CHECKING([whether to enable sorting])
+AC_ARG_ENABLE([sort],
+  [AS_HELP_STRING([--disable-sort],
+  [Disable sorting lists.])]
+)
+AS_CASE(["x$enable_sort"],[xno],,[enable_sort=yes])
+AC_MSG_RESULT([$enable_sort])
+
+AC_MSG_CHECKING([locales to generate for sorting])
+AC_ARG_WITH([linguas],
+  [AS_HELP_STRING([--with-linguas],
+  [Comma-separated list of language codes to enable sorting for.])],
+  [ with_linguas=\
+`echo "$with_linguas" | ${SED} "s/,/\n/g" | while read i; do \
+    if ${GREP} -q "^$i " $srcdir/sort-linguas; then echo $i; fi; \
+  done`
+    with_linguas=`echo $with_linguas | sed 's/ /,/g'` 
+  ],
+  [with_linguas=all]
+)
+
+AC_MSG_RESULT([$with_linguas])
+AS_CASE(["x$with_linguas"], [xall], [sort_linguas=".*"],
+  [sort_linguas=`echo $with_linguas | ${SED} 's/,/\\\|/g;s/.*/^\\\(&\\\) /'`]
+)
+AC_SUBST([SORT_LINGUAS], [$sort_linguas])
+
 # Detect the program to do base64 encoding.
 base64_encode=""
-AX_ARG_PROG([BASE64], [the `base64' program], [base64])
-AX_ARG_PROG([UUENCODE], [the `uuencode' program], [uuencode])
+AX_ARG_PROG([BASE64], [the 'base64' program], [base64])
+AX_ARG_PROG([UUENCODE], [the 'uuencode' program], [uuencode])
 AS_CASE(["x$BASE64"], [x],
 [AS_CASE(["x$UUENCODE"], [x], ,
 [base64_encode=\
@@ -184,11 +203,11 @@
 ])
 AC_SUBST([BASE64_ENCODE], [$base64_encode])
 
-AX_ARG_PROG([MKTEMP], [the `mktemp' program], [mktemp])
+AX_ARG_PROG([MKTEMP], [the 'mktemp' program], [mktemp])
 AS_CASE(["x$MKTEMP"], [x],
 [AC_MSG_ERROR([
 
-No `mktemp' program found.  Try configure MKTEMP=/path/to/mktemp
+No 'mktemp' program found.  Try configure MKTEMP=/path/to/mktemp
 if you have it.
 ])
 ])
@@ -206,10 +225,10 @@
 AC_MSG_RESULT([$have_mktemp_t])
 AC_SUBST([MKTEMP_T], [$mktemp_t])
 
-AX_ARG_PROGS([MSGCAT], [the `msgcat' program], [msgcat gmsgcat])
-AX_ARG_PROGS([MSGFMT], [the `msgfmt' program], [msgfmt gmsgfmt])
-AX_ARG_PROGS([MSGEXEC], [the `msgexec' program], [msgexec gmsgexec])
-AC_ARG_VAR([MSGMERGE], [the `msgmerge' program])
+AX_ARG_PROGS([MSGCAT], [the 'msgcat' program], [msgcat gmsgcat])
+AX_ARG_PROGS([MSGFMT], [the 'msgfmt' program], [msgfmt gmsgfmt])
+AX_ARG_PROGS([MSGEXEC], [the 'msgexec' program], [msgexec gmsgexec])
+AC_ARG_VAR([MSGMERGE], [the 'msgmerge' program])
 AS_CASE(["x$MSGMERGE"], [x], [msgmerges="msgmerge gmsgmerge"],
         [msgmerges="$MSGMERGE"])
 AC_CACHE_CHECK([for msgmerge that supports --previous],
@@ -246,14 +265,14 @@
 AC_SUBST([MSGATTRIB_PREV], [$msgattrib_previous])
 AC_MSG_RESULT([$msgattrib_previous])
 
-AX_ARG_PROG([WDIFF], [the `wdiff' program], [wdiff])
+AX_ARG_PROG([WDIFF], [the 'wdiff' program], [wdiff])
 AS_CASE(["x$WDIFF"], [x], [have_wdiff=no], [have_wdiff=yes])
 AM_CONDITIONAL([HAVE_WDIFF], [test -n "$WDIFF"])
 
-AX_ARG_PROG([PO4A_GETTEXTIZE], [the `po4a-gettextize' program],
+AX_ARG_PROG([PO4A_GETTEXTIZE], [the 'po4a-gettextize' program],
             [po4a-gettextize])
 
-AX_ARG_PROG([PO4A_TRANSLATE], [the `po4a-translate' program], [po4a-translate])
+AX_ARG_PROG([PO4A_TRANSLATE], [the 'po4a-translate' program], [po4a-translate])
 
 # This is a weak test; should be replaced with a feature check.
 AS_CASE(["x$PO4A_TRANSLATE"], [x], [], [
@@ -269,13 +288,13 @@
 # Po4a is useless for our purpose if awk is missing.
 AS_CASE([$decent_awk], [no], [recent_po4a=no])
 
-AX_ARG_PROG([MAIL], [the `mail' program], [mail])
+AX_ARG_PROG([MAIL], [the 'mail' program], [mail])
 
 # This test is currently unnecessary, but might be useful if we rely
 # on GNU Mailutils features in the future.
 AS_CASE(["x$MAIL"], [x], [have_mail=no],
 [have_mail=yes
-AC_CACHE_CHECK([whether `mail' is from GNU Mailutils],
+AC_CACHE_CHECK([whether 'mail' is from GNU Mailutils],
               [gnun_cv_gnu_mailutils],
               [gnun_cv_gnu_mailutils=no
                if $MAIL --version 2> /dev/null \
@@ -346,10 +365,10 @@
 fi
 ])])
 
-AX_ARG_PROG([SORT], [the `sort' program], [sort])
+AX_ARG_PROG([SORT], [the 'sort' program], [sort])
 AS_CASE(["x$SORT"], [x], [have_sort=no], [have_sort=yes])
 
-AX_ARG_PROG([LOCALEDEF], [the `localedef' program], [localedef])
+AX_ARG_PROG([LOCALEDEF], [the 'localedef' program], [localedef])
 AS_CASE(["x$LOCALEDEF"], [x], [have_localedef=no], [have_localedef=yes])
 AC_SUBST([LOCALEDEF], [$LOCALEDEF])
 
@@ -385,7 +404,11 @@
 NOTIFY/ANNOUNCE support...              $have_mail
 VCS support...                          $have_vcs $cvs $svn $bzr
 Use Multiviews naming conventions...    $enable_multiviews
-Sorting support                         $have_sorted_lists
+EOF
+echo -n "Sorting support...                      $have_sorted_lists"
+AS_CASE([$have_sorted_lists], [yes], [AS_ECHO([" ($with_linguas)"])])
+
+cat <<EOF
 
 Type "make" to build the scripts, "make install" to install them
 along with the manuals, and "make installcheck" to run tests.
@@ -395,7 +418,7 @@
 AS_CASE([$decent_date], [no],
 [AC_MSG_WARN([
 
-The `date' program seems to support no `-d' option.
+The 'date' program seems to support no '-d' option.
 
 We rely on it when delaying pages regeneration; this feature may not
 work for you.
@@ -405,10 +428,19 @@
 AS_CASE([$buggy_sed], [yes], [
 AC_MSG_WARN([
 
-The `sed' program seems be affected by the bug discussed in
+The 'sed' program seems be affected by the bug discussed in
 https://lists.gnu.org/archive/html/bug-sed/2017-01/msg00018.html
 (known in GNU Sed 4.3 when used with UTF-8 locales).
 
 Replace sed or use the C locale.
 
 ])])
+AS_CASE([$have_sorted_lists], [yes],
+[ AS_CASE([",$with_linguas,"], [*lt*], [],
+  [ AC_MSG_WARN([
+
+The lt language code wasn't selected for sorting; make installcheck will fail.
+
+])
+  ])
+])