* ltmain.in (link -static): Don't add $link_static_flag; only

-all-static should do that.
* mdemo/configure.in: Revert the previous delta.

diff --git a/ChangeLog b/ChangeLog
index d91f9c5f571a9bd90b9fb2339860ab14fb85dc34..2fd3d67119ce08c7bc53864eb32ebd3dc376bf64 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2000-09-04  Alexandre Oliva  <aoliva@redhat.com>
 
+       * ltmain.in (link -static): Don't add $link_static_flag; only
+       -all-static should do that.
+       * mdemo/configure.in: Revert the previous delta.
+
        * mdemo/configure.in: Don't use -static on AIX4.1.
 
 2000-09-03  Alexandre Oliva  <aoliva@redhat.com>

diff --git a/ltmain.in b/ltmain.in
index aebdb8a57308a49721b22cd22dbc9920da19a642..ec2eeba8a55391c2244233473ffad3e4c0bda968 100644 (file)
--- a/ltmain.in
+++ b/ltmain.in
@@ -1180,11 +1180,11 @@ EOF
        ;;
 
       -static)
-       # If we have no pic_flag, then this is the same as -all-static.
-       if test -z "$pic_flag" && test -n "$link_static_flag"; then
-         compile_command="$compile_command $link_static_flag"
-         finalize_command="$finalize_command $link_static_flag"
-       fi
+        # The effects of -static are defined in a previous loop.
+       # We used to do the same as -all-static on platforms that
+       # didn't have a PIC flag, but the assumption that the effects
+       # would be equivalent was wrong.  It would break on at least
+       # Digital Unix and AIX.
        continue
        ;;
 

diff --git a/mdemo/configure.in b/mdemo/configure.in
index 676ebe44f1767b01735373c7a94c0e122cd57aea..93ff01ef18eff7681f2d9ce0bd72cf18220d6ced 100644 (file)
--- a/mdemo/configure.in
+++ b/mdemo/configure.in
@@ -21,13 +21,6 @@ else
 fi
 AC_SUBST(STATIC)
 
-case $host_os in
-dnl aix 4.1 provides dlopen() through -lsvld, but this library can't
-dnl be linked statically.
-aix4.[[01]]*)
-  STATIC= ;;
-esac
-
 AC_CHECK_HEADERS(math.h)
 
 AC_CHECK_LIBM