>From ae12c01377b32d6e01c59eed373f7b3050255962 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miguel=20=C3=81ngel=20Arruga=20Vivas?= Date: Sat, 8 Jul 2023 19:09:12 +0200 Subject: [PATCH] Add parameters to GUILE_PKG * meta/guile.m4 (serial): Increment number. (GUILE_PKG): Add parameters. --- meta/guile.m4 | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/meta/guile.m4 b/meta/guile.m4 index 48642f027..fe842468c 100644 --- a/meta/guile.m4 +++ b/meta/guile.m4 @@ -17,7 +17,7 @@ ## Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA ## 02110-1301 USA -# serial 11 +# serial 12 ## Index ## ----- @@ -41,7 +41,7 @@ # GUILE_PKG -- find Guile development files # -# Usage: GUILE_PKG([VERSIONS]) +# Usage: GUILE_PKG([VERSIONS], [IF-FOUND], [IF-NOT-FOUND]) # # This macro runs the @code{pkg-config} tool to find development files # for an available version of Guile. @@ -49,8 +49,10 @@ # By default, this macro will search for the latest stable version of # Guile (e.g. 3.0), falling back to the previous stable version # (e.g. 2.2) if it is available. If no guile-@var{VERSION}.pc file is -# found, an error is signalled. The found version is stored in -# @var{GUILE_EFFECTIVE_VERSION}. +# found, an error is signalled when action @var{IF-NOT-FOUND} is not +# provided. Otherwise @var{IF-NOT-FOUND} is executed. The found +# version is stored in @var{GUILE_EFFECTIVE_VERSION} before +# @var{IF-FOUND} is executed. # # If @code{GUILE_PROGS} was already invoked, this macro ensures that the # development files have the same effective version as the Guile @@ -87,17 +89,18 @@ AC_DEFUN([GUILE_PKG], done if test -z "$GUILE_EFFECTIVE_VERSION"; then - AC_MSG_ERROR([ + m4_default([$3], [AC_MSG_ERROR([ No Guile development packages were found. Please verify that you have Guile installed. If you installed Guile from a binary distribution, please verify that you have also installed the development packages. If you installed it yourself, you might need to adjust your PKG_CONFIG_PATH; see the pkg-config man page for more. -]) +])]) fi AC_MSG_NOTICE([found guile $GUILE_EFFECTIVE_VERSION]) AC_SUBST([GUILE_EFFECTIVE_VERSION]) + $2 ]) # GUILE_FLAGS -- set flags for compiling and linking with Guile -- 2.40.1