Update for Guile 2.0

* .gitmodules: New file
* gint: New module.

* Makefile.am (ACLOCAL_AMFLAGS, SUBDIRS): Add gint
* autogen.sh: Create a placeholder for ChangeLog.
* configure.ac: Add gint.

* scm/Makefile.am: Add silent rule magic.
* src/cgi-bin/Makefile.am: Likewise.
* src/ellinika/Makefile.am: Likewise.
* xml/Makefile.am: Likewise.

* scm/dictrans.scm: Load (ice-9 syncase) only for Guile 1.x
* scm/neatrans.scm: Likewise.
* src/ellinika/conjugator.scm: Likewise.
* src/ellinika/elmorph.c (elstr)<phoneme_count,nsyl>: Change type
to size_t.

* xml/pl/Makefile.am: Force UTF-8 locale when building html.
Add silent rule magic.
* xml/ru/Makefile.am: Likewise.
* xml/uk/Makefile.am: Likewise.

17 files changed, 117 insertions, 99 deletions

diff --git a/.gitmodules b/.gitmodules
new file mode 100644
index 0000000..7c369d4
--- /dev/null
+++ b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "gint"]
+	path = gint
+	url = git://git.gnu.org.ua/gint.git
diff --git a/Makefile.am b/Makefile.am
index 678c978..521b3e0 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -12,15 +12,15 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 AUTOMAKE_OPTIONS = gnits 1.8 
-ACLOCAL_AMFLAGS = -I m4 -I am 
+ACLOCAL_AMFLAGS = -I m4 -I am -I gint
 
-SUBDIRS=src elisp data scm xml html-files po
+SUBDIRS=gint src elisp data scm xml html-files po
 
 htmldir = $(HTMLDIR)
 
 html_DATA = style.css .htaccess maint.css index.html maint.html
 EXTRA_DIST=.htaccess.in maint.css index.html maint.html
 
diff --git a/autogen.sh b/autogen.sh
index 1f3cdfc..c63ecd6 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -1,8 +1,16 @@
 #! /bin/sh
 
+git submodule init
+git submodule update
+
+cat > ChangeLog <<EOT
+This file is a placeholder. It will be replaced with the actual ChangeLog
+by make.
+EOT
+
 if [ ! -d html ]; then
 	mkdir html
 fi
 if [ ! -d tmp ]; then
 	mkdir tmp
 fi
diff --git a/configure.ac b/configure.ac
index 540b4f6..e545dfa 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,8 +1,8 @@
 # This file is part of Ellinika         -*- autoconf -*-
-# Copyright (C) 2004, 2005, 2007, 2008, 2010 Sergey Poznyakoff
+# Copyright (C) 2004, 2005, 2007, 2008, 2010, 2015 Sergey Poznyakoff
 #
 # Ellinika is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 # the Free Software Foundation; either version 3 of the License, or
 # (at your option) any later version.
 #
@@ -14,13 +14,13 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 
 AC_PREREQ(2.61)
 
-AC_REVISION(2015-01-06 13:50:03 gray)
+AC_REVISION(2015-01-06 14:33:57 gray)
 AC_INIT(ellinika, 1.99.99, [gray+ellinika@gnu.org.ua])
 AC_CONFIG_SRCDIR(src/cgi-bin/dict.scm4)
 AC_CONFIG_AUX_DIR([build-aux])
 AC_CANONICAL_SYSTEM
 AM_INIT_AUTOMAKE([1.11 silent-rules no-exeext])
 AM_CONFIG_HEADER([config.h])
@@ -38,24 +38,24 @@ M4='`cd $(top_srcdir); pwd`/scripts/missing --run m4'
 AC_SUBST(M4)
 
 AM_GNU_GETTEXT([external], [need-ngettext])
 
 AM_GNU_GETTEXT_VERSION([0.17])
 
-MU_CHECK_GUILE(,,
-               [AC_MSG_ERROR([You need Guile 1.8 or newer])])
+GINT_INIT(,[nodoc]) 
 
 RA_CHECK_LIB(mysqlclient, 
              mysql_real_connect, 
              [-lm],
              [],
  	     [AC_MSG_FAILURE([The required library libmysqlclient is not found or is unusable])],
              [/usr/local/lib/mysql /usr/lib/mysql])
 
 LIBS="$LIBS $ra_cv_lib_mysqlclient"
 
