alx/mu4e
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

* small updates for guile 1.x compatibility (WIP)

Browse Source
This commit is contained in:
Dirk-Jan C. Binnema
2011-07-18 08:37:06 +03:00
parent 815d5ad862
commit 3b7f2ab25d
3 changed files with 14 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
configure.ac
View File

@ -210,7 +210,7 @@ AM_CONDITIONAL(BUILD_WIDGETS, [test "x$have_webkit" = "xyes" -a "x$have_gio" = "
# check for guile & guile-snarf # check for guile & guile-snarf
AC_PATH_PROG(GUILE_CONFIG, [guile-config], [], [/usr/bin]) AC_PATH_PROG(GUILE_CONFIG, [guile-config], [], [$PATH])
AS_IF([test "x$GUILE_CONFIG" != "x"], AS_IF([test "x$GUILE_CONFIG" != "x"],
[GUILE_CFLAGS=`$GUILE_CONFIG compile`; GUILE_LIBS=`$GUILE_CONFIG link`]) [GUILE_CFLAGS=`$GUILE_CONFIG compile`; GUILE_LIBS=`$GUILE_CONFIG link`])
AC_SUBST(GUILE_LIBS) AC_SUBST(GUILE_LIBS)
@ -234,7 +234,9 @@ AM_CONDITIONAL(HAVE_GUILE,[test "$xGUILE_CONFIG" != "x" -a "x$GUILE_SNARF" != "x
-a "x$GUILE_MAJOR_VERSION" != "1"]) -a "x$GUILE_MAJOR_VERSION" != "1"])
AS_IF([test "x$GUILE_MAJOR_VERSION" = "x0" -o "x$GUILE_MAJOR_VERSION" = "x1"], AS_IF([test "x$GUILE_MAJOR_VERSION" = "x0" -o "x$GUILE_MAJOR_VERSION" = "x1"],
[AC_MSG_WARN([Only guile >= 2.x is supported])]) [AC_MSG_WARN([Only guile >= 2.x is supported]);
guile_too_old="yes"])
# check for xdg-open # check for xdg-open
AS_IF([test "x$buildgui"="xyes"],[ AS_IF([test "x$buildgui"="xyes"],[
@ -296,7 +298,9 @@ if test "x$have_webkit" = "xyes"; then
echo "Webkit version : $webkit_version" echo "Webkit version : $webkit_version"
fi fi
if test "x$HAVE_GUILE" != "x"; then if test "x$guile_too_old" = "xyes"; then
echo "Guile version : $GUILE_VERSION (unsupported)"
else
echo "Guile version : $GUILE_VERSION" echo "Guile version : $GUILE_VERSION"
fi fi

6
toys/muile/README
View File

@ -19,8 +19,8 @@
The git-version and the future 0.9.7 version of mu will automatically build The git-version and the future 0.9.7 version of mu will automatically build
muile if you have guile. I've been using guile 2.x from git, but installing muile if you have guile. I've been using guile 2.x from git, but installing
the 'guile-1.8-dev' package (Ubuntu/Debian) should do the trick (I did not the 'guile-1.8-dev' package (Ubuntu/Debian) should do the trick. (I only did
test with 1.8 though). very minimal testing with guile 1.8 though).
Then, configure mu. The configure output should tell you about whether guile Then, configure mu. The configure output should tell you about whether guile
was found (and where). If it's found, build mu, and toys/muile should be was found (and where). If it's found, build mu, and toys/muile should be
@ -100,7 +100,7 @@
the file 'mu-stats.scm': the file 'mu-stats.scm':
,---- ,----
| (load "mu-stats.scm) | (load "mu-stats.scm")
`---- `----
you'll get a bunch of functions (with names starting with 'mu:stats') to make you'll get a bunch of functions (with names starting with 'mu:stats') to make

5
toys/muile/mu-stats.scm
View File

@ -19,8 +19,11 @@
;; some guile/scheme functions to get various statistics of my mu ;; some guile/scheme functions to get various statistics of my mu
;; message store. ;; message store.
(use-modules (ice-9 optargs)) ;; for guile 1.x compatibility
;; note, this is a rather inefficient way to calculate the number; for ;; note, this is a rather inefficient way to calculate the number; for
;; demonstration purposes only ;; demonstration purposes only...
(define* (mu:stats:count #:optional (EXPR "")) (define* (mu:stats:count #:optional (EXPR ""))
"Count the total number of messages. If the optional EXPR is "Count the total number of messages. If the optional EXPR is
provided, only count the messages that match it.\n" provided, only count the messages that match it.\n"