From 1300e9d50af11648be41e3ecd9f4700befb22463 Mon Sep 17 00:00:00 2001 From: Norbert Preining Date: Sun, 24 Jan 2021 01:01:10 +0900 Subject: [PATCH] guile-3.0 Gbp-Pq: Name guile-3.0 --- configure.ac | 10 +++++----- guile/Makefile.am | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/configure.ac b/configure.ac index 9aaeeea..4cfef4f 100644 --- a/configure.ac +++ b/configure.ac @@ -213,10 +213,10 @@ AM_CONDITIONAL(BUILD_GUI,[test "x$have_webkit" = "xyes" -a "x$have_gtk" = "xyes" # build with guile2.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]) + PKG_CHECK_MODULES(GUILE30, guile-3.0, [have_guile30=yes],[have_guile30=no]) # this is a bit hacky; GUILE_PKG - AS_IF([test "x$have_guile22" = "xyes"],[ - GUILE_PKG([2.2]) + AS_IF([test "x$have_guile30" = "xyes"],[ + GUILE_PKG([3.0]) GUILE_PROGS GUILE_FLAGS GUILE_SNARF=guile-snarf @@ -224,10 +224,10 @@ AS_IF([test "x$enable_guile" != "xno"],[ 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-3.0 --modversion) ]) ]) -AM_CONDITIONAL(BUILD_GUILE,[test "x$have_guile22" = "xyes"]) +AM_CONDITIONAL(BUILD_GUILE,[test "x$have_guile30" = "xyes"]) ############################################################################### ############################################################################### diff --git a/guile/Makefile.am b/guile/Makefile.am index 319b079..bd4c20c 100644 --- a/guile/Makefile.am +++ b/guile/Makefile.am @@ -68,7 +68,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/3.0/ scm_DATA=mu.scm EXTRA_DIST=$(scm_DATA) -- 2.30.2