Applied to all three branches.
(Extracted from Gary's babel packages' changes against 1.5.10).

Regards,
Ralf

2005-04-23  Gary Kumfert <[EMAIL PROTECTED]>

        * 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-23  Gary Kumfert <[EMAIL PROTECTED]>

        * 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.

Index: m4/libtool.m4
===================================================================
RCS file: /cvsroot/libtool/libtool/m4/libtool.m4,v
retrieving revision 1.125.2.50
diff -u -r1.125.2.50 libtool.m4
--- m4/libtool.m4       22 Apr 2005 10:03:59 -0000      1.125.2.50
+++ m4/libtool.m4       23 Apr 2005 07:35:24 -0000
@@ -5816,7 +5816,9 @@
         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])
2005-04-23  Gary Kumfert <[EMAIL PROTECTED]>

        * 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.

Index: libtool.m4
===================================================================
RCS file: /cvsroot/libtool/libtool/Attic/libtool.m4,v
retrieving revision 1.314.2.84
diff -u -r1.314.2.84 libtool.m4
--- libtool.m4  22 Apr 2005 16:40:01 -0000      1.314.2.84
+++ libtool.m4  23 Apr 2005 07:38:15 -0000
@@ -3814,7 +3814,9 @@
   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])

Reply via email to