emacs
/
mu
mirror of https://github.com/djcb/mu.git
1
0
Fork 0
Code Issues Releases Wiki Activity

guile: optionally allow guile2.2

This commit is contained in:
djcb 2018-05-21 15:03:58 +03:00
parent 7a8d43dc5f
commit 426b9a50c7
2 changed files with 34 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
configure.ac
View File

@ -218,7 +218,36 @@ build_guile=no
AC_ARG_ENABLE([guile],
AS_HELP_STRING([--disable-guile],[Disable guile]))
#
# guile 2.2
#
AS_IF([test "x$enable_guile" != "xno"], [
PKG_CHECK_MODULES(GUILE,guile-2.2,[build_guile=yes],[build_guile=no])
AC_SUBST(GUILE_CFLAGS)
AC_SUBST(GUILE_LIBS)
GUILE_EXECDIR="`${PKG_CONFIG} guile-2.2 --variable=exec_prefix`/bin"
AS_IF([test "x$build_guile" = "xyes"],[
AC_PATH_PROG(GUILE_BINARY, [guile2.2], [], [$GUILE_EXECDIR])
AS_IF([test "x$GUILE_BINARY" != "x"],
[AC_DEFINE_UNQUOTED([GUILE_BINARY],["$GUILE_BINARY"],[Path to the guile binary])],
[AC_MSG_WARN([cannot find guile-snarf])])])
AS_IF([test "x$build_guile" = "xyes"],[
AC_PATH_PROG(GUILE_SNARF, [guile-snarf2.2], [], [$GUILE_EXECDIR])
AS_IF([test "x$GUILE_SNARF" != "x"],
[AC_DEFINE_UNQUOTED([GUILE_SNARF],["$GUILE_SNARF"],[Path to guile-snarf])
GUILE_SITEDIR="`${PKG_CONFIG} guile-2.2 --variable=sitedir`"],
[AC_MSG_WARN([cannot find guile-snarf])])])
AC_SUBST(GUILE_SITEDIR)
guile_version="$(${PKG_CONFIG} --modversion guile-2.2)"
])
#
# still support guile 2.0
#
AS_IF([test "x$enable_guile" != "xno" -a "x$build_guile" = "xno"], [
PKG_CHECK_MODULES(GUILE,guile-2.0,[build_guile=yes],[build_guile=no])
AC_SUBST(GUILE_CFLAGS)
AC_SUBST(GUILE_LIBS)
@ -237,11 +266,12 @@ AS_IF([test "x$enable_guile" != "xno"], [
[AC_DEFINE_UNQUOTED([GUILE_SNARF],["$GUILE_SNARF"],[Path to guile-snarf])
GUILE_SITEDIR="`${PKG_CONFIG} guile-2.0 --variable=sitedir`"],
[AC_MSG_WARN([cannot find guile-snarf])])])
AC_SUBST(GUILE_SITEDIR)])
AC_SUBST(GUILE_SITEDIR)
guile_version="$(${PKG_CONFIG} --modversion guile-2.0)"
])
AS_IF([test "x$build_guile" = "xyes" -a "x$GUILE_SNARF" != "x"],
[guile_version="`${PKG_CONFIG} --modversion guile-2.0`"
AC_DEFINE_UNQUOTED([BUILD_GUILE],1,[Whether we build with guile 2.0 support])])
AC_DEFINE_UNQUOTED([BUILD_GUILE],1,[Whether we build with guilesupport]))
AM_CONDITIONAL(BUILD_GUILE, [test "x$build_guile" = "xyes"])
###############################################################################

2
guile/Makefile.am
View File

@ -72,4 +72,4 @@ EXTRA_DIST=$(scm_DATA)
## Add -MG to make the .x magic work with auto-dep code.
MKDEP = $(CC) -M -MG $(snarfcppopts)
DISTCLEANFILES=$(XFILES)
CLEANFILES=$(XFILES)