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
@@ -17,5 +17,5 @@
 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
 
diff --git a/autogen.sh b/autogen.sh
index 1f3cdfc..c63ecd6 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -2,2 +2,10 @@
 
+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
diff --git a/configure.ac b/configure.ac
index 540b4f6..e545dfa 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,3 +1,3 @@
 # 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
 #
@@ -19,3 +19,3 @@ 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])
@@ -43,4 +43,3 @@ AM_GNU_GETTEXT_VERSION([0.17])
 
-MU_CHECK_GUILE(,,
-               [AC_MSG_ERROR([You need Guile 1.8 or newer])])
+GINT_INIT(,[nodoc]) 
 
@@ -55,2 +54,3 @@ LIBS="$LIBS $ra_cv_lib_mysqlclient"
 
+
 ## **************
@@ -135,2 +135,3 @@ AC_CONFIG_FILES(Makefile
                 .htaccess
+                gint/Makefile
                 src/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,3 +1,3 @@
 # This file is part of Ellinika project.
-# Copyright (C) 2004, 2005, 2007 Sergey Poznyakoff
+# Copyright (C) 2004, 2005, 2007, 2015 Sergey Poznyakoff
 #
@@ -22,18 +22,18 @@ 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
@@ -92,3 +92,4 @@
 
-(use-syntax (ice-9 syncase))
+(if (= (string->number (major-version)) 1)
+    (use-modules (ice-9 syncase)))
 
diff --git a/scm/neatrans.scm b/scm/neatrans.scm
index e92e585..333453f 100644
--- a/scm/neatrans.scm
+++ b/scm/neatrans.scm
@@ -4,3 +4,3 @@
 ;;;; This file is part of Ellinika
-;;;; Copyright (C) 2006, 2007, 2010 Sergey Poznyakoff
+;;;; Copyright (C) 2006, 2007, 2010, 2015 Sergey Poznyakoff
 ;;;;
@@ -39,3 +39,4 @@
 
-(use-syntax (ice-9 syncase))
+(if (= (string->number (major-version)) 1)
+    (use-modules (ice-9 syncase)))
 
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,3 +1,3 @@
 # This file is part of Ellinika project.
-# Copyright (C) 2004, 2005, 2007, 2008 Sergey Poznyakoff
+# Copyright (C) 2004, 2005, 2007, 2008, 2015 Sergey Poznyakoff
 #
@@ -22,22 +22,24 @@ 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
 
@@ -46,6 +48,6 @@ SUFFIXES = .scm4 .scm .cgi
 .scm4.scm:
-        m4 dict.m4 $< > $@ 
+        $(AM_V_GEN)m4 dict.m4 $< > $@ 
 
 .scm.cgi:
-        cp $< $@
+        $(AM_V_GEN)cp $< $@
 
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,3 +1,3 @@
 # 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
 #
@@ -16,4 +16,4 @@
 
-guiledir=$(GUILE_SITE)/$(PACKAGE)
-guile_DATA=\
+sitedir=$(GUILE_SITE)/$(PACKAGE)
+site_DATA=\
  xlat.scm\
@@ -29,20 +29,22 @@ guile_DATA=\
 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)])'>> $@
+        $(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@])';             \