From bfe2a8921226cc7ccb54357d4f0c07534b763671 Mon Sep 17 00:00:00 2001 From: Mathieu Lirzin Date: Fri, 8 May 2020 19:24:00 +0200 Subject: build: Detect guile M4 macro expansion errors This ensures that the absence of 'pkg-config' or 'guile' M4 macros expansion do not pass the bootstrap step. * configure.ac: Allow or forbid some M4 macros patterns in the generated 'configure' script. --- configure.ac | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) (limited to 'configure.ac') diff --git a/configure.ac b/configure.ac index f92619b..d27e12e 100755 --- a/configure.ac +++ b/configure.ac @@ -1,7 +1,7 @@ ## Process this file with autoconf to produce a configure script. # # Copyright © 2003, 2005, 2012, 2014 Dale Mellor -# Copyright © 2015, 2016, 2017, 2018 Mathieu Lirzin +# Copyright © 2015, 2016, 2017, 2018, 2020 Mathieu Lirzin # Copyright © 2018 宋文武 # # This file is part of GNU Mcron. @@ -33,6 +33,13 @@ AM_SILENT_RULES([yes]) # Enables silent rules by default. AC_CANONICAL_HOST +dnl We require pkg.m4 (from pkg-config) and guile.m4 (from Guile.) +dnl Make sure they are available when generating the configure script. +m4_pattern_forbid([^PKG_PROG]) +m4_pattern_forbid([^PKG_CHECK]) +m4_pattern_forbid([^GUILE_P]) +m4_pattern_allow([^GUILE_PKG_ERRORS]) + # Check for Guile development files. GUILE_PKG([3.0 2.2 2.0]) -- cgit v1.2.3 From 289e4c505e52402e5dfba08d57f2ba1d61a90bf3 Mon Sep 17 00:00:00 2001 From: Mathieu Lirzin Date: Sat, 9 May 2020 00:30:23 +0200 Subject: build: Remove C specific Guile configuration step * configure.ac: Remove unecessary PKG_CHECK_MODULES invocation. --- configure.ac | 5 ----- 1 file changed, 5 deletions(-) (limited to 'configure.ac') diff --git a/configure.ac b/configure.ac index d27e12e..97e9cff 100755 --- a/configure.ac +++ b/configure.ac @@ -43,12 +43,7 @@ m4_pattern_allow([^GUILE_PKG_ERRORS]) # Check for Guile development files. GUILE_PKG([3.0 2.2 2.0]) -# 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. - GUILE_PROGS AM_MISSING_PROG(HELP2MAN, help2man, $missing_dir) -- cgit v1.2.3