From: Peter O'Gorman <peter@pogma.com>
Date: Fri, 22 Jun 2007 06:21:03 +0000 (+0000)
Subject: * libltdl/config/ltmain.m4sh (version-number) [irix]: Don't subtract
X-Git-Tag: release-2-1b~110
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=4b008019bcd89f8a1e75fa6c07e95459740ef4cf;p=thirdparty%2Flibtool.git

* 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 8ee99e499..bff479437 100644
--- 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 54781274b..3030b9827 100644
--- 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 ;;