* libltdl/config/ltmain.m4sh (version-number) [irix]: Don't subtract

1 from major as it may be less than age.

diff --git a/ChangeLog b/ChangeLog
index 8ee99e4998d997adfe628897219ce8a521fe6646..bff479437549e81f9151602c3df538268f38355c 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2007-06-22  Peter O'Gorman  <peter@pogma.com>
+
+       * libltdl/config/ltmain.m4sh (version-number) [irix]: Don't subtract
+       1 from major as it may be less than age.
+
 2007-06-21  Noah Misch  <noah@cs.caltech.edu>
 
        * tests/f77demo/configure.ac [--with-dist]: New option.  Skip most

diff --git a/libltdl/config/ltmain.m4sh b/libltdl/config/ltmain.m4sh
index 54781274b0985bbdaaaaaf2ae5d71c7c1f890744..3030b98274b645945ee7e5ab5118e4716c940180 100644 (file)
--- a/libltdl/config/ltmain.m4sh
+++ b/libltdl/config/ltmain.m4sh
@@ -5189,9 +5189,10 @@ func_mode_link ()
            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
          ;;
@@ -5261,7 +5262,11 @@ func_mode_link ()
          ;;
 
        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 ;;