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

guile: support version 3.0.

Browse Source 
Includes an update to the guile m4 package, and tweaks the build so that
both 2.2 and 3.0 should work fine.
This commit is contained in:
Danny O'Brien
2020-09-07 19:52:17 -07:00
committed by Dirk-Jan C. Binnema
parent 69b157a346
commit 623cf787ad
5 changed files with 19 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
configure.ac
View File

@ -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"])
###############################################################################
###############################################################################