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 <ebb9@byu.net>

diff --git a/ChangeLog b/ChangeLog
index 8ae2ef62cbe8bced8ef316306d76ff717d168d31..6491d76dcc2153567b04498601b7f0d98d8522c5 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2008-07-15  Eric Blake  <ebb9@byu.net>
+
+       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  <ebb9@byu.net>
 
        Tighten bound of potential speed of m4_append.

diff --git a/lib/m4sugar/m4sugar.m4 b/lib/m4sugar/m4sugar.m4
index a4d6f12802f77250b68bcabf646d6f93ef4e9277..88eebf027b1586f79b899297441db9a7817a832f 100644 (file)
--- 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])]]))