From 6eb7c48491791475a3e557f632445d76aa8ce57c Mon Sep 17 00:00:00 2001 From: Eric Blake Date: Tue, 15 Jul 2008 14:53:21 -0600 Subject: [PATCH] Avoid failure if version.m4 is omitted but m4_PACKAGE_* unused. * lib/m4sugar/m4sugar.m4 (m4_version_compare): Provide alternate definition for non-Autoconf clients of m4sugar. Signed-off-by: Eric Blake --- ChangeLog | 6 ++++++ lib/m4sugar/m4sugar.m4 | 14 ++++++++------ 2 files changed, 14 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index 8ae2ef62..6491d76d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2008-07-15 Eric Blake + + Avoid failure if version.m4 is omitted but m4_PACKAGE_* unused. + * lib/m4sugar/m4sugar.m4 (m4_version_compare): Provide alternate + definition for non-Autoconf clients of m4sugar. + 2008-07-14 Eric Blake Tighten bound of potential speed of m4_append. diff --git a/lib/m4sugar/m4sugar.m4 b/lib/m4sugar/m4sugar.m4 index a4d6f128..88eebf02 100644 --- a/lib/m4sugar/m4sugar.m4 +++ b/lib/m4sugar/m4sugar.m4 @@ -2243,12 +2243,14 @@ m4_sinclude([m4sugar/version.m4]) # ---------------------------------------------------- # Check this Autoconf version against VERSION. m4_define([m4_version_prereq], -[m4_if(m4_version_compare(]m4_dquote(m4_defn([m4_PACKAGE_VERSION]))[, [$1]), - [-1], - [m4_default([$3], - [m4_fatal([Autoconf version $1 or higher is required], - [63])])], - [$2])]) +m4_ifdef([m4_PACKAGE_VERSION], +[[m4_if(m4_version_compare(]m4_dquote(m4_defn([m4_PACKAGE_VERSION]))[, [$1]), + [-1], + [m4_default([$3], + [m4_fatal([Autoconf version $1 or higher is required], + [63])])], + [$2])]], +[[m4_fatal([m4sugar/version.m4 not found])]])) -- 2.11.4.GIT