* 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 c8962802a868b73aec2e75996f5cc5ead8c988c2..4604b2ec9765e6b6d4ea5c97687525b8e82005c6 100644 (file)
--- 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 6b2e4992d06ecd502f35d633f817847c8b359014..540f4ef793924f15a5f28b7c2000c23308bb7372 100644 (file)
--- 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])