+
 ## **************
 ## Directories
 ## **************
 
 AC_SUBST(GUILE_BINDIR)
 GUILE_BINDIR=`guile-config info bindir`
@@ -130,12 +130,13 @@ AC_SUBST(lisp_LISP)
 
 AC_SUBST(AUTOGENERATED,
 	 ";;;; This file is generated automatically. Please do not edit. -*- buffer-read-only: t -*- vi: set ro:")
 
 AC_CONFIG_FILES(Makefile
 	        .htaccess
+		gint/Makefile
 		src/Makefile
                 src/cgi-bin/Makefile
                 src/ellinika/Makefile
                 elisp/Makefile
                 scm/Makefile
                 data/Makefile
diff --git a/gint b/gint
new file mode 160000
+Subproject fd86bf7d44b0c970771830692ae7491447ebe8b
diff --git a/scm/Makefile.am b/scm/Makefile.am
index 481676f..73b3e84 100644
--- a/scm/Makefile.am
+++ b/scm/Makefile.am
@@ -1,8 +1,8 @@
 # This file is part of Ellinika project.
-# Copyright (C) 2004, 2005, 2007 Sergey Poznyakoff
+# Copyright (C) 2004, 2005, 2007, 2015 Sergey Poznyakoff
 #
 # Ellinika is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 # the Free Software Foundation; either version 3 of the License, or
 # (at your option) any later version.
 #
@@ -17,23 +17,23 @@
 pkgmoddir=@GUILE_SITE@
 bin_SCRIPTS=dictrans neatrans verbop
 CLEANFILES=dictrans.sed dictrans neatrans verbop
 EXTRA_DIST=dictrans.scm
 
 dictrans.sed: Makefile
-	echo 's,=GUILE_BINDIR=,$(GUILE_BINDIR),' > $@
-	echo 's,=GUILE_SITE=,@GUILE_SITE@,' >> $@
-	echo 's,\;=GUILE_COMMENT=\;,@GUILE_COMMENT@,' >> $@
-	echo 's,=SYSCONFDIR=,$(sysconfdir),' >> $@
-	echo 's,=AUTOGENERATED=,@AUTOGENERATED@,' >> $@
+	$(AM_V_GEN){							\
+		echo 's,=GUILE_BINDIR=,$(GUILE_BINDIR),';		\
+		echo 's,=GUILE_SITE=,@GUILE_SITE@,';			\
+		echo 's,\;=GUILE_COMMENT=\;,@GUILE_COMMENT@,';		\
+		echo 's,=SYSCONFDIR=,$(sysconfdir),';			\
+		echo 's,=AUTOGENERATED=,@AUTOGENERATED@,';		\
+	} > dictrans.sed
+
+%: %.scm
+	$(AM_V_GEN)sed -f dictrans.sed $< > $@
+	@chmod +x $@
 
 dictrans: $(srcdir)/dictrans.scm dictrans.sed
-	sed -f dictrans.sed $(srcdir)/dictrans.scm > $@
-	chmod +x $@
 
 neatrans: $(srcdir)/neatrans.scm dictrans.sed
-	sed -f dictrans.sed $(srcdir)/neatrans.scm > $@
-	chmod +x $@
 
 verbop: $(srcdir)/verbop.scm dictrans.sed
-	sed -f dictrans.sed $(srcdir)/verbop.scm > $@
-	chmod +x $@
diff --git a/scm/dictrans.scm b/scm/dictrans.scm
index d76479e..2148929 100644
--- a/scm/dictrans.scm
+++ b/scm/dictrans.scm
@@ -87,13 +87,14 @@
 (set! %load-path (cons "/home/gray/linguae/ellinika/" %load-path))
 (use-modules (xmltools xmltrans)
              (gamma sql)
 	     (ellinika xlat)
 	     (ice-9 getopt-long))
 
-(use-syntax (ice-9 syncase))
+(if (= (string->number (major-version)) 1)
+    (use-modules (ice-9 syncase)))
 
 (define compile-only #f)
 (define cleanup-option #f)
 (define preserve-option #f)
 
 (define ellinika-sql-connection '())
diff --git a/scm/neatrans.scm b/scm/neatrans.scm
index e92e585..333453f 100644
--- a/scm/neatrans.scm
+++ b/scm/neatrans.scm
@@ -1,11 +1,11 @@
 #! =GUILE_BINDIR=/guile -s
 =AUTOGENERATED=
 !#
 ;;;; This file is part of Ellinika
-;;;; Copyright (C) 2006, 2007, 2010 Sergey Poznyakoff
+;;;; Copyright (C) 2006, 2007, 2010, 2015 Sergey Poznyakoff
 ;;;;
 ;;;; Ellinika is free software; you can redistribute it and/or modify
 ;;;; it under the terms of the GNU General Public License as published by
 ;;;; the Free Software Foundation; either version 3 of the License, or
 ;;;; (at your option) any later version.
 ;;;;
@@ -34,13 +34,14 @@
 (set! %load-path (cons "/home/gray/linguae/ellinika/" %load-path))
 (use-modules (xmltools xmltrans)
              (gamma sql)
 	     (ellinika xlat)
 	     (ice-9 getopt-long))
 
-(use-syntax (ice-9 syncase))
+(if (= (string->number (major-version)) 1)
+    (use-modules (ice-9 syncase)))
 
 (define compile-only #f)
 (define cleanup-option #f)
 (define force-option #f)
 (define verbose-option #f)
 (define debug-level 0)
diff --git a/src/cgi-bin/Makefile.am b/src/cgi-bin/Makefile.am
index 6b32b42..f085e57 100644
--- a/src/cgi-bin/Makefile.am
+++ b/src/cgi-bin/Makefile.am
@@ -1,8 +1,8 @@
 # This file is part of Ellinika project.
-# Copyright (C) 2004, 2005, 2007, 2008 Sergey Poznyakoff
+# Copyright (C) 2004, 2005, 2007, 2008, 2015 Sergey Poznyakoff
 #
 # Ellinika is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 # the Free Software Foundation; either version 3 of the License, or
 # (at your option) any later version.
 #
@@ -17,40 +17,42 @@
 cgidir=@CGIDIR@
 cgi_SCRIPTS=$(EXTRA_DIST:.scm4=.@SCRIPT_SUFFIX@)
 EXTRA_DIST=dict.scm4 nea.scm4 conj.scm4
 CLEANFILES=dict.m4 dict.scm nea.scm dict.cgi nea.cgi conj.cgi
 
 dict.m4: Makefile
-	echo 'divert(-1)' > $@
-	echo 'changequote([,])' >> $@
-	echo 'changecom([;],[' >> $@
-	echo '])' >> $@
-	echo 'undefine([format])' >> $@
-	echo 'define([IFACE], [$(APACHE_IFACE)])' >> $@
-	echo 'define([SCRIPT_SUFFIX], [@SCRIPT_SUFFIX@])'>>$@
-	echo 'define([GUILE_BINDIR], [$(GUILE_BINDIR)])' >> $@
-	echo 'define([GUILE_SITE], [@GUILE_SITE@])' >> $@
-	echo 'define([PACKAGE], [$(PACKAGE)])'>> $@
-	echo 'define([PREFIX], [$(prefix)])' >> $@
-	echo 'define([SYSCONFDIR], [$(sysconfdir)])' >> $@
-	echo 'define([LOCALEDIR], [$(datadir)/locale])' >> $@
-	echo 'define([HTMLDIR], [$(HTMLDIR)])' >> $@
-	echo 'divert(0)dnl' >> $@
-	echo 'ifelse(IFACE,[CGI],[#! $(GUILE_BINDIR)/guile -s]' >> $@
-	echo ')dnl' >> $@
-	echo '@AUTOGENERATED@' >> $@
-	echo 'ifelse(IFACE,[CGI],!#' >> $@
-	echo ')dnl' >> $@
+	$(AM_V_GEN){							\
+		echo 'divert(-1)';					\
+		echo 'changequote([,])';				\
+		echo 'changecom([;],[';					\
+		echo '])';						\
+		echo 'undefine([format])';				\
+		echo 'define([IFACE], [$(APACHE_IFACE)])';		\
+		echo 'define([SCRIPT_SUFFIX], [@SCRIPT_SUFFIX@])';	\
+		echo 'define([GUILE_BINDIR], [$(GUILE_BINDIR)])';	\
+		echo 'define([GUILE_SITE], [@GUILE_SITE@])';		\
+		echo 'define([PACKAGE], [$(PACKAGE)])';			\
+		echo 'define([PREFIX], [$(prefix)])';			\
+		echo 'define([SYSCONFDIR], [$(sysconfdir)])';		\
+		echo 'define([LOCALEDIR], [$(datadir)/locale])';	\
+		echo 'define([HTMLDIR], [$(HTMLDIR)])';			\
+		echo 'divert(0)dnl';					\
+		echo 'ifelse(IFACE,[CGI],[#! $(GUILE_BINDIR)/guile -s]';\
+		echo ')dnl';						\
+		echo '@AUTOGENERATED@';					\
+		echo 'ifelse(IFACE,[CGI],!#';				\
+		echo ')dnl';						\
+	} > dict.m4
 
 SUFFIXES = .scm4 .scm .cgi
 
 .scm4.scm:
-	m4 dict.m4 $< > $@ 
+	$(AM_V_GEN)m4 dict.m4 $< > $@ 
 
 .scm.cgi:
-	cp $< $@
+	$(AM_V_GEN)cp $< $@
 
 dict.scm: dict.scm4 dict.m4
 nea.scm: nea.scm4 dict.m4
 conj.scm: conj.scm4 dict.m4
 
 dict.cgi: dict.scm
diff --git a/src/ellinika/Makefile.am b/src/ellinika/Makefile.am
index 12e0392..5f476ef 100644
--- a/src/ellinika/Makefile.am
+++ b/src/ellinika/Makefile.am
@@ -1,8 +1,8 @@
 # This file is part of Ellinika project.
-# Copyright (C) 2004,2006,2007,2008,2011 Sergey Poznyakoff
+# Copyright (C) 2004, 2006-2008, 2011, 2015 Sergey Poznyakoff
 #
 # Ellinika is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 # the Free Software Foundation; either version 3 of the License, or
 # (at your option) any later version.
 #
@@ -11,48 +11,50 @@
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-guiledir=$(GUILE_SITE)/$(PACKAGE)
-guile_DATA=\
+sitedir=$(GUILE_SITE)/$(PACKAGE)
+site_DATA=\
  xlat.scm\
  cgi.scm\
  i18n.scm\
  config.scm\
  dico.scm\
  elmorph.scm\
  tenses.scm\
  sql.scm\
  conjugator.scm
 
 cgi.m4: Makefile
-	echo 'divert(-1)' > $@
-	echo 'changequote([,])' >> $@
-	echo 'changecom([;],[' >> $@
-	echo '])' >> $@
-	echo 'undefine([format])' >> $@
-	echo 'define([IFACE],[$(APACHE_IFACE)])' >> $@
-	echo 'define([SCRIPT_SUFFIX], [@SCRIPT_SUFFIX@])'>>$@
-	echo 'define([GUILE_BINDIR],[$(GUILE_BINDIR)])' >> $@
-	echo 'define([GUILE_SITE],[@GUILE_SITE@])' >> $@
-	echo 'define([PACKAGE],[$(PACKAGE)])'>> $@
-	echo 'define([PREFIX],[$(prefix)])' >> $@
-	echo 'define([SYSCONFDIR],[$(sysconfdir)])' >> $@
-	echo 'define([LOCALEDIR],[$(datadir)/locale])' >> $@
-	echo 'define([HTMLDIR],[$(HTMLDIR)])' >> $@
-	echo 'define([VERSION],[$(VERSION)])' >> $@
-	echo 'define([LIBDIR],[$(pkglibdir)])' >> $@
-	echo 'divert(0)dnl' >> $@
-	echo '@AUTOGENERATED@' >> $@
+	$(AM_V_GEN){							\
+		echo 'divert(-1)';					\
+		echo 'changequote([,])';				\
+		echo 'changecom([;],[';					\
+		echo '])';						\
+		echo 'undefine([format])';				\
+		echo 'define([IFACE],[$(APACHE_IFACE)])';		\
+		echo 'define([SCRIPT_SUFFIX], [@SCRIPT_SUFFIX@])';	\
+		echo 'define([GUILE_BINDIR],[$(GUILE_BINDIR)])';	\
+		echo 'define([GUILE_SITE],[@GUILE_SITE@])';		\
+		echo 'define([PACKAGE],[$(PACKAGE)])';			\
+		echo 'define([PREFIX],[$(prefix)])';			\
+		echo 'define([SYSCONFDIR],[$(sysconfdir)])';		\
+		echo 'define([LOCALEDIR],[$(datadir)/locale])';		\
+		echo 'define([HTMLDIR],[$(HTMLDIR)])';			\
+		echo 'define([VERSION],[$(VERSION)])';			\
+		echo 'define([LIBDIR],[$(pkglibdir)])';			\
+		echo 'divert(0)dnl';					\
+		echo '@AUTOGENERATED@';					\
+	} > cgi.m4
 
 SUFFIXES = .scm4 .scm .x
 
 .scm4.scm:
-	m4 -I$(srcdir) cgi.m4 $< > $@ 
+	$(AM_V_GEN)m4 -I$(srcdir) cgi.m4 $< > $@ 
 
 cgi.scm: cgi.scm4 cgi.m4
 config.scm: config.scm4 cgi.m4
 elmorph.scm: elmorph.scm4 elmorph-public.scm cgi.m4
 
 pkglib_LTLIBRARIES=libelmorph.la
@@ -65,23 +67,15 @@ libelmorph_la_SOURCES = \
  elmorph.c\
  elmorph.h\
  phoneme.y\
  syllabificator.c
 
 DOT_X_FILES = elmorph.x utf8scm.x
-
 BUILT_SOURCES = $(DOT_X_FILES)
-
 DISTCLEANFILES = $(DOT_X_FILES)
 
-snarfcppopts = $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-
-.c.x:
-	AWK=$(AWK) \
-	 guile-snarf -o $@ $< $(snarfcppopts)
-
 pkglibnames=elmorph
 
 install-data-hook:
 	here=`pwd`; \
 	 cd $(DESTDIR)$(pkglibdir);\
 	 for name in $(pkglibnames); do \
@@ -92,7 +86,13 @@ install-data-hook:
 	   fi; \
 	 done; \
 	 cd $$here
 
 AM_YFLAGS = -d
 YACCCOMPILE = $(srcdir)/yyrename '$(YACC) $(YFLAGS) $(AM_YFLAGS)'
-EXTRA_DIST = yyrename elmorph-public.scm
\ No newline at end of file
+EXTRA_DIST = yyrename elmorph-public.scm
+
+AM_CPPFLAGS=-I.
+CLEANFILES=
+MAINTAINERCLEANFILES=
+include ../../gint/gint.mk
+
diff --git a/src/ellinika/conjugator.scm b/src/ellinika/conjugator.scm
index eae4ad0..f8b1eb0 100644
--- a/src/ellinika/conjugator.scm
+++ b/src/ellinika/conjugator.scm
@@ -20,13 +20,14 @@
 (use-modules (srfi srfi-1)
 	     (ellinika elmorph)
              (ellinika i18n)
 	     (ellinika tenses)
 	     (ellinika sql))
 
-(use-syntax (ice-9 syncase))
+(if (= (string->number (major-version)) 1)
+    (use-modules (ice-9 syncase)))
 
 
 ;; Verb info
 ;;  #:verb  - Verb in dictionary form
 ;;  #:conj  - Conjugation class
 ;;
diff --git a/src/ellinika/elmorph.c b/src/ellinika/elmorph.c
index a06d43b..5094db8 100644
--- a/src/ellinika/elmorph.c
+++ b/src/ellinika/elmorph.c
@@ -1,8 +1,8 @@
 /* This file is part of Ellinika project.
-   Copyright (C) 2011 Sergey Poznyakoff
+   Copyright (C) 2011, 2015 Sergey Poznyakoff
 
    Ellinika is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
    the Free Software Foundation; either version 3 of the License, or
    (at your option) any later version.
 
@@ -25,29 +25,29 @@
 
 struct elstr {
 	unsigned *str;          /* UTF-8 string */
 	size_t len;             /* Its length */
 
 	struct phoneme *phoneme;   /* Phonetical map*/
-	unsigned phoneme_count;    /* Number of phonemes */ 
+	size_t phoneme_count;      /* Number of phonemes */ 
 
 	struct syllable *sylmap;   /* Syllable map (nsyl elements) */
-	unsigned nsyl;          /* Number of syllables. */
+	size_t nsyl;               /* Number of syllables. */
 	unsigned acc_syl;       /* Number of the accented syllable
 				   (1-based, from the last syllable) */ 
         unsigned acc_pos;       /* Number of the accented character
 				   (0-based, from str[0]) */
 	
 };
 
 scm_t_bits _elstr_tag;
 
 static void
 _elstr_syllabize(struct elstr *elstr, const char *func_name)
 {
-	unsigned i;
+	size_t i;
 	
 	free(elstr->phoneme);
 	free(elstr->sylmap);
 
 	if (phoneme_map(&elstr->phoneme, &elstr->phoneme_count,
 			elstr->str, elstr->len))
@@ -193,13 +193,13 @@ _elstr_free(SCM smob)
 }
 
 static int
 _elstr_print(SCM smob, SCM port, scm_print_state *pstate)
 {
 	struct elstr *elstr = (struct elstr *) SCM_CDR(smob);
-	int i, j;
+	size_t i, j;
 	char *s;
 	
 	scm_puts("#<elstr ", port);
 	if (elstr->sylmap) {
 		scm_puts("``", port);
 		for (i = 0; i < elstr->nsyl; i++) {
diff --git a/src/ellinika/i18n.scm b/src/ellinika/i18n.scm
index 474c8c9..c05d727 100644
--- a/src/ellinika/i18n.scm
+++ b/src/ellinika/i18n.scm
@@ -20,13 +20,12 @@
   #:export (locale-setup))
 
 (define-syntax _ 
   (syntax-rules ()
    ((_ msg) (gettext msg))))
 
-
 ;;; ISO 639 language code => ISO 3166 country code
 ;;; The corresponding country codes where selected using the following
 ;;; principles:
 ;;;  1. If the language is spoken in only one country, this country code is
 ;;;     used.
 ;;;  2. If the language is spoken in more than one country, select the code of
diff --git a/xml/Makefile.am b/xml/Makefile.am
index 3ec5c4d..151d03d 100644
--- a/xml/Makefile.am
+++ b/xml/Makefile.am
@@ -1,8 +1,8 @@
 # This file is part of Ellinika project.
-# Copyright (C) 2004, 2006, 2007 Sergey Poznyakoff
+# Copyright (C) 2004, 2006, 2007, 2015 Sergey Poznyakoff
 #
 # Ellinika is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 # the Free Software Foundation; either version 3 of the License, or
 # (at your option) any later version.
 #
@@ -18,19 +18,21 @@ EXTRA_DIST = COPYING.FDL lingua.conf.in
 SUBDIRS = . pl ru uk
 DISTCLEANFILES=lingua.conf
 CLEANFILES=conf.sed
 noinst_DATA= lingua.conf
 
 conf.sed: Makefile
-	echo 's,=TMPDIR=,$(top_builddir)/../tmp,g' > conf.sed
-	echo 's,=OUTDIR=,$(top_builddir)/../html,g' >> conf.sed
-	echo 's,=TARGET_DIR=,$(TARGET_DIR),g' >> conf.sed
-	echo 's,=SCRIPT_SUFFIX=,$(SCRIPT_SUFFIX),g' >> conf.sed
-	echo 's,=SCRIPT_DIR=,$(SCRIPT_DIR),g' >> conf.sed
-	echo 's,=BASE_HREF=,$(BASE_HREF),g' >> conf.sed
-	echo 's,=PACKAGE_BUGREPORT=,$(PACKAGE_BUGREPORT),g' >> conf.sed
-	echo 's,=PROD_URL=,$(PROD_URL),g' >> conf.sed
-	echo 's,=EXP_URL=,$(EXP_URL),g' >> conf.sed
+	$(AM_V_GEN){							\
+		echo 's,=TMPDIR=,$(top_builddir)/../tmp,g';		\
+		echo 's,=OUTDIR=,$(top_builddir)/../html,g';		\
+		echo 's,=TARGET_DIR=,$(TARGET_DIR),g';			\
+		echo 's,=SCRIPT_SUFFIX=,$(SCRIPT_SUFFIX),g';		\
+		echo 's,=SCRIPT_DIR=,$(SCRIPT_DIR),g';			\
+		echo 's,=BASE_HREF=,$(BASE_HREF),g';			\
+		echo 's,=PACKAGE_BUGREPORT=,$(PACKAGE_BUGREPORT),g';	\
+		echo 's,=PROD_URL=,$(PROD_URL),g';			\
+		echo 's,=EXP_URL=,$(EXP_URL),g';			\
+	} > conf.sed
 
 lingua.conf: $(srcdir)/lingua.conf.in conf.sed
-	sed -f conf.sed $(srcdir)/lingua.conf.in > $@
+	$(AM_V_GEN)sed -f conf.sed $(srcdir)/lingua.conf.in > $@
 
diff --git a/xml/pl/Makefile.am b/xml/pl/Makefile.am
index 1dcc4dd..b4fb8d4 100644
--- a/xml/pl/Makefile.am
+++ b/xml/pl/Makefile.am
@@ -1,8 +1,8 @@
 # This file is part of Ellinika project.
-# Copyright (C) 2006-2011 Sergey Poznyakoff
+# Copyright (C) 2006-2011, 2015 Sergey Poznyakoff
 #
 # Ellinika is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 # the Free Software Foundation; either version 3 of the License, or
 # (at your option) any later version.
 #
@@ -41,8 +41,8 @@ EXTRA_DIST=\
 
 CLEANFILES=stamp-lingua 
 
 all: stamp-lingua
 
 stamp-lingua: $(EXTRA_DIST) ../lingua.conf
-	xmlt lingua -D STATE=$(STATE) -D VCSID="`git describe --always`" --config-file ../lingua.conf ellinika.xml && echo "timestamp" > stamp-lingua
+	$(AM_V_GEN)LC_ALL=en_US.UTF-8 xmlt lingua -D STATE=$(STATE) -D VCSID="`git describe --always`" --config-file ../lingua.conf ellinika.xml && echo "timestamp" > stamp-lingua
 
diff --git a/xml/ru/Makefile.am b/xml/ru/Makefile.am
index d64f4cc..3bf9e85 100644
--- a/xml/ru/Makefile.am
+++ b/xml/ru/Makefile.am
@@ -1,8 +1,8 @@
 # This file is part of Ellinika project.
-# Copyright (C) 2004-2011 Sergey Poznyakoff
+# Copyright (C) 2004-2011, 2015 Sergey Poznyakoff
 #
 # Ellinika is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 # the Free Software Foundation; either version 3 of the License, or
 # (at your option) any later version.
 #
@@ -41,8 +41,8 @@ EXTRA_DIST=\
 
 CLEANFILES=stamp-lingua
 
 all: stamp-lingua
 
 stamp-lingua: $(EXTRA_DIST) ../lingua.conf
-	xmlt lingua -D STATE=$(STATE) -D VCSID="`git describe --always`" --config-file ../lingua.conf ellinika.xml && echo "timestamp" > stamp-lingua
+	$(AM_V_GEN)LC_ALL=en_US.UTF-8 xmlt lingua -D STATE=$(STATE) -D VCSID="`git describe --always`" --config-file ../lingua.conf ellinika.xml && echo "timestamp" > stamp-lingua
 
diff --git a/xml/uk/Makefile.am b/xml/uk/Makefile.am
index 1dcc4dd..b4fb8d4 100644
--- a/xml/uk/Makefile.am
+++ b/xml/uk/Makefile.am
@@ -1,8 +1,8 @@
 # This file is part of Ellinika project.
-# Copyright (C) 2006-2011 Sergey Poznyakoff
+# Copyright (C) 2006-2011, 2015 Sergey Poznyakoff
 #
 # Ellinika is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 # the Free Software Foundation; either version 3 of the License, or
 # (at your option) any later version.
 #
@@ -41,8 +41,8 @@ EXTRA_DIST=\
 
 CLEANFILES=stamp-lingua 
 
 all: stamp-lingua
 
 stamp-lingua: $(EXTRA_DIST) ../lingua.conf
-	xmlt lingua -D STATE=$(STATE) -D VCSID="`git describe --always`" --config-file ../lingua.conf ellinika.xml && echo "timestamp" > stamp-lingua
+	$(AM_V_GEN)LC_ALL=en_US.UTF-8 xmlt lingua -D STATE=$(STATE) -D VCSID="`git describe --always`" --config-file ../lingua.conf ellinika.xml && echo "timestamp" > stamp-lingua