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

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

diff --git a/ChangeLog b/ChangeLog
index 9e46baaceb22741efdfa30241d2cfe81d7137c39..ae49da2c40894343b93689b096e5ca95e9cae77f 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 part of the previous delta.
+
        * mdemo/configure.in: Don't use -static on AIX4.1.
        * mdemo/Makefile.am: Likewise.
 

diff --git a/ltmain.in b/ltmain.in
index 7f354769b0efb3254820aa5c5ce8ff8c19cab56e..72b319cf5912d315b030f2b478bfc28b9b2eacbc 100644 (file)
--- a/ltmain.in
+++ b/ltmain.in
@@ -1115,11 +1115,11 @@ compiler."
        ;;
 
       -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 669b7ce387aab56e1319db4c5625567a2fd78530..2708f9a7431f204dd6a550868e8c349bfba099d7 100644 (file)
--- a/mdemo/configure.in
+++ b/mdemo/configure.in
@@ -23,13 +23,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