[shepherd] 01/03: build: Support Guile 2.2.

[Ludovic Courtès]

civodul pushed a commit to branch master
in repository shepherd.

commit de9c87b9b08f86de57870b9efafb1d5accd4707a
Author: Ludovic Courtès <address@hidden>
Date:   Thu Oct 20 22:36:18 2016 +0200

    build: Support Guile 2.2.
    
    * configure.ac: Use 'GUILE_PKG'.  Remove explicit Guile version check
    and check for 'guild'.  Honor $GUILE_EFFECTIVE_VERSION in
    'guilemoduledir'.
---
 configure.ac |   28 +++++-----------------------
 1 file changed, 5 insertions(+), 23 deletions(-)

diff --git a/configure.ac b/configure.ac
index 77d0522..49e245a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -18,32 +18,14 @@ AC_CANONICAL_HOST
 AC_PROG_MKDIR_P
 AC_PROG_SED
 
+dnl Check for Guile 2.x.
+m4_pattern_forbid([^GUILE_PKG])
+GUILE_PKG([2.2 2.0])
+
 dnl Checks for programs.
 GUILE_PROGS
 
-AC_MSG_CHECKING([whether it is Guile 2.0])
-GUILE_CHECK(version_ok,
-(or (and (>= (string->number (major-version)) 2)
-         (>= (string->number (minor-version)) 0))
-    (quit 1))
-)
-if test $version_ok = 0; then
-  recent_version=yes
-else
-  recent_version=no
-fi
-AC_MSG_RESULT($recent_version)
-if test $recent_version = no; then
-  AC_MSG_WARN(your Guile is probably too old to run shepherd)
-fi
-
-AC_PATH_PROG([GUILD], [guild])
-if test "x$GUILD" = "x"; then
-   AC_MSG_ERROR(['guild' binary not found; please check your Guile 2.x 
installation.])
-fi
-AC_SUBST([GUILD])
-
-guilemoduledir="${datarootdir}/guile/site/2.0"
+guilemoduledir="${datarootdir}/guile/site/$GUILE_EFFECTIVE_VERSION"
 AC_SUBST([guilemoduledir])
 
 dnl