From: Gary Kumfert <kumfert@llnl.gov>
Date: Sat, 23 Apr 2005 08:16:40 +0000 (+0000)
Subject: * libtool.m4 (AC_LIBTOOL_LANG_F77_CONFIG) [ aix4, aix5 ]:
X-Git-Tag: release-1-5-16~3
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1334cbd5b3c6f5ad85d7d124c3eda50991f2561f;p=thirdparty%2Flibtool.git

* libtool.m4 (AC_LIBTOOL_LANG_F77_CONFIG) [ aix4, aix5 ]:
Adjust logic to match the C case: Only disable static if not
on ia64 nor runtimelinking.
---

diff --git a/ChangeLog b/ChangeLog
index 0c2f5b4b4..96e24f453 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2005-04-23  Gary Kumfert <kumfert@llnl.gov>
+
+	* libtool.m4 (AC_LIBTOOL_LANG_F77_CONFIG) [ aix4, aix5 ]:
+	Adjust logic to match the C case: Only disable static if not
+	on ia64 nor runtimelinking.
+
 2005-04-23  Jonathan Ryshpan <jonrysh@pacbell.net>
 
 	* doc/libtool.texi: Get rid of overfull hboxes.
diff --git a/libtool.m4 b/libtool.m4
index 290af393a..ba09dfd76 100644
--- a/libtool.m4
+++ b/libtool.m4
@@ -3814,7 +3814,9 @@ aix3*)
   fi
   ;;
 aix4* | aix5*)
-  test "$enable_shared" = yes && enable_static=no
+  if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
+    test "$enable_shared" = yes && enable_static=no
+  fi
   ;;
 esac
 AC_MSG_RESULT([$enable_shared])