diff options
-rw-r--r-- | .gitmodules | 3 | ||||
-rw-r--r-- | Makefile.am | 4 | ||||
-rwxr-xr-x | autogen.sh | 8 | ||||
-rw-r--r-- | configure.ac | 9 | ||||
m--------- | gint | 0 | ||||
-rw-r--r-- | scm/Makefile.am | 24 | ||||
-rw-r--r-- | scm/dictrans.scm | 3 | ||||
-rw-r--r-- | scm/neatrans.scm | 5 | ||||
-rw-r--r-- | src/cgi-bin/Makefile.am | 48 | ||||
-rw-r--r-- | src/ellinika/Makefile.am | 62 | ||||
-rw-r--r-- | src/ellinika/conjugator.scm | 3 | ||||
-rw-r--r-- | src/ellinika/elmorph.c | 10 | ||||
-rw-r--r-- | src/ellinika/i18n.scm | 1 | ||||
-rw-r--r-- | xml/Makefile.am | 24 | ||||
-rw-r--r-- | xml/pl/Makefile.am | 4 | ||||
-rw-r--r-- | xml/ru/Makefile.am | 4 | ||||
-rw-r--r-- | xml/uk/Makefile.am | 4 |
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 @@ | |||
1 | [submodule "gint"] | ||
2 | path = gint | ||
3 | 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 | |||
@@ -15,9 +15,9 @@ | |||
15 | # along with this program. If not, see <http://www.gnu.org/licenses/>. | 15 | # along with this program. If not, see <http://www.gnu.org/licenses/>. |
16 | 16 | ||
17 | AUTOMAKE_OPTIONS = gnits 1.8 | 17 | AUTOMAKE_OPTIONS = gnits 1.8 |
18 | ACLOCAL_AMFLAGS = -I m4 -I am | 18 | ACLOCAL_AMFLAGS = -I m4 -I am -I gint |
19 | 19 | ||
20 | SUBDIRS=src elisp data scm xml html-files po | 20 | SUBDIRS=gint src elisp data scm xml html-files po |
21 | 21 | ||
22 | htmldir = $(HTMLDIR) | 22 | htmldir = $(HTMLDIR) |
23 | 23 | ||
@@ -1,5 +1,13 @@ | |||
1 | #! /bin/sh | 1 | #! /bin/sh |
2 | 2 | ||
3 | git submodule init | ||
4 | git submodule update | ||
5 | |||
6 | cat > ChangeLog <<EOT | ||
7 | This file is a placeholder. It will be replaced with the actual ChangeLog | ||
8 | by make. | ||
9 | EOT | ||
10 | |||
3 | if [ ! -d html ]; then | 11 | if [ ! -d html ]; then |
4 | mkdir html | 12 | mkdir html |
5 | fi | 13 | fi |
diff --git a/configure.ac b/configure.ac index 540b4f6..e545dfa 100644 --- a/configure.ac +++ b/configure.ac | |||
@@ -1,5 +1,5 @@ | |||
1 | # This file is part of Ellinika -*- autoconf -*- | 1 | # This file is part of Ellinika -*- autoconf -*- |
2 | # Copyright (C) 2004, 2005, 2007, 2008, 2010 Sergey Poznyakoff | 2 | # Copyright (C) 2004, 2005, 2007, 2008, 2010, 2015 Sergey Poznyakoff |
3 | # | 3 | # |
4 | # Ellinika is free software; you can redistribute it and/or modify | 4 | # Ellinika is free software; you can redistribute it and/or modify |
5 | # it under the terms of the GNU General Public License as published by | 5 | # it under the terms of the GNU General Public License as published by |
@@ -17,7 +17,7 @@ | |||
17 | 17 | ||
18 | AC_PREREQ(2.61) | 18 | AC_PREREQ(2.61) |
19 | 19 | ||
20 | AC_REVISION(2015-01-06 13:50:03 gray) | 20 | AC_REVISION(2015-01-06 14:33:57 gray) |
21 | AC_INIT(ellinika, 1.99.99, [gray+ellinika@gnu.org.ua]) | 21 | AC_INIT(ellinika, 1.99.99, [gray+ellinika@gnu.org.ua]) |
22 | AC_CONFIG_SRCDIR(src/cgi-bin/dict.scm4) | 22 | AC_CONFIG_SRCDIR(src/cgi-bin/dict.scm4) |
23 | AC_CONFIG_AUX_DIR([build-aux]) | 23 | AC_CONFIG_AUX_DIR([build-aux]) |
@@ -41,8 +41,7 @@ AM_GNU_GETTEXT([external], [need-ngettext]) | |||
41 | 41 | ||
42 | AM_GNU_GETTEXT_VERSION([0.17]) | 42 | AM_GNU_GETTEXT_VERSION([0.17]) |
43 | 43 | ||
44 | MU_CHECK_GUILE(,, | 44 | GINT_INIT(,[nodoc]) |
45 | [AC_MSG_ERROR([You need Guile 1.8 or newer])]) | ||
46 | 45 | ||
47 | RA_CHECK_LIB(mysqlclient, | 46 | RA_CHECK_LIB(mysqlclient, |
48 | mysql_real_connect, | 47 | mysql_real_connect, |
@@ -53,6 +52,7 @@ RA_CHECK_LIB(mysqlclient, | |||
53 | 52 | ||
54 | LIBS="$LIBS $ra_cv_lib_mysqlclient" | 53 | LIBS="$LIBS $ra_cv_lib_mysqlclient" |
55 | 54 | ||
55 | |||
56 | ## ************** | 56 | ## ************** |
57 | ## Directories | 57 | ## Directories |
58 | ## ************** | 58 | ## ************** |
@@ -133,6 +133,7 @@ AC_SUBST(AUTOGENERATED, | |||
133 | 133 | ||
134 | AC_CONFIG_FILES(Makefile | 134 | AC_CONFIG_FILES(Makefile |
135 | .htaccess | 135 | .htaccess |
136 | gint/Makefile | ||
136 | src/Makefile | 137 | src/Makefile |
137 | src/cgi-bin/Makefile | 138 | src/cgi-bin/Makefile |
138 | src/ellinika/Makefile | 139 | src/ellinika/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,5 +1,5 @@ | |||
1 | # This file is part of Ellinika project. | 1 | # This file is part of Ellinika project. |
2 | # Copyright (C) 2004, 2005, 2007 Sergey Poznyakoff | 2 | # Copyright (C) 2004, 2005, 2007, 2015 Sergey Poznyakoff |
3 | # | 3 | # |
4 | # Ellinika is free software; you can redistribute it and/or modify | 4 | # Ellinika is free software; you can redistribute it and/or modify |
5 | # it under the terms of the GNU General Public License as published by | 5 | # it under the terms of the GNU General Public License as published by |
@@ -20,20 +20,20 @@ CLEANFILES=dictrans.sed dictrans neatrans verbop | |||
20 | EXTRA_DIST=dictrans.scm | 20 | EXTRA_DIST=dictrans.scm |
21 | 21 | ||
22 | dictrans.sed: Makefile | 22 | dictrans.sed: Makefile |
23 | echo 's,=GUILE_BINDIR=,$(GUILE_BINDIR),' > $@ | 23 | $(AM_V_GEN){ \ |
24 | echo 's,=GUILE_SITE=,@GUILE_SITE@,' >> $@ | 24 | echo 's,=GUILE_BINDIR=,$(GUILE_BINDIR),'; \ |
25 | echo 's,\;=GUILE_COMMENT=\;,@GUILE_COMMENT@,' >> $@ | 25 | echo 's,=GUILE_SITE=,@GUILE_SITE@,'; \ |
26 | echo 's,=SYSCONFDIR=,$(sysconfdir),' >> $@ | 26 | echo 's,\;=GUILE_COMMENT=\;,@GUILE_COMMENT@,'; \ |
27 | echo 's,=AUTOGENERATED=,@AUTOGENERATED@,' >> $@ | 27 | echo 's,=SYSCONFDIR=,$(sysconfdir),'; \ |
28 | echo 's,=AUTOGENERATED=,@AUTOGENERATED@,'; \ | ||
29 | } > dictrans.sed | ||
30 | |||
31 | %: %.scm | ||
32 | $(AM_V_GEN)sed -f dictrans.sed $< > $@ | ||
33 | @chmod +x $@ | ||
28 | 34 | ||
29 | dictrans: $(srcdir)/dictrans.scm dictrans.sed | 35 | dictrans: $(srcdir)/dictrans.scm dictrans.sed |
30 | sed -f dictrans.sed $(srcdir)/dictrans.scm > $@ | ||
31 | chmod +x $@ | ||
32 | 36 | ||
33 | neatrans: $(srcdir)/neatrans.scm dictrans.sed | 37 | neatrans: $(srcdir)/neatrans.scm dictrans.sed |
34 | sed -f dictrans.sed $(srcdir)/neatrans.scm > $@ | ||
35 | chmod +x $@ | ||
36 | 38 | ||
37 | verbop: $(srcdir)/verbop.scm dictrans.sed | 39 | verbop: $(srcdir)/verbop.scm dictrans.sed |
38 | sed -f dictrans.sed $(srcdir)/verbop.scm > $@ | ||
39 | chmod +x $@ | ||
diff --git a/scm/dictrans.scm b/scm/dictrans.scm index d76479e..2148929 100644 --- a/scm/dictrans.scm +++ b/scm/dictrans.scm | |||
@@ -90,7 +90,8 @@ | |||
90 | (ellinika xlat) | 90 | (ellinika xlat) |
91 | (ice-9 getopt-long)) | 91 | (ice-9 getopt-long)) |
92 | 92 | ||
93 | (use-syntax (ice-9 syncase)) | 93 | (if (= (string->number (major-version)) 1) |
94 | (use-modules (ice-9 syncase))) | ||
94 | 95 | ||
95 | (define compile-only #f) | 96 | (define compile-only #f) |
96 | (define cleanup-option #f) | 97 | (define cleanup-option #f) |
diff --git a/scm/neatrans.scm b/scm/neatrans.scm index e92e585..333453f 100644 --- a/scm/neatrans.scm +++ b/scm/neatrans.scm | |||
@@ -2,7 +2,7 @@ | |||
2 | =AUTOGENERATED= | 2 | =AUTOGENERATED= |
3 | !# | 3 | !# |
4 | ;;;; This file is part of Ellinika | 4 | ;;;; This file is part of Ellinika |
5 | ;;;; Copyright (C) 2006, 2007, 2010 Sergey Poznyakoff | 5 | ;;;; Copyright (C) 2006, 2007, 2010, 2015 Sergey Poznyakoff |
6 | ;;;; | 6 | ;;;; |
7 | ;;;; Ellinika is free software; you can redistribute it and/or modify | 7 | ;;;; Ellinika is free software; you can redistribute it and/or modify |
8 | ;;;; it under the terms of the GNU General Public License as published by | 8 | ;;;; it under the terms of the GNU General Public License as published by |
@@ -37,7 +37,8 @@ | |||
37 | (ellinika xlat) | 37 | (ellinika xlat) |
38 | (ice-9 getopt-long)) | 38 | (ice-9 getopt-long)) |
39 | 39 | ||
40 | (use-syntax (ice-9 syncase)) | 40 | (if (= (string->number (major-version)) 1) |
41 | (use-modules (ice-9 syncase))) | ||
41 | 42 | ||
42 | (define compile-only #f) | 43 | (define compile-only #f) |
43 | (define cleanup-option #f) | 44 | (define cleanup-option #f) |
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,5 +1,5 @@ | |||
1 | # This file is part of Ellinika project. | 1 | # This file is part of Ellinika project. |
2 | # Copyright (C) 2004, 2005, 2007, 2008 Sergey Poznyakoff | 2 | # Copyright (C) 2004, 2005, 2007, 2008, 2015 Sergey Poznyakoff |
3 | # | 3 | # |
4 | # Ellinika is free software; you can redistribute it and/or modify | 4 | # Ellinika is free software; you can redistribute it and/or modify |
5 | # it under the terms of the GNU General Public License as published by | 5 | # it under the terms of the GNU General Public License as published by |
@@ -20,34 +20,36 @@ EXTRA_DIST=dict.scm4 nea.scm4 conj.scm4 | |||
20 | CLEANFILES=dict.m4 dict.scm nea.scm dict.cgi nea.cgi conj.cgi | 20 | CLEANFILES=dict.m4 dict.scm nea.scm dict.cgi nea.cgi conj.cgi |
21 | 21 | ||
22 | dict.m4: Makefile | 22 | dict.m4: Makefile |
23 | echo 'divert(-1)' > $@ | 23 | $(AM_V_GEN){ \ |
24 | echo 'changequote([,])' >> $@ | 24 | echo 'divert(-1)'; \ |
25 | echo 'changecom([;],[' >> $@ | 25 | echo 'changequote([,])'; \ |
26 | echo '])' >> $@ | 26 | echo 'changecom([;],['; \ |
27 | echo 'undefine([format])' >> $@ | 27 | echo '])'; \ |
28 | echo 'define([IFACE], [$(APACHE_IFACE)])' >> $@ | 28 | echo 'undefine([format])'; \ |
29 | echo 'define([SCRIPT_SUFFIX], [@SCRIPT_SUFFIX@])'>>$@ | 29 | echo 'define([IFACE], [$(APACHE_IFACE)])'; \ |
30 | echo 'define([GUILE_BINDIR], [$(GUILE_BINDIR)])' >> $@ | 30 | echo 'define([SCRIPT_SUFFIX], [@SCRIPT_SUFFIX@])'; \ |
31 | echo 'define([GUILE_SITE], [@GUILE_SITE@])' >> $@ | 31 | echo 'define([GUILE_BINDIR], [$(GUILE_BINDIR)])'; \ |
32 | echo 'define([PACKAGE], [$(PACKAGE)])'>> $@ | 32 | echo 'define([GUILE_SITE], [@GUILE_SITE@])'; \ |
33 | echo 'define([PREFIX], [$(prefix)])' >> $@ | 33 | echo 'define([PACKAGE], [$(PACKAGE)])'; \ |
34 | echo 'define([SYSCONFDIR], [$(sysconfdir)])' >> $@ | 34 | echo 'define([PREFIX], [$(prefix)])'; \ |
35 | echo 'define([LOCALEDIR], [$(datadir)/locale])' >> $@ | 35 | echo 'define([SYSCONFDIR], [$(sysconfdir)])'; \ |