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

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.
 

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
 	;;
 

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