Switch to guile-www-2.38

* am/guile.m4: Remove.
* Makefile.am (install-html): Fix generation of symlinks
* configure.ac: Fall back to info prefix, if guile-config info bindir
returns empty string.
* data/db.struct: Minor change
* data/pl/Makefile.am: Add missing silent rule markers
* data/ru/Makefile.am: Likewise.
* scm/dictrans.scm: Call setlocale.
* scm/neatrans.scm: Likewise.
* scm/verbop.scm: Likewise.
* src/cgi-bin/conj.scm4: Call setlocale.
Use cgi:value-u8 instead of cgi:value-u8.
* src/cgi-bin/dict.scm4: Likewise.
* src/cgi-bin/nea.scm4: Likewise.
* src/ellinika/cgi.scm4 (cgi-script-name)
(cgi-server-hostname,cgi-server-protocol-name)
(cgi-server-protocol-version): Define in CGI mode.
(cgi:value-u8): New public function.
* src/ellinika/i18n.scm: Conditionally use syncase.

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
@@ -42,5 +42,6 @@ install-html:
                         grep -v '^[ \t]*[;#]' $$top_srcdir/xml/$$dir/symlinks | \
                         sed 's,^/,_,;s,\\.\\./,__/,g' | \
-                        while read S T; do ln -sf $$S $$T; done; \
+                        (cd $(DESTDIR)$(HTMLDIR)/$$dir; \
+                         while read S T; do ln -sf $$S $$T; done); \
                   fi; \
                   cd $$here; \
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 @@
-dnl This file is part of GNU mailutils.
-dnl Copyright (C) 2001,2004 Free Software Foundation, Inc.
-dnl
-dnl This program is free software; you can redistribute it and/or modify
-dnl it under the terms of the GNU General Public License as published by
-dnl the Free Software Foundation; either version 2 of the License, or
-dnl (at your option) any later version.
-dnl
-dnl This program is distributed in the hope that it will be useful,
-dnl but WITHOUT ANY WARRANTY; without even the implied warranty of
-dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-dnl GNU General Public License for more details.
-dnl
-dnl You should have received a copy of the GNU General Public License
-dnl along with this program; if not, write to the Free Software
-dnl Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-dnl
-
-dnl MU_RESULT_ACTIONS -- generate shell code for the result of a test
-dnl   $1 -- CVAR  -- cache variable to check
-dnl   $2 -- NAME  -- if not empty, used to generate a default value TRUE:
-dnl                  `AC_DEFINE(HAVE_NAME)'
-dnl   $2 -- TRUE  -- what to do if the CVAR is not `no'
-dnl   $3 -- FALSE -- what to do otherwise; defaults to `:'
-dnl
-AC_DEFUN([MU_RESULT_ACTIONS], [
-[if test "$$1" != "" -a "$$1" != no; then
-  ]ifelse([$3], ,
-          [AC_DEFINE(HAVE_]translit($2, [a-z ./<>], [A-Z___])[,1,[FIXME])],
-          [$3])[
-else
-  ]ifelse([$4], , [:], [$4])[
-fi]])dnl
-
-AC_DEFUN([MU_CHECK_GUILE],
-[
- if test "x$mu_cv_lib_guile" = x; then
-   cached=""
-   AC_PATH_PROG(GUILE_CONFIG, guile-config, no, $PATH)
-   if test $GUILE_CONFIG = no; then
-     mu_cv_lib_guile=no
-   else
-     GUILE_INCLUDES=`guile-config compile`
-     GUILE_LIBS=`guile-config link`
-   fi
-
-   if test $GUILE_CONFIG != no; then
-     AC_MSG_CHECKING(for guile version 1.6 or higher)
-     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'`
-     case "x$GUILE_VERSION" in
-     x[[0-9]]*)
-       if test $GUILE_VERSION -lt 16; then
-         AC_MSG_RESULT(Nope. Version number too low.)
-         mu_cv_lib_guile=no
-       else
-         AC_DEFINE_UNQUOTED(GUILE_VERSION, $GUILE_VERSION,
-                            [Guile version number: MAX*10 + MIN])
-         AC_MSG_RESULT(OK)
-         save_LIBS=$LIBS
-         save_CFLAGS=$CFLAGS
-         LIBS="$LIBS $GUILE_LIBS"
-         CFLAGS="$CFLAGS $GUILE_INCLUDES"
-         AC_TRY_LINK([#include <libguile.h>],
-                     ifelse([$1], , scm_shell(0, NULL);, [$1]),
-                     [mu_cv_lib_guile=yes],
-                     [mu_cv_lib_guile=no])
-         LIBS=$save_LIBS
-         CFLAGS=$save_CFLAGS
-       fi ;;
-     *) AC_MSG_RESULT(Nope. Unknown version number)
-        mu_cv_lib_guile=no;;
-     esac
-   fi
- else
-   cached=" (cached) "
-   GUILE_INCLUDES=`$GUILE_CONFIG compile`
-   GUILE_LIBS=`$GUILE_CONFIG link`
- fi
- AC_MSG_CHECKING(whether to build guile support)
- MU_RESULT_ACTIONS([mu_cv_lib_guile],[LIBGUILE],[$2],[$3])
- AC_MSG_RESULT(${cached}$mu_cv_lib_guile)
-
- if test $mu_cv_lib_guile = yes; then
-   AC_ARG_WITH([guiledir],
-               AC_HELP_STRING([--with-guiledir=DIR],
-                              [Specify the directory to install guile modules to]),
-               [case $withval in
-                /*) GUILE_SITE=$withval;;
-                yes) GUILE_SITE=`$GUILE_CONFIG info pkgdatadir`/site;;
-                *)  AC_MSG_ERROR([Argument to --with-guiledir must be an absolute directory name]);;
-                esac],
-               [GUILE_SITE=`$GUILE_CONFIG info pkgdatadir`/site
-                pfx=$prefix 
-                test "x$pfx" = xNONE && pfx=$ac_default_prefix
-                case $GUILE_SITE in
-                $pfx/*) ;; # OK
-                *) AC_MSG_WARN([guile site directory "$GUILE_SITE" lies outside your current prefix ($pfx).])
-                   GUILE_SITE='$(datadir)/guile/site'
-                   AC_MSG_WARN([Falling back to ${GUILE_SITE} instead. Use --with-guiledir to force using site directory.])
-                   ;;
-                esac])
- fi
-
- AC_SUBST(GUILE_SITE) 
- AC_SUBST(GUILE_INCLUDES)
- AC_SUBST(GUILE_LIBS)
-])
- 
-        
-
diff --git a/configure.ac b/configure.ac
index e545dfa..302f2df 100644
--- a/configure.ac
+++ b/configure.ac
@@ -18,5 +18,5 @@
 AC_PREREQ(2.61)
 
-AC_REVISION(2015-01-06 14:33:57 gray)
+AC_REVISION(2015-01-07 14:56:15 gray)
 AC_INIT(ellinika, 1.99.99, [gray+ellinika@gnu.org.ua])
 AC_CONFIG_SRCDIR(src/cgi-bin/dict.scm4)
@@ -59,5 +59,14 @@ LIBS="$LIBS $ra_cv_lib_mysqlclient"
 
 AC_SUBST(GUILE_BINDIR)
+
 GUILE_BINDIR=`guile-config info bindir`
+if test -z "$GUILE_BINDIR"; then
+   GUILE_BINDIR=`guile-config info prefix`
+   if test -n "$GUILE_BINDIR"; then
+       GUILE_BINDIR="$GUILE_BINDIR/bin"
+   else
+       AC_MSG_ERROR([Cannot determine guile bin directory])
+   fi
+fi
 
 case `guile -c "(display (member \"$GUILE_SITE\" %load-path))(newline)"` in
diff --git a/data/db.struct b/data/db.struct
index 1b2f160..61e3d25 100644
--- a/data/db.struct
+++ b/data/db.struct
@@ -1,4 +1,4 @@
 -- This file is part of Ellinika
--- 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
@@ -161,4 +161,4 @@ CREATE TABLE newsart(
 ----
 
-source dbverb.struct;
- 
\ No newline at end of file
+source ./dbverb.struct;
+ 
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,4 +1,4 @@
 # This file is part of Ellinika project.
-# Copyright (C) 2004, 2007 Sergey Poznyakoff
+# Copyright (C) 2004, 2007, 2015 Sergey Poznyakoff
 #
 # Ellinika is free software; you can redistribute it and/or modify
@@ -20,5 +20,5 @@ BASEXML=\
 
 dict:
-        $(top_builddir)/scm/dictrans $(BASEXML)
+        $(AM_V_GEN)LC_ALL=en_US.UTF-8 $(top_builddir)/scm/dictrans $(BASEXML)
 
 
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,4 +1,4 @@
 # This file is part of Ellinika project.
-# Copyright (C) 2004, 2007 Sergey Poznyakoff
+# Copyright (C) 2004, 2007, 2015 Sergey Poznyakoff
 #
 # Ellinika is free software; you can redistribute it and/or modify
@@ -49,5 +49,5 @@ EXTRA_DIST=\
 
 dict:
-        $(top_builddir)/scm/dictrans $(BASEXML)
+        $(AM_V_GEN)LC_ALL=en_US.UTF-8 $(top_builddir)/scm/dictrans $(BASEXML)
 
 
diff --git a/scm/dictrans.scm b/scm/dictrans.scm
index 2148929..9f1cfd5 100644
--- a/scm/dictrans.scm
+++ b/scm/dictrans.scm
@@ -3,5 +3,5 @@
 !#
 ;;;; This file is part of Ellinika
-;;;; Copyright (C) 2004, 2005, 2007, 2010 Sergey Poznyakoff
+;;;; Copyright (C) 2004, 2005, 2007, 2010, 2015 Sergey Poznyakoff
 ;;;;
 ;;;; Ellinika is free software; you can redistribute it and/or modify
@@ -94,4 +94,6 @@
     (use-modules (ice-9 syncase)))