* lib/m4sugar/m4sh.m4 (_AS_VERSION_COMPARE_PREPARE):

Work around bug in Solaris 9 (and 10) /usr/xpg4/bin/awk.

diff --git a/ChangeLog b/ChangeLog
index d153d545ebae22e88f05e7cf7f6c974728a740a8..b9c7a0fd9ef6b3771d3604f71fa2c0fd5c7f09ff 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2005-08-25  Paul Eggert  <eggert@cs.ucla.edu>
+
+       * lib/m4sugar/m4sh.m4 (_AS_VERSION_COMPARE_PREPARE):
+       Work around bug in Solaris 9 (and 10) /usr/xpg4/bin/awk.
+
 2005-08-24  Stepan Kasal  <kasal@ucw.cz>
 
        * lib/autoconf/general.m4 (_AC_CANONICAL_SPLIT): Simplify; rejecting

diff --git a/lib/m4sugar/m4sh.m4 b/lib/m4sugar/m4sh.m4
index 8e5af193a41d3aaa19d52f8dbb53780fafe4a289..7884303a8afcab3f562c5ec5c3821b4e3e54847b 100644 (file)
--- a/lib/m4sugar/m4sh.m4
+++ b/lib/m4sugar/m4sh.m4
@@ -1074,8 +1074,8 @@ m4_defun([_AS_VERSION_COMPARE_PREPARE],
        }
       } else {
        # The normal case, without worrying about digits.
-       if (v1 == "") d1 = v1; else { d1 = substr(v1, 1, 1); v1 = substr(v1,2) }
-       if (v2 == "") d2 = v2; else { d2 = substr(v2, 1, 1); v2 = substr(v2,2) }
+       if (length(v1)) { d1 = substr(v1, 1, 1); v1 = substr(v1,2) } else d1=v1
+       if (length(v2)) { d2 = substr(v2, 1, 1); v2 = substr(v2,2) } else d2=v2
       }
       if (d1 < d2) exit 1
       if (d1 > d2) exit 2