* ltmain.in (version-number) [irix]: Don't subtract 1 from

major as it may be less than age.

diff --git a/ChangeLog b/ChangeLog
index 18f4e36347f902297494ca6b4dc5958d46c33b9b..b4e8dc49607a6a3ee59e099e03278300ed074603 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2007-06-22  Peter O'Gorman  <peter@pogma.com>
+
+       * ltmain.in (version-number) [irix]: Don't subtract 1 from
+       major as it may be less than age.
+
 2007-06-17  Peter O'Gorman  <peter@pogma.com>
 
        * libtool.m4 (AC_LIBTOOL_SYS_MAX_CMD_LEN): add quotes to

diff --git a/ltmain.in b/ltmain.in
index 9328f1560029ec15ed09fdf8dc7ee584dd44fdd8..5beacf68b2e25c7d1a3533eaae97b61b5b82d190 100644 (file)
--- a/ltmain.in
+++ b/ltmain.in
@@ -3239,9 +3239,10 @@ EOF
            age="0"
            ;;
          irix|nonstopux)
-           current=`expr $number_major + $number_minor - 1`
+           current=`expr $number_major + $number_minor`
            age="$number_minor"
            revision="$number_minor"
+           lt_irix_increment=no
            ;;
          esac
          ;;
@@ -3315,8 +3316,11 @@ EOF
          ;;
 
        irix | nonstopux)
-         major=`expr $current - $age + 1`
-
+         if test "X$lt_irix_increment" = "Xno"; then
+           major=`expr $current - $age`
+         else
+           major=`expr $current - $age + 1`
+         fi
          case $version_type in
            nonstopux) verstring_prefix=nonstopux ;;
            *)         verstring_prefix=sgi ;;