--- ltmain.sh.orig	Tue Jul 19 22:17:15 2005
+++ ltmain.sh	Tue Jul 19 22:20:48 2005
@@ -241,7 +241,16 @@
 # Standard options:
 opt_dry_run=false
 opt_help=false
-opt_quiet=false
+# xxx jl
+if test "$lt_opt_quiet" = yes; then
+	opt_quiet=true
+	opt_silent=true
+	show=:
+else
+	opt_quiet=false
+	opt_silent=false
+	show="$ECHO"
+fi
 opt_verbose=false
 
 # func_echo arg...
@@ -249,7 +258,10 @@
 # name if it has been set yet.
 func_echo ()
 {
-    $ECHO "$progname${mode+: }$mode: "${1+"$@"}
+# xxx jl
+    if ( test "$opt_silent" = false ); then
+	    $ECHO "$progname${mode+: }$mode: "${1+"$@"}
+    fi
 }
 
 # func_verbose arg...
@@ -436,7 +448,7 @@
     my_cmd="$1"
     my_fail_exp="${2-:}"
 
-    ${opt_silent-false} || {
+     ( test "$opt_silent" = true ) || {
       func_quote_for_expand "$my_cmd"
       eval "func_echo $func_quote_for_expand_result"
     }
@@ -534,7 +546,12 @@
 mode=$default_mode
 nonopt=
 run=
-show="$ECHO"
+# xxx jl 
+if ( test "$opt_silent" = true ); then
+	show=:
+else
+	show="$ECHO"
+fi
 execute_dlfiles=
 lo2o="s/\\.lo\$/.${objext}/"
 o2lo="s/\\.${objext}\$/.lo/"
@@ -903,6 +920,9 @@
 
       --quiet|--silent)	preserve_args="$preserve_args $opt"
     			show=:
+# xxx jl
+			opt_silent=true
+			opt_quiet=true
 			;;
 
       --tag)		test "$#" -eq 0 && func_missing_arg "$opt" && break
@@ -1438,7 +1458,7 @@
     base_compile=
     srcfile="$nonopt"  #  always keep a non-empty value in "srcfile"
     suppress_opt=yes
-    suppress_output=
+    suppress_output=' > /dev/null '
     arg_mode=normal
     libobj=
     later=
@@ -1697,6 +1717,11 @@
 
       $run $RM "$lobj" "$output_obj"
 
+# xxx jl
+	if test "$suppress_opt" = yes; then
+        	suppress_output=' >/dev/null ';
+		command="$command$suppress_output";
+	fi
       $show "$command"
       if $run eval "$command"; then :
       else
@@ -1743,7 +1768,8 @@
 
       # Allow error messages only from the first compilation.
       if test "$suppress_opt" = yes; then
-	suppress_output=' >/dev/null 2>&1'
+	#suppress_output=' >/dev/null 2>&1'
+	suppress_output=' >/dev/null '
       fi
     else
       # No PIC object so indicate it doesn't exist in the libtool
@@ -1984,6 +2010,11 @@
 	  for cmd in $cmds; do
 	    IFS="$save_ifs"
 	    eval cmd=\"$cmd\"
+# xxx jl
+	        if test "$suppress_opt" = yes; then
+        	        suppress_output=' >/dev/null ';
+                	cmd="$cmd$suppress_output";
+        	fi 
 	    $show "$cmd"
 	    $run eval "$cmd" || admincmds="$admincmds
        $cmd"
@@ -1993,6 +2024,11 @@
 	if test -n "$finish_eval"; then
 	  # Do the single finish_eval.
 	  eval cmds=\"$finish_eval\"
+# xxx jl
+                if test "$suppress_opt" = yes; then
+                        suppress_output=' >/dev/null ';
+                        cmds="$cmds$suppress_output";
+                fi
 	  $run eval "$cmds" || admincmds="$admincmds
        $cmds"
 	fi
@@ -2090,7 +2126,11 @@
 
       case $arg in
       -d) isdir=yes ;;
-      -f) prev="-f" ;;
+      -f) if test "$install_prog" = "cp";
+                then prev=
+          else
+		prev="-f" 
+	  fi	;;
       -g) prev="-g" ;;
       -m) prev="-m" ;;
       -o) prev="-o" ;;
@@ -2230,6 +2270,11 @@
 	    relink_command=`$ECHO "$relink_command" | $SED "address@hidden@%%"`
 	  fi
 
+# xxx jl
+                if test "$suppress_opt" = yes; then
+                        suppress_output=' >/dev/null ';
+                        relink_command="$relink_command$suppress_output";
+                fi
 	  func_warning "relinking \`$file'"
 	  $show "$relink_command"
 	  $run eval "$relink_command" || \
@@ -2271,6 +2316,11 @@
 	  save_ifs="$IFS"; IFS='~'
 	  for cmd in $cmds; do
 	    IFS="$save_ifs"
+# xxx jl
+                if test "$suppress_opt" = yes; then
+                        suppress_output=' >/dev/null ';
+                        cmd="$cmd$suppress_output";
+                fi 
 	    eval cmd=\"$cmd\"
 	    $show "$cmd"
 	    $run eval "$cmd" || exit $?
@@ -2422,7 +2472,11 @@
 	      outputname="$tmpdir/$file"
 	      # Replace the output file specification.
 	      relink_command=`$ECHO "X$relink_command" | $Xsed -e 'address@hidden@%'"$outputname"'%g'`
-
+# xxx jl
+                if test "$suppress_opt" = yes; then
+                        suppress_output=' >/dev/null ';
+                        relink_command="$relink_command$suppress_output";
+                fi
 	      $show "$relink_command"
 	      if $run eval "$relink_command"; then :
 	      else
@@ -2484,6 +2538,11 @@
       for cmd in $cmds; do
 	IFS="$save_ifs"
 	eval cmd=\"$cmd\"
+# xxx jl
+                if test "$suppress_opt" = yes; then
+                        suppress_output=' >/dev/null ';
+                        cmd="$cmd$suppress_output";
+                fi
 	$show "$cmd"
 	$run eval "$cmd" || exit $?
       done
@@ -4064,6 +4123,11 @@
 	      for cmd in $cmds; do
 		IFS="$save_ifs"
 		eval cmd=\"$cmd\"
+# xxx jl
+                if test "$suppress_opt" = yes; then
+                        suppress_output=' >/dev/null ';
+                        cmd="$cmd$suppress_output";
+                fi
 		$show "$cmd"
 		$run eval "$cmd" || exit $?
 	      done
@@ -4078,6 +4142,11 @@
 	      for cmd in $cmds; do
 		IFS="$save_ifs"
 		eval cmd=\"$cmd\"
+# xxx jl
+                if test "$suppress_opt" = yes; then
+                        suppress_output=' >/dev/null ';
+                        cmd="$cmd$suppress_output";
+                fi
 		$show "$cmd"
 		$run eval "$cmd" || exit $?
 	      done
@@ -5325,6 +5394,11 @@
 	      eval cmd=\"$cmd\"
 	      if len=`expr "X$cmd" : ".*"` &&
 	       test "$len" -le "$max_cmd_len" || test "$max_cmd_len" -le -1; then
+# xxx jl
+                if test "$suppress_opt" = yes; then
+                        suppress_output=' >/dev/null ';
+                        cmd="$cmd$suppress_output";
+                fi
 		$show "$cmd"
 		$run eval "$cmd" || exit $?
 		skipped_export=false
@@ -5501,6 +5575,11 @@
 	    save_ifs="$IFS"; IFS='~'
 	    for cmd in $concat_cmds; do
 	      IFS="$save_ifs"
+# xxx jl
+                if test "$suppress_opt" = yes; then
+                        suppress_output=' >/dev/null ';
+                        cmd="$cmd$suppress_output";
+                fi
 	      $show "$cmd"
 	      $run eval "$cmd" || {
 		lt_exit=$?
@@ -5560,6 +5639,11 @@
 	  IFS="$save_ifs"
 	  eval cmd=\"$cmd\"
 	  func_quote_for_expand "$cmd"
+# xxx jl
+                if test "$suppress_opt" = yes; then
+                        suppress_output=' >/dev/null ';
+                        cmd="$cmd$suppress_output";
+                fi
 	  eval \$show "$func_quote_for_expand_result"
 	  $run eval "$cmd" || {
 	    lt_exit=$?
@@ -5672,6 +5756,11 @@
       for cmd in $cmds; do
 	IFS="$save_ifs"
 	eval cmd=\"$cmd\"
+# xxx jl
+                if test "$suppress_opt" = yes; then
+                        suppress_output=' >/dev/null ';
+                        cmd="$cmd$suppress_output";
+                fi
 	$show "$cmd"
 	$run eval "$cmd" || exit $?
       done
@@ -5709,6 +5798,11 @@
 	for cmd in $cmds; do
 	  IFS="$save_ifs"
 	  eval cmd=\"$cmd\"
+# xxx jl
+                if test "$suppress_opt" = yes; then
+                        suppress_output=' >/dev/null ';
+                        cmd="$cmd$suppress_output";
+                fi
 	  $show "$cmd"
 	  $run eval "$cmd" || exit $?
 	done
@@ -5892,6 +5986,12 @@
 	compile_command=`$ECHO "X$compile_command" | $Xsed -e 'address@hidden@%'"$output"'%g'`
 	link_command="$compile_command$compile_rpath"
 
+# xxx jl
+                if test "$suppress_opt" = yes; then
+                        suppress_output=' >/dev/null ';
+                        link_command="$link_command$suppress_output";
+                fi
+
 	# We have no uninstalled library dependencies, so finalize right now.
 	$show "$link_command"
 	$run eval "$link_command"
@@ -5959,6 +6059,11 @@
 	link_command=`$ECHO "X$link_command" | $Xsed -e 'address@hidden@%'"$output"'%g'`
 	# Delete the old output file.
 	$run $RM $output
+# xxx jl
+                if test "$suppress_opt" = yes; then
+                        suppress_output=' >/dev/null ';
+                        link_command="$link_command$suppress_output";
+                fi
 	# Link the executable and exit
 	$show "$link_command"
 	$run eval "$link_command" || exit $?
@@ -5992,7 +6097,11 @@
 
       # Delete the old output files.
       $run $RM $output $output_objdir/$outputname $output_objdir/lt-$outputname
-
+# xxx jl
+                if test "$suppress_opt" = yes; then
+                        suppress_output=' >/dev/null ';
+                        link_command="$link_command$suppress_output";
+                fi
       $show "$link_command"
       $run eval "$link_command" || exit $?
 
@@ -6673,6 +6782,11 @@
       for cmd in $cmds; do
 	eval cmd=\"$cmd\"
 	IFS="$save_ifs"
+# xxx jl
+                if test "$suppress_opt" = yes; then
+                        suppress_output=' >/dev/null ';
+                        cmd="$cmd$suppress_output";
+                fi
 	$show "$cmd"
 	$run eval "$cmd" || exit $?
       done
@@ -6930,6 +7044,11 @@
 	      for cmd in $cmds; do
 		IFS="$save_ifs"
 		eval cmd=\"$cmd\"
+# xxx jl
+                if test "$suppress_opt" = yes; then
+                        suppress_output=' >/dev/null ';
+                        cmd="$cmd$suppress_output";
+                fi
 		$show "$cmd"
 		$run eval "$cmd"
 		if test "$?" -ne 0 && test "$rmforce" != yes; then
@@ -6946,6 +7065,11 @@
 	      for cmd in $cmds; do
 		IFS="$save_ifs"
 		eval cmd=\"$cmd\"
+# xxx jl
+                if test "$suppress_opt" = yes; then
+                        suppress_output=' >/dev/null ';
+                        cmd="$cmd$suppress_output";
+                fi
 		$show "$cmd"
 		$run eval "$cmd"
 		if test "$?" -ne 0 && test "$rmforce" != yes; then