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

* m4/libtool.m4 (_LT_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 c8962802a..4604b2ec9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2005-04-23  Gary Kumfert <kumfert@llnl.gov>
+
+	* m4/libtool.m4 (_LT_LANG_F77_CONFIG) [ aix4, aix5 ]:
+	Adjust logic to match the C case: Only disable static if not
+	on ia64 nor runtimelinking.
+
 2005-04-22  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>  (tiny change)
 
 	* Makefile.am, HACKING: Use lt__cd throughout.
diff --git a/m4/libtool.m4 b/m4/libtool.m4
index 6b2e4992d..540f4ef79 100644
--- a/m4/libtool.m4
+++ b/m4/libtool.m4
@@ -5862,7 +5862,9 @@ if test "$_lt_caught_F77_error" != yes; then
         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])