--- libtool.m4	Wed Oct 10 15:25:35 2001
+++ libtool.m4.1	Wed Oct 10 15:24:42 2001
@@ -4439,9 +4439,9 @@
 	test -f $output_objdir/impgen.exe || (cd $output_objdir && \
 	if test "x$HOST_CC" != "x" ; then $HOST_CC -o impgen impgen.c ; \
 	else $CC -o impgen impgen.c ; fi)~
-	$output_objdir/impgen $dir/$soroot > $output_objdir/$soname-def'
+	$output_objdir/impgen $dir/$soroot > $output_objdir/$soname.def'
 
-      _LT_AC_TAGVAR(old_archive_from_expsyms_cmds, $1)='$DLLTOOL --as=$AS --dllname $soname --def $output_objdir/$soname-def --output-lib $output_objdir/$newlib'
+      _LT_AC_TAGVAR(old_archive_from_expsyms_cmds, $1)='$DLLTOOL --as=$AS --dllname $soname --def $output_objdir/$soname.def --output-lib $output_objdir/$newlib'
 
       # cygwin and mingw dlls have different entry points and sets of symbols
       # to exclude.
@@ -4476,32 +4476,28 @@
       # the compiled dll only exports the symbol export list.
       # Be careful not to strip the DATA tag left by newer dlltools.
       _LT_AC_TAGVAR(export_symbols_cmds, $1)="$ltdll_cmds"'
-	$DLLTOOL --export-all --exclude-symbols '$dll_exclude_symbols' --output-def $output_objdir/$soname-def '$ltdll_obj'$libobjs $convenience~
-	sed -e "1,/EXPORTS/d" -e "s/ @ [[0-9]]*//" -e "s/ *;.*$//" < $output_objdir/$soname-def > $export_symbols'
+	$DLLTOOL --export-all --exclude-symbols '$dll_exclude_symbols' --output-def $output_objdir/$soname.def '$ltdll_obj'$libobjs $convenience~
+	sed -e "1,/EXPORTS/d" -e "s/ @ [[0-9]]*//" -e "s/ *;.*$//" < $output_objdir/$soname.def > $export_symbols'
 
       # If the export-symbols file already is a .def file (1st line
       # is EXPORTS), use it as is.
       # If DATA tags from a recent dlltool are present, honour them!
       _LT_AC_TAGVAR(archive_expsym_cmds, $1)='if test "x`head -1 $export_symbols`" = xEXPORTS; then
-	  cp $export_symbols $output_objdir/$soname-def;
+	  cp $export_symbols $output_objdir/$soname.def;
 	else
-	  echo EXPORTS > $output_objdir/$soname-def;
+	  echo EXPORTS > $output_objdir/$soname.def;
 	  _lt_hint=1;
 	  cat $export_symbols | while read symbol; do
 	   set dummy \$symbol;
 	   case \[$]# in
-	     2) echo "   \[$]2 @ \$_lt_hint ; " >> $output_objdir/$soname-def;;
-	     *) echo "   \[$]2 @ \$_lt_hint \[$]3 ; " >> $output_objdir/$soname-def;;
+	     2) echo "   \[$]2 @ \$_lt_hint ; " >> $output_objdir/$soname.def;;
+	     *) echo "   \[$]2 @ \$_lt_hint \[$]3 ; " >> $output_objdir/$soname.def;;
 	   esac;
 	   _lt_hint=`expr 1 + \$_lt_hint`;
 	  done;
 	fi~
 	'"$ltdll_cmds"'
-	$CC -Wl,--base-file,$output_objdir/$soname-base '$lt_cv_cc_dll_switch' -Wl,-e,'$dll_entry' -o $output_objdir/$soname '$ltdll_obj'$libobjs $deplibs $compiler_flags~
-	$DLLTOOL --as=$AS --dllname $soname --exclude-symbols '$dll_exclude_symbols' --def $output_objdir/$soname-def --base-file $output_objdir/$soname-base --output-exp $output_objdir/$soname-exp~
-	$CC -Wl,--base-file,$output_objdir/$soname-base $output_objdir/$soname-exp '$lt_cv_cc_dll_switch' -Wl,-e,'$dll_entry' -o $output_objdir/$soname '$ltdll_obj'$libobjs $deplibs $compiler_flags~
-	$DLLTOOL --as=$AS --dllname $soname --exclude-symbols '$dll_exclude_symbols' --def $output_objdir/$soname-def --base-file $output_objdir/$soname-base --output-exp $output_objdir/$soname-exp --output-lib $output_objdir/$libname.dll.a~
-	$CC $output_objdir/$soname-exp '$lt_cv_cc_dll_switch' -Wl,-e,'$dll_entry' -o $output_objdir/$soname '$ltdll_obj'$libobjs $deplibs $compiler_flags'
+	$CC -shared  '$lt_cv_cc_dll_switch' -Wl,--out-implib=$output_objdir/$libname.dll.a -Wl,-e,'$dll_entry' -o $output_objdir/$soname $output_objdir/$soname.def '$ltdll_obj'$libobjs $deplibs $compiler_flags'
       ;;
 
     netbsd*)