aboutsummaryrefslogtreecommitdiff
path: root/configure.ac
diff options
context:
space:
mode:
authorSergey Poznyakoff <gray@gnu.org>2015-01-10 09:27:21 +0200
committerSergey Poznyakoff <gray@gnu.org>2015-01-10 09:27:21 +0200
commit2b99881a880d101ae32a94b3d1e0a792224cb74c (patch)
treebb5145ebea295ff16b9ebfdb8a4f7d8a5a0a592e /configure.ac
parent5dfd8dd432785ca8d8b6d2c11bac9e110feda52b (diff)
downloadellinika-2b99881a880d101ae32a94b3d1e0a792224cb74c.tar.gz
ellinika-2b99881a880d101ae32a94b3d1e0a792224cb74c.tar.bz2
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.
Diffstat (limited to 'configure.ac')
-rw-r--r--configure.ac11
1 files changed, 10 insertions, 1 deletions
diff --git a/configure.ac b/configure.ac
index e545dfa..302f2df 100644
--- a/configure.ac
+++ b/configure.ac
@@ -17,7 +17,7 @@
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)
AC_CONFIG_AUX_DIR([build-aux])
@@ -58,7 +58,16 @@ 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
\#f) GUILE_COMMENT=;;

Return to:

Send suggestions and report system problems to the System administrator.