dmbcs/mcron
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

build: Support Guile 2.2.

Browse source 
* configure.ac: Use 'GUILE_PKG' and 'GUILE_PROGS'.  Remove explicit Guile
version check and check for 'guild'.  Honor $GUILE_EFFECTIVE_VERSION in
'moduledir'.
This commit is contained in:
Mathieu Lirzin 2017-01-14 17:24:25 +01:00
commit ade37c96b7
No known key found for this signature in database
GPG key ID: 0ADEE10094604D37
1 changed files with 14 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

23
configure.ac
View file

@ -1,7 +1,7 @@
## Process this file with autoconf to produce a configure script. ## Process this file with autoconf to produce a configure script.
# Copyright © 2003, 2005, 2012, 2014 Dale Mellor # Copyright © 2003, 2005, 2012, 2014 Dale Mellor
# <dale_mellor@users.sourceforge.net> # <dale_mellor@users.sourceforge.net>
# Copyright © 2015, 2016 Mathieu Lirzin <mthl@gnu.org> # Copyright © 2015, 2016, 2017 Mathieu Lirzin <mthl@gnu.org>
# #
# This file is part of GNU Mcron. # This file is part of GNU Mcron.
# #
@ -29,9 +29,6 @@ AC_REQUIRE_AUX_FILE([git-version-gen])
AM_INIT_AUTOMAKE([subdir-objects -Wall -Wno-override]) AM_INIT_AUTOMAKE([subdir-objects -Wall -Wno-override])
AM_SILENT_RULES([yes]) # enables silent rules by default AM_SILENT_RULES([yes]) # enables silent rules by default
moduledir="${datarootdir}/guile/site/2.0"
AC_SUBST([moduledir])
AC_SUBST([mcronmoduledir], ["${moduledir}/mcron"])
AC_MSG_CHECKING([whether debugging is requested]) AC_MSG_CHECKING([whether debugging is requested])
AC_ARG_ENABLE(debug, AC_ARG_ENABLE(debug,
AC_HELP_STRING([--enable-debug], AC_HELP_STRING([--enable-debug],
@ -55,16 +52,22 @@ AC_PROG_AWK
AC_PROG_EGREP AC_PROG_EGREP
AM_PROG_CC_C_O AM_PROG_CC_C_O
PKG_CHECK_MODULES([GUILE], [guile-2.0 >= 2.0.7]) # Check for Guile 2.x. development files
AC_PATH_PROG([GUILE], [guile]) GUILE_PKG([2.2 2.0])
# search guild # Set directories for installed Guile modules
AC_PATH_PROG([GUILD], [guild]) moduledir="${datarootdir}/guile/site/$GUILE_EFFECTIVE_VERSION"
AS_IF([test -z "$ac_cv_path_GUILD"], AC_SUBST([moduledir])
[AC_MSG_ERROR(['guild' program cannot be found.])]) AC_SUBST([mcronmoduledir], ["${moduledir}/mcron"])
# Set Guile flags without using GUILE_FLAGS which is requiring the unused
# 'config.rpath' script.
PKG_CHECK_MODULES(GUILE, [guile-$GUILE_EFFECTIVE_VERSION])
# Checks for programs. # Checks for programs.
GUILE_PROGS
AM_MISSING_PROG(HELP2MAN, help2man, $missing_dir) AM_MISSING_PROG(HELP2MAN, help2man, $missing_dir)
AC_CHECK_PROGS(SED, sed) AC_CHECK_PROGS(SED, sed)