aboutsummaryrefslogtreecommitdiff
path: root/src/ellinika
diff options
context:
space:
mode:
authorSergey Poznyakoff <gray@gnu.org>2015-01-06 21:44:01 +0200
committerSergey Poznyakoff <gray@gnu.org>2015-01-06 21:44:01 +0200
commit5dfd8dd432785ca8d8b6d2c11bac9e110feda52b (patch)
treebfe12bf71b50e7916ab5b957ba216def8c41cbf9 /src/ellinika
parentc5e668cfd92985ff7e3e4be7c6be8c3ea3e6d57f (diff)
downloadellinika-5dfd8dd432785ca8d8b6d2c11bac9e110feda52b.tar.gz
ellinika-5dfd8dd432785ca8d8b6d2c11bac9e110feda52b.tar.bz2
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.
Diffstat (limited to 'src/ellinika')
-rw-r--r--src/ellinika/Makefile.am60
-rw-r--r--src/ellinika/conjugator.scm3
-rw-r--r--src/ellinika/elmorph.c10
-rw-r--r--src/ellinika/i18n.scm1
4 files changed, 37 insertions, 37 deletions
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,4 +1,4 @@
# 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
@@ -15,6 +15,6 @@
# 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\
@@ -28,27 +28,29 @@ 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)])'>> $@
- 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
@@ -69,15 +71,7 @@ libelmorph_la_SOURCES = \
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
@@ -97,2 +91,8 @@ AM_YFLAGS = -d
YACCCOMPILE = $(srcdir)/yyrename '$(YACC) $(YFLAGS) $(AM_YFLAGS)'
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
@@ -24,5 +24,6 @@
(ellinika sql))
-(use-syntax (ice-9 syncase))
+(if (= (string->number (major-version)) 1)
+ (use-modules (ice-9 syncase)))
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,4 +1,4 @@
/* 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
@@ -29,8 +29,8 @@ struct elstr {
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) */
@@ -45,5 +45,5 @@ static void
_elstr_syllabize(struct elstr *elstr, const char *func_name)
{
- unsigned i;
+ size_t i;
free(elstr->phoneme);
@@ -197,5 +197,5 @@ _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;
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
@@ -24,5 +24,4 @@
((_ msg) (gettext msg))))
-
;;; ISO 639 language code => ISO 3166 country code
;;; The corresponding country codes where selected using the following

Return to:

Send suggestions and report system problems to the System administrator.