[gentoo-commits] repo/gentoo:master commit in: net-mail/mu/files/
commit: 8ac404a9fb5f456a96e196809537479a8c611b5d
Author: Michael Mair-Keimberger levelnine at>
AuthorDate: Mon Mar 25 18:08:18 2024 +
Commit: Matthew Smith gentoo org>
CommitDate: Sun Apr 14 18:36:45 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8ac404a9
net-mail/mu: remove unused patch
Signed-off-by: Michael Mair-Keimberger levelnine.at>
Signed-off-by: Matthew Smith gentoo.org>
net-mail/mu/files/mu-1.12.0-cld2-opt.patch | 36 --
1 file changed, 36 deletions(-)
diff --git a/net-mail/mu/files/mu-1.12.0-cld2-opt.patch
b/net-mail/mu/files/mu-1.12.0-cld2-opt.patch
deleted file mode 100644
index 124675868670..
--- a/net-mail/mu/files/mu-1.12.0-cld2-opt.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-https://github.com/djcb/mu/pull/2632
-
a/meson.build
-+++ b/meson.build
-@@ -189,11 +189,11 @@ else
- endif
-
- # optionally, use Compact Language Detector2 if we can find it.
--cld2_dep = meson.get_compiler('cpp').find_library('cld2', required: false)
--if cld2_dep.found()
-+cld2_dep = meson.get_compiler('cpp').find_library('cld2', required:
get_option('cld2'))
-+if not get_option('cld2').disabled() and cld2_dep.found()
- config_h_data.set('HAVE_CLD2', 1)
- else
-- message('CLD2 not found; no support for language detection')
-+ message('CLD2 not found or disabled; no support for language detection')
- endif
-
- # note: these are for the unit-tests
a/meson_options.txt
-+++ b/meson_options.txt
-@@ -24,6 +24,11 @@ option('guile',
-value: 'auto',
-description: 'build the guile scripting support (requires guile-3.x)')
-
-+option('cld2',
-+ type : 'feature',
-+ value: 'auto',
-+ description: 'Compact Language Detector2')
-+
- # by default, this uses guile_dep.get_variable(pkgconfig: 'extensiondir')
- option('guile-extension-dir',
-type: 'string',
---
-2.44.0
-
[gentoo-commits] repo/gentoo:master commit in: net-mail/mu/files/, net-mail/mu/
commit: 88218a840c990719954f75cb24c6da4ebd33613e
Author: Matthew Smith gentoo org>
AuthorDate: Mon Apr 1 11:33:20 2024 +
Commit: Matthew Smith gentoo org>
CommitDate: Mon Apr 1 11:33:20 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=88218a84
net-mail/mu: fix musl build
Closes: https://bugs.gentoo.org/928361
Signed-off-by: Matthew Smith gentoo.org>
net-mail/mu/files/mu-1.12.2-musl.patch | 31 +++
net-mail/mu/mu-1.12.2.ebuild | 3 +++
2 files changed, 34 insertions(+)
diff --git a/net-mail/mu/files/mu-1.12.2-musl.patch
b/net-mail/mu/files/mu-1.12.2-musl.patch
new file mode 100644
index ..35f6017e56f3
--- /dev/null
+++ b/net-mail/mu/files/mu-1.12.2-musl.patch
@@ -0,0 +1,31 @@
+From: https://github.com/djcb/mu/pull/2677
+From: Matthew Smith
+Date: Mon, 1 Apr 2024 11:23:39 +
+Subject: [PATCH] mu-utils: Fix build with musl
+
+In musl, `stdout` is a macro that expands to `(stdout)`, and
+`::(stdout)` is not valid C++.
+
+../mu-1.12.2/lib/utils/mu-utils.hh:268:32: error: expected
+ id-expression before '(' token
+ 268 | ::stdout);
+ |^~
+
+Nothing in the Mu namespace is named stdout, so it is safe to drop
+the `::`.
+
+Bug: https://bugs.gentoo.org/928361
+--- a/lib/utils/mu-utils.hh
b/lib/utils/mu-utils.hh
+@@ -265,7 +265,7 @@ bool fputs_encoded (const std::string& str, FILE *stream);
+ template
+ static inline bool mu_print_encoded(fmt::format_string frm, T&&...
args) noexcept {
+ return fputs_encoded(fmt::format(frm, std::forward(args)...),
+- ::stdout);
++ stdout);
+ }
+
+ /**
+--
+2.44.0
+
diff --git a/net-mail/mu/mu-1.12.2.ebuild b/net-mail/mu/mu-1.12.2.ebuild
index 04c44da48677..f4e55a3d9779 100644
--- a/net-mail/mu/mu-1.12.2.ebuild
+++ b/net-mail/mu/mu-1.12.2.ebuild
@@ -29,6 +29,9 @@ BDEPEND="
PATCHES=(
# https://bugs.gentoo.org/925503
"${FILESDIR}"/${PN}-1.12.0-no-python.patch
+
+ # https://bugs.gentoo.org/928361
+ "${FILESDIR}"/${PN}-1.12.2-musl.patch
)
SITEFILE="70mu-gentoo-autoload.el"
[gentoo-commits] repo/gentoo:master commit in: net-mail/mu/files/, net-mail/mu/
commit: abb1775bd45ccf85f5b7fa418d8337e083267576
Author: Matthew Smith gentoo org>
AuthorDate: Fri Jun 23 09:01:13 2023 +
Commit: Matthew Smith gentoo org>
CommitDate: Fri Jun 23 09:01:13 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=abb1775b
net-mail/mu: drop 1.8.14, 1.10.2
Signed-off-by: Matthew Smith gentoo.org>
net-mail/mu/Manifest | 2 -
net-mail/mu/files/mu-1.8.13-add-cstdint-inc.patch | 37 -
net-mail/mu/mu-1.10.2.ebuild | 88 --
net-mail/mu/mu-1.8.14.ebuild | 92 ---
4 files changed, 219 deletions(-)
diff --git a/net-mail/mu/Manifest b/net-mail/mu/Manifest
index 6cb431e132b7..d6a57a3b2cc8 100644
--- a/net-mail/mu/Manifest
+++ b/net-mail/mu/Manifest
@@ -1,4 +1,2 @@
-DIST mu-1.10.2.tar.xz 569692 BLAKE2B
a75ad3d60806a5d336665b5dbc7d1f062928eff6fd2424651d3d85c4dd3134d1b4f912bd24120c14670dab49ef2e51056a0b130cc714edd0d56ab87bbdb7832b
SHA512
2e8843846676c4f9ed9abb48bce8c52ffbfafcf1b7542c9f0663c2f5572c101871e935938f0406b284c6b78fb0fb190469d193151c5adbc50a10eea0edf76ccd
DIST mu-1.10.3.tar.xz 569740 BLAKE2B
bfd332d77a0c8727beeac363c35199dd8da0b4dde940981845865eda7e0ff7a7bfcbfef76509ca407bea80b4b148b0b6bce79fa928b2c4df239b55325336c049
SHA512
dbc3946b50791bb01e640d7c07a5072c4c6381b576337899c32b0f0c8331b44ab328f3887eacfff4d5ec71144164a43dc2c1241330bf00226748485027e7f21b
DIST mu-1.10.4.tar.xz 570024 BLAKE2B
81d0ea6ac018a24eaa9f80e21fdbd6f4e67faba1cf3d6f93721ac32caf1f820b03adfbee096229da95caf229f7dc3c8e78008654296fb684fdc62e0cffab590d
SHA512
7c58ddf65c4aaa555d38c3a10ecf5d6e170ff2914515f8f1242ca59226bda09057bcbff2bc5459b448c34c3bd3add9546fd71387891f8eef8b2ee9aa738982e1
-DIST mu-1.8.14.tar.xz 543828 BLAKE2B
d64e52a66f3b68a2d5b039eaff668c5ecf0da8b1e77719de49316cbe96bb9d34c3e4f8636cfd63cf473218ea6ec428f8c2be2d80c94d1b1456e4b7f17c5ab52c
SHA512
8d5514cf08891180163e4d7caff7a3d75dd39a6397c0c8608a85b613f83a4f714f772400c2a057c1f9ef46dedd4f240828ced4e8a1b38ebe4340041059a3ad44
diff --git a/net-mail/mu/files/mu-1.8.13-add-cstdint-inc.patch
b/net-mail/mu/files/mu-1.8.13-add-cstdint-inc.patch
deleted file mode 100644
index 5b46732c805f..
--- a/net-mail/mu/files/mu-1.8.13-add-cstdint-inc.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From e0b17e4e31acd5657a3488936ef619c5ae2dc689 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Arsen=20Arsenovi=C4=87?=
-Date: Sat, 21 Jan 2023 19:39:09 +0100
-Subject: [PATCH] mu-error: Add missing include
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-GCC 13s libstdc++ reduced its dependency on some headers like , so
it's
-no longer transitively included through various headers. Include it
explicitly.
-
-See also: https://gcc.gnu.org/gcc-13/porting_to.html#header-dep-changes
-
- ../lib/utils/mu-error.hh:36:26: error: ‘uint32_t’ does not name a type
- 36 | static constexpr uint32_t SoftError = 1 << 23;
-| ^~~~
-https://github.com/djcb/mu/pull/2421
-
- lib/utils/mu-error.hh | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/lib/utils/mu-error.hh b/lib/utils/mu-error.hh
-index c67fc5a1..61923c6c 100644
a/lib/utils/mu-error.hh
-+++ b/lib/utils/mu-error.hh
-@@ -21,6 +21,7 @@
- #define MU_ERROR_HH__
-
- #include
-+#include
- #include "mu-utils-format.hh"
- #include "mu-util.h"
- #include
---
-2.39.1
-
diff --git a/net-mail/mu/mu-1.10.2.ebuild b/net-mail/mu/mu-1.10.2.ebuild
deleted file mode 100644
index 2acec2e5ddb5..
--- a/net-mail/mu/mu-1.10.2.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit elisp-common meson
-
-DESCRIPTION="Set of tools to deal with Maildirs, in particular, searching and
indexing"
-HOMEPAGE="https://www.djcbsoftware.nl/code/mu/ https://github.com/djcb/mu;
-SRC_URI="https://github.com/djcb/mu/releases/download/v${PV}/${P}.tar.xz;
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86 ~x64-macos"
-IUSE="emacs readline"
-
-DEPEND="
- dev-libs/glib:2
- dev-libs/gmime:3.0
- >=dev-libs/xapian-1.4:=
- emacs? ( >=app-editors/emacs-25.3:* )
- readline? ( sys-libs/readline:= )"
-RDEPEND="${DEPEND}"
-BDEPEND="
- sys-apps/texinfo
- virtual/pkgconfig
-"
-
-SITEFILE="70mu-gentoo-autoload.el"
-
-src_prepare() {
- default
-
- # Don't install NEWS.org into /usr/share/doc.
- sed -i '/NEWS.org/,+1 d' meson.build || die
- sed -i '/mu4e-about.org/d' mu4e/meson.build || die
-
- # Don't compress the info file.
- sed -i '/gzip/d' build-aux/meson-install-info.sh || die
-
- # Instead, put it in /usr/share/doc/${PF}.
- sed -i "/MU_DOC_DIR/s/mu/${PF}/" mu4e/meson.build || die
-}
-
-src_configure() {
- local emesonargs=(
- $(meson_feature readline)
-
[gentoo-commits] repo/gentoo:master commit in: net-mail/mu/files/, net-mail/mu/
commit: 8e9615af681fb98060aa389a835bf9ea86561cbe
Author: Sam James gentoo org>
AuthorDate: Thu Apr 21 18:29:57 2022 +
Commit: Sam James gentoo org>
CommitDate: Thu Apr 21 18:49:32 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8e9615af
net-mail/mu: fix build with GCC 12
Closes: https://bugs.gentoo.org/839918
Signed-off-by: Sam James gentoo.org>
net-mail/mu/files/mu-1.7.12-gcc12.patch | 12
net-mail/mu/mu-1.7.12.ebuild| 5 -
2 files changed, 16 insertions(+), 1 deletion(-)
diff --git a/net-mail/mu/files/mu-1.7.12-gcc12.patch
b/net-mail/mu/files/mu-1.7.12-gcc12.patch
new file mode 100644
index ..f360351e17f4
--- /dev/null
+++ b/net-mail/mu/files/mu-1.7.12-gcc12.patch
@@ -0,0 +1,12 @@
+https://github.com/djcb/mu/pull/2224 (rebased)
+https://bugs.gentoo.org/839918
+--- a/lib/utils/mu-utils.cc
b/lib/utils/mu-utils.cc
+@@ -32,6 +32,7 @@
+ #include
+ #include
+ #include
++#include
+ #include
+
+ #include
diff --git a/net-mail/mu/mu-1.7.12.ebuild b/net-mail/mu/mu-1.7.12.ebuild
index 02358e6b56c8..902c7c8d9e4b 100644
--- a/net-mail/mu/mu-1.7.12.ebuild
+++ b/net-mail/mu/mu-1.7.12.ebuild
@@ -26,7 +26,10 @@ BDEPEND="
virtual/pkgconfig
"
-PATCHES=( "${FILESDIR}"/${PN}-1.7.12-optional-mu4e.patch )
+PATCHES=(
+ "${FILESDIR}"/${PN}-1.7.12-optional-mu4e.patch
+ "${FILESDIR}"/${PN}-1.7.12-gcc12.patch
+)
SITEFILE="70mu-gentoo-autoload.el"
[gentoo-commits] repo/gentoo:master commit in: net-mail/mu/files/, net-mail/mu/
commit: ba0c9a35185de0a8e42bad8e11b9e4540f0588e1
Author: Matthew Smith gentoo org>
AuthorDate: Sat Apr 2 09:27:30 2022 +
Commit: Matthew Smith gentoo org>
CommitDate: Sat Apr 2 09:28:02 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ba0c9a35
net-mail/mu: add 1.7.12
Closes: https://bugs.gentoo.org/836618
Signed-off-by: Matthew Smith gentoo.org>
net-mail/mu/Manifest| 1 +
net-mail/mu/files/mu-1.7.12-optional-mu4e.patch | 41
net-mail/mu/mu-1.7.12.ebuild| 83 +
3 files changed, 125 insertions(+)
diff --git a/net-mail/mu/Manifest b/net-mail/mu/Manifest
index 23706f595cfd..8b5188322ef3 100644
--- a/net-mail/mu/Manifest
+++ b/net-mail/mu/Manifest
@@ -1 +1,2 @@
DIST mu-1.6.10.tar.xz 867008 BLAKE2B
6cce22f18691c3ad6dda1ec012d72c398df2ba4d1beca70fc6f88d87aa9b749e2aa4c03f5c0e0d70f4f9978e2beb60ea02642b8ff71e86e0668df726e5923b52
SHA512
a51847b338afeff9c9fa88c4698df4b85289d017063cb5e3410eb967c605d8779618dcbd988e2d923a92291c1e0738ec84afecf017c76a63776149619d134887
+DIST mu-1.7.12.tar.xz 2129072 BLAKE2B
3518a361bc06b632899f9296ec211dc926a07973433247bf6f9ecfb069dcfd8b762f358aa32418276bf7dcba40bad768dd4599534613a1fae285cef9c6ceedd0
SHA512
fe0f41520959df7f78525317bf5caad4ae7f7468ac6291b84c48805e133883192458a8f79a929c0ebda2e45ec2014db1aa72650d0a6e176d7678449be36fc4f2
diff --git a/net-mail/mu/files/mu-1.7.12-optional-mu4e.patch
b/net-mail/mu/files/mu-1.7.12-optional-mu4e.patch
new file mode 100644
index ..0f14bf3249e2
--- /dev/null
+++ b/net-mail/mu/files/mu-1.7.12-optional-mu4e.patch
@@ -0,0 +1,41 @@
+From 41e262b51968359074faac21fa80d2f1237c57cf Mon Sep 17 00:00:00 2001
+From: Matthew Smith
+Date: Sat, 2 Apr 2022 10:06:21 +0100
+Subject: [PATCH] build: add emacs option
+
+Without this option, mu4e will always be installed when Emacs is
+installed.
+---
+ meson.build | 2 +-
+ meson_options.txt | 5 +
+ 2 files changed, 6 insertions(+), 1 deletion(-)
+
+diff --git a/meson.build b/meson.build
+index 58ac9002..5f71d766 100644
+--- a/meson.build
b/meson.build
+@@ -174,7 +174,7 @@ subdir('lib')
+ subdir('mu')
+ subdir('man')
+
+-if emacs.found()
++if get_option('emacs').enabled() and emacs.found()
+subdir('mu4e')
+ endif
+
+diff --git a/meson_options.txt b/meson_options.txt
+index 0c70826e..34cb0c02 100644
+--- a/meson_options.txt
b/meson_options.txt
+@@ -29,3 +29,8 @@ option('readline',
+type: 'feature',
+value: 'auto',
+description: 'enable readline support for the mu4e repl')
++
++option('emacs',
++ type : 'feature',
++ value: 'disabled',
++ description: 'build mu4e')
+--
+2.35.1
+
diff --git a/net-mail/mu/mu-1.7.12.ebuild b/net-mail/mu/mu-1.7.12.ebuild
new file mode 100644
index ..02358e6b56c8
--- /dev/null
+++ b/net-mail/mu/mu-1.7.12.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit elisp-common meson
+
+DESCRIPTION="Set of tools to deal with Maildirs, in particular, searching and
indexing"
+HOMEPAGE="https://www.djcbsoftware.nl/code/mu/ https://github.com/djcb/mu;
+SRC_URI="https://dev.gentoo.org/~matthew/distfiles/${P}.tar.xz;
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~x64-macos"
+IUSE="emacs readline"
+
+DEPEND="
+ dev-libs/glib:2
+ dev-libs/gmime:3.0
+ >=dev-libs/xapian-1.4:=
+ emacs? ( >=app-editors/emacs-25.3:* )
+ readline? ( sys-libs/readline:= )"
+RDEPEND="${DEPEND}"
+BDEPEND="
+ sys-apps/texinfo
+ virtual/pkgconfig
+"
+
+PATCHES=( "${FILESDIR}"/${PN}-1.7.12-optional-mu4e.patch )
+
+SITEFILE="70mu-gentoo-autoload.el"
+
+src_prepare() {
+ default
+
+ # Don't install NEWS.org into /usr/share/doc.
+ sed -i '/NEWS.org/,+1 d' meson.build || die
+
+ # Instead, put it in /usr/share/doc/${PF}.
+ sed -i "/MU_DOC_DIR/s/mu/${PF}/" mu4e/meson.build || die
+}
+
+src_configure() {
+ local emesonargs=(
+ $(meson_feature emacs)
+ $(meson_feature readline)
+ # NOTE: Guile interface is deprecated to be removed shortly.
+ -Dguile=disabled
+ -Dtoys=disabled
+ )
+ meson_src_configure
+}
+
+src_install() {
+ meson_src_install
+
+ # Since meson no longer installs NEWS.org, install it with dodoc.
+ # Also, it must be uncompressed so that it can be viewed with
+ # mu4e-info.
+ docompress -x /usr/share/doc/${PF}/NEWS.org
+ dodoc NEWS.org
+}
+
+pkg_preinst() {
+ if [[ -n ${REPLACING_VERSIONS} ]]; then
+ elog "After upgrading from an old major version, you should"
+ elog "rebuild your mail index."
+ fi
+}
+
+pkg_postinst() {
+ if use emacs; then
+ einfo "To use mu4e you need to configure it in your .emacs file"
+
[gentoo-commits] repo/gentoo:master commit in: net-mail/mu/files/
commit: ae0f5a2aebc3f74a56e9907a391ad336439372e1
Author: Michael Mair-Keimberger levelnine at>
AuthorDate: Tue Sep 14 11:19:40 2021 +
Commit: Florian Schmaus gentoo org>
CommitDate: Tue Sep 14 12:26:43 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ae0f5a2a
net-mail/mu: remove unused patches
Package-Manager: Portage-3.0.22, Repoman-3.0.3
Signed-off-by: Michael Mair-Keimberger gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/22296
Signed-off-by: Florian Schmaus gentoo.org>
net-mail/mu/files/mu-1.4.15-guile3-1.patch | 141 -
net-mail/mu/files/mu-1.4.15-guile3-2.patch | 17
2 files changed, 158 deletions(-)
diff --git a/net-mail/mu/files/mu-1.4.15-guile3-1.patch
b/net-mail/mu/files/mu-1.4.15-guile3-1.patch
deleted file mode 100644
index 671a4685a27..000
--- a/net-mail/mu/files/mu-1.4.15-guile3-1.patch
+++ /dev/null
@@ -1,141 +0,0 @@
-From 623cf787ad009c42b2adf3767be5f01fec56ff5a Mon Sep 17 00:00:00 2001
-From: Danny O'Brien
-Date: Mon, 7 Sep 2020 19:52:17 -0700
-Subject: [PATCH] guile: support version 3.0.
-
-Includes an update to the guile m4 package, and tweaks the build so that
-both 2.2 and 3.0 should work fine.
- configure.ac | 14 +++---
- guile/Makefile.am | 2 +-
- guile/mu/Makefile.am | 4 +---
- m4/Makefile.am| 2 +-
- m4/{guile-2.2.m4 => guile.m4} | 15 +--
- 5 files changed, 19 insertions(+), 18 deletions(-)
- rename m4/{guile-2.2.m4 => guile.m4} (97%)
-
-diff --git a/configure.ac b/configure.ac
-index eb5629696..cc43f43db 100644
a/configure.ac
-+++ b/configure.ac
-@@ -212,22 +212,22 @@ AM_CONDITIONAL(BUILD_GUI,[test "x$have_webkit" = "xyes"
-a "x$have_gtk" = "xyes"
-
###
-
-
###
--# build with guile2.2 when available and not disabled.
-+# build with guile 3.0/2.2 when available and not disabled.
- AC_ARG_ENABLE([guile], AS_HELP_STRING([--disable-guile],[Disable guile]))
- AS_IF([test "x$enable_guile" != "xno"],[
-- PKG_CHECK_MODULES(GUILE22, guile-2.2, [have_guile22=yes],[have_guile22=no])
-- # this is a bit hacky; GUILE_PKG
-- AS_IF([test "x$have_guile22" = "xyes"],[
--GUILE_PKG([2.2])
-+ PKG_CHECK_MODULES(GUILE, [guile-3.0], [have_guile=yes],[
-+PKG_CHECK_MODULES(GUILE, [guile-2.2], [have_guile=yes], [have_guile=no])])
-+ AS_IF([test "x$have_guile" = "xyes"],[
-+GUILE_PKG([3.0 2.2])
- GUILE_PROGS
- GUILE_FLAGS
- AC_DEFINE_UNQUOTED([GUILE_BINARY],"$GUILE",[guile binary])
- AC_DEFINE(BUILD_GUILE,[1], [Do we support Guile?])
- AC_SUBST(GUILE_SNARF, [guile-snarf])
--guile_version=$($PKG_CONFIG guile-2.2 --modversion)
-+guile_version=$($PKG_CONFIG guile-$GUILE_EFFECTIVE_VERSION --modversion)
- ])
- ])
--AM_CONDITIONAL(BUILD_GUILE,[test "x$have_guile22" = "xyes"])
-+AM_CONDITIONAL(BUILD_GUILE,[test "x$have_guile" = "xyes"])
-
###
-
-
###
-diff --git a/guile/Makefile.am b/guile/Makefile.am
-index ed613068b..5c06ccc95 100644
a/guile/Makefile.am
-+++ b/guile/Makefile.am
-@@ -69,7 +69,7 @@ SUFFIXES = .x .doc
-
- # FIXME: GUILE_SITEDIR would be better, but that
- # breaks 'make distcheck'
--scmdir=${prefix}/share/guile/site/2.2/
-+scmdir=${prefix}/share/guile/site/${GUILE_EFFECTIVE_VERSION}
- scm_DATA=mu.scm
-
- EXTRA_DIST=$(scm_DATA)
-diff --git a/guile/mu/Makefile.am b/guile/mu/Makefile.am
-index f531822cd..9339ad973 100644
a/guile/mu/Makefile.am
-+++ b/guile/mu/Makefile.am
-@@ -16,9 +16,7 @@
-
- include $(top_srcdir)/gtest.mk
-
--# FIXME: GUILE_SITEDIR would be better, but that
--# breaks 'make distcheck'
--scmdir=${prefix}/share/guile/site/2.2/mu/
-+scmdir=${prefix}/share/guile/site/${GUILE_EFFECTIVE_VERSION}/mu/
-
- scm_DATA= \
- stats.scm \
-diff --git a/m4/Makefile.am b/m4/Makefile.am
-index eeb8a05a4..27a49eebe 100644
a/m4/Makefile.am
-+++ b/m4/Makefile.am
-@@ -41,7 +41,7 @@ EXTRA_DIST= \
- ax_lib_readline.m4 \
- ax_require_defined.m4 \
- ax_valgrind_check.m4\
-- guile-2.2.m4\
-+ guile.m4\
- lib-ld.m4 \
- lib-link.m4 \
- lib-prefix.m4
-diff --git a/m4/guile-2.2.m4 b/m4/guile.m4
-similarity index 97%
-rename from m4/guile-2.2.m4
-rename to m4/guile.m4
-index 89823e9c3..696897364 100644
a/m4/guile-2.2.m4
-+++ b/m4/guile.m4
-@@ -47,8 +47,8 @@
- # for an available version of Guile.
- #
- # By default, this macro will search for the latest stable version of
--# Guile (e.g. 2.2), falling back to the previous stable version
--#
