diff options
-rw-r--r-- | Makefile.am | 3 | ||||
-rw-r--r-- | am/guile.m4 | 110 | ||||
-rw-r--r-- | configure.ac | 11 | ||||
-rw-r--r-- | data/db.struct | 6 | ||||
-rw-r--r-- | data/pl/Makefile.am | 4 | ||||
-rw-r--r-- | data/ru/Makefile.am | 4 | ||||
-rw-r--r-- | scm/dictrans.scm | 4 | ||||
-rw-r--r-- | scm/neatrans.scm | 2 | ||||
-rw-r--r-- | scm/verbop.scm | 4 | ||||
-rw-r--r-- | src/cgi-bin/conj.scm4 | 9 | ||||
-rw-r--r-- | src/cgi-bin/dict.scm4 | 28 | ||||
-rw-r--r-- | src/cgi-bin/nea.scm4 | 22 | ||||
-rw-r--r-- | src/ellinika/cgi.scm4 | 25 | ||||
-rw-r--r-- | src/ellinika/i18n.scm | 6 | ||||
-rw-r--r-- | xml/ru/ellinika.xml | 3 | ||||
-rw-r--r-- | xml/ru/rhmata.xml | 8 |
16 files changed, 91 insertions, 158 deletions
diff --git a/Makefile.am b/Makefile.am index 521b3e0..7fac923 100644 --- a/Makefile.am +++ b/Makefile.am | |||
@@ -40,9 +40,10 @@ install-html: | |||
40 | done; \ | 40 | done; \ |
41 | if test -r $$top_srcdir/xml/$$dir/symlinks; then \ | 41 | if test -r $$top_srcdir/xml/$$dir/symlinks; then \ |
42 | grep -v '^[ \t]*[;#]' $$top_srcdir/xml/$$dir/symlinks | \ | 42 | grep -v '^[ \t]*[;#]' $$top_srcdir/xml/$$dir/symlinks | \ |
43 | sed 's,^/,_,;s,\\.\\./,__/,g' | \ | 43 | sed 's,^/,_,;s,\\.\\./,__/,g' | \ |
44 | while read S T; do ln -sf $$S $$T; done; \ | 44 | (cd $(DESTDIR)$(HTMLDIR)/$$dir; \ |
45 | while read S T; do ln -sf $$S $$T; done); \ | ||
45 | fi; \ | 46 | fi; \ |
46 | cd $$here; \ | 47 | cd $$here; \ |
47 | fi; \ | 48 | fi; \ |
48 | done | 49 | done |
diff --git a/am/guile.m4 b/am/guile.m4 deleted file mode 100644 index c793a70..0000000 --- a/am/guile.m4 +++ /dev/null | |||
@@ -1,110 +0,0 @@ | |||
1 | dnl This file is part of GNU mailutils. | ||
2 | dnl Copyright (C) 2001,2004 Free Software Foundation, Inc. | ||
3 | dnl | ||
4 | dnl This program is free software; you can redistribute it and/or modify | ||
5 | dnl it under the terms of the GNU General Public License as published by | ||
6 | dnl the Free Software Foundation; either version 2 of the License, or | ||
7 | dnl (at your option) any later version. | ||
8 | dnl | ||
9 | dnl This program is distributed in the hope that it will be useful, | ||
10 | dnl but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
11 | dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
12 | dnl GNU General Public License for more details. | ||
13 | dnl | ||
14 | dnl You should have received a copy of the GNU General Public License | ||
15 | dnl along with this program; if not, write to the Free Software | ||
16 | dnl Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. | ||
17 | dnl | ||
18 | |||
19 | dnl MU_RESULT_ACTIONS -- generate shell code for the result of a test | ||
20 | dnl $1 -- CVAR -- cache variable to check | ||
21 | dnl $2 -- NAME -- if not empty, used to generate a default value TRUE: | ||
22 | dnl `AC_DEFINE(HAVE_NAME)' | ||
23 | dnl $2 -- TRUE -- what to do if the CVAR is not `no' | ||
24 | dnl $3 -- FALSE -- what to do otherwise; defaults to `:' | ||
25 | dnl | ||
26 | AC_DEFUN([MU_RESULT_ACTIONS], [ | ||
27 | [if test "$$1" != "" -a "$$1" != no; then | ||
28 | ]ifelse([$3], , | ||
29 | [AC_DEFINE(HAVE_]translit($2, [a-z ./<>], [A-Z___])[,1,[FIXME])], | ||
30 | [$3])[ | ||
31 | else | ||
32 | ]ifelse([$4], , [:], [$4])[ | ||
33 | fi]])dnl | ||
34 | |||
35 | AC_DEFUN([MU_CHECK_GUILE], | ||
36 | [ | ||
37 | if test "x$mu_cv_lib_guile" = x; then | ||
38 | cached="" | ||
39 | AC_PATH_PROG(GUILE_CONFIG, guile-config, no, $PATH) | ||
40 | if test $GUILE_CONFIG = no; then | ||
41 | mu_cv_lib_guile=no | ||
42 | else | ||
43 | GUILE_INCLUDES=`guile-config compile` | ||
44 | GUILE_LIBS=`guile-config link` | ||
45 | fi | ||
46 | |||
47 | if test $GUILE_CONFIG != no; then | ||
48 | AC_MSG_CHECKING(for guile version 1.6 or higher) | ||
49 | GUILE_VERSION=`($GUILE_CONFIG --version 2>&1; echo '')|sed -n 's/guile-config - Guile version \([[0-9]][[0-9]]*\)\.\([[0-9]][[0-9]]*\).*/\1\2/p'` | ||
50 | case "x$GUILE_VERSION" in | ||
51 | x[[0-9]]*) | ||
52 | if test $GUILE_VERSION -lt 16; then | ||
53 | AC_MSG_RESULT(Nope. Version number too low.) | ||
54 | mu_cv_lib_guile=no | ||
55 | else | ||
56 | AC_DEFINE_UNQUOTED(GUILE_VERSION, $GUILE_VERSION, | ||
57 | [Guile version number: MAX*10 + MIN]) | ||
58 | AC_MSG_RESULT(OK) | ||
59 | save_LIBS=$LIBS | ||
60 | save_CFLAGS=$CFLAGS | ||
61 | LIBS="$LIBS $GUILE_LIBS" | ||
62 | CFLAGS="$CFLAGS $GUILE_INCLUDES" | ||
63 | AC_TRY_LINK([#include <libguile.h>], | ||
64 | ifelse([$1], , scm_shell(0, NULL);, [$1]), | ||
65 | [mu_cv_lib_guile=yes], | ||
66 | [mu_cv_lib_guile=no]) | ||
67 | LIBS=$save_LIBS | ||
68 | CFLAGS=$save_CFLAGS | ||
69 | fi ;; | ||
70 | *) AC_MSG_RESULT(Nope. Unknown version number) | ||
71 | mu_cv_lib_guile=no;; | ||
72 | esac | ||
73 | fi | ||
74 | else | ||
75 | cached=" (cached) " | ||
76 | GUILE_INCLUDES=`$GUILE_CONFIG compile` | ||
77 | GUILE_LIBS=`$GUILE_CONFIG link` | ||
78 | fi | ||
79 | AC_MSG_CHECKING(whether to build guile support) | ||
80 | MU_RESULT_ACTIONS([mu_cv_lib_guile],[LIBGUILE],[$2],[$3]) | ||
81 | AC_MSG_RESULT(${cached}$mu_cv_lib_guile) | ||
82 | |||
83 | if test $mu_cv_lib_guile = yes; then | ||
84 | AC_ARG_WITH([guiledir], | ||
85 | AC_HELP_STRING([--with-guiledir=DIR], | ||
86 | [Specify the directory to install guile modules to]), | ||
87 | [case $withval in | ||
88 | /*) GUILE_SITE=$withval;; | ||
89 | yes) GUILE_SITE=`$GUILE_CONFIG info pkgdatadir`/site;; | ||
90 | *) AC_MSG_ERROR([Argument to --with-guiledir must be an absolute directory name]);; | ||
91 | esac], | ||
92 | [GUILE_SITE=`$GUILE_CONFIG info pkgdatadir`/site | ||
93 | pfx=$prefix | ||
94 | test "x$pfx" = xNONE && pfx=$ac_default_prefix | ||
95 | case $GUILE_SITE in | ||
96 | $pfx/*) ;; # OK | ||
97 | *) AC_MSG_WARN([guile site directory "$GUILE_SITE" lies outside your current prefix ($pfx).]) | ||
98 | GUILE_SITE='$(datadir)/guile/site' | ||
99 | AC_MSG_WARN([Falling back to ${GUILE_SITE} instead. Use --with-guiledir to force using site directory.]) | ||
100 | ;; | ||
101 | esac]) | ||
102 | fi | ||
103 | |||
104 | AC_SUBST(GUILE_SITE) | ||
105 | AC_SUBST(GUILE_INCLUDES) | ||
106 | AC_SUBST(GUILE_LIBS) | ||
107 | ]) | ||
108 | |||
109 | |||
110 | |||
diff --git a/configure.ac b/configure.ac index e545dfa..302f2df 100644 --- a/configure.ac +++ b/configure.ac | |||
@@ -16,9 +16,9 @@ | |||
16 | # | 16 | # |
17 | 17 | ||
18 | AC_PREREQ(2.61) | 18 | AC_PREREQ(2.61) |
19 | 19 | ||
20 | AC_REVISION(2015-01-06 14:33:57 gray) | 20 | AC_REVISION(2015-01-07 14:56:15 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]) |
24 | AC_CANONICAL_SYSTEM | 24 | AC_CANONICAL_SYSTEM |
@@ -57,9 +57,18 @@ LIBS="$LIBS $ra_cv_lib_mysqlclient" | |||
57 | ## Directories | 57 | ## Directories |
58 | ## ************** | 58 | ## ************** |
59 | 59 | ||
60 | AC_SUBST(GUILE_BINDIR) | 60 | AC_SUBST(GUILE_BINDIR) |
61 | |||
61 | GUILE_BINDIR=`guile-config info bindir` | 62 | GUILE_BINDIR=`guile-config info bindir` |
63 | if test -z "$GUILE_BINDIR"; then | ||
64 | GUILE_BINDIR=`guile-config info prefix` | ||
65 | if test -n "$GUILE_BINDIR"; then | ||
66 | GUILE_BINDIR="$GUILE_BINDIR/bin" | ||
67 | else | ||
68 | AC_MSG_ERROR([Cannot determine guile bin directory]) | ||
69 | fi | ||
70 | fi | ||
62 | 71 | ||
63 | case `guile -c "(display (member \"$GUILE_SITE\" %load-path))(newline)"` in | 72 | case `guile -c "(display (member \"$GUILE_SITE\" %load-path))(newline)"` in |
64 | \#f) GUILE_COMMENT=;; | 73 | \#f) GUILE_COMMENT=;; |
65 | *) GUILE_COMMENT=";;" ;; | 74 | *) GUILE_COMMENT=";;" ;; |
diff --git a/data/db.struct b/data/db.struct index 1b2f160..61e3d25 100644 --- a/data/db.struct +++ b/data/db.struct | |||
@@ -1,6 +1,6 @@ | |||
1 | -- This file is part of Ellinika | 1 | -- This file is part of Ellinika |
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 |
6 | -- the Free Software Foundation; either version 3 of the License, or | 6 | -- the Free Software Foundation; either version 3 of the License, or |
@@ -159,6 +159,6 @@ CREATE TABLE newsart( | |||
159 | ); | 159 | ); |
160 | 160 | ||
161 | ---- | 161 | ---- |
162 | 162 | ||
163 | source dbverb.struct; | 163 | source ./dbverb.struct; |
164 | \ No newline at end of file | 164 | |
diff --git a/data/pl/Makefile.am b/data/pl/Makefile.am index 8707cf2..0965f9b 100644 --- a/data/pl/Makefile.am +++ b/data/pl/Makefile.am | |||
@@ -1,6 +1,6 @@ | |||
1 | # This file is part of Ellinika project. | 1 | # This file is part of Ellinika project. |
2 | # Copyright (C) 2004, 2007 Sergey Poznyakoff | 2 | # Copyright (C) 2004, 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 |
6 | # the Free Software Foundation; either version 3 of the License, or | 6 | # the Free Software Foundation; either version 3 of the License, or |
@@ -18,7 +18,7 @@ BASEXML=\ | |||
18 | setup.xml\ | 18 | setup.xml\ |
19 | 0.xml | 19 | 0.xml |
20 | 20 | ||
21 | dict: | 21 | dict: |
22 | $(top_builddir)/scm/dictrans $(BASEXML) | 22 | $(AM_V_GEN)LC_ALL=en_US.UTF-8 $(top_builddir)/scm/dictrans $(BASEXML) |
23 | 23 | ||
24 | 24 | ||
diff --git a/data/ru/Makefile.am b/data/ru/Makefile.am index 18d1441..b8eb7c7 100644 --- a/data/ru/Makefile.am +++ b/data/ru/Makefile.am | |||
@@ -1,6 +1,6 @@ | |||
1 | # This file is part of Ellinika project. | 1 | # This file is part of Ellinika project. |
2 | # Copyright (C) 2004, 2007 Sergey Poznyakoff | 2 | # Copyright (C) 2004, 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 |