* libltdl/config/ltmain.m4sh (func_mode_link): Don't modify

user provided symbols file. Adjust removal of temporary files
and also remove temporary files used during symbols file
filtering.

diff --git a/ChangeLog b/ChangeLog
index 1a889865162943e7d1de69390e6a3ffe369a7f27..4a41bfa6dafceebe9222864a926ee99a85983bde 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2005-09-29  Peter Ekberg  <peda@lysator.liu.se>
+
+       * libltdl/config/ltmain.m4sh (func_mode_link): Don't modify
+       user provided symbols file. Adjust removal of temporary files
+       and also remove temporary files used during symbols file
+       filtering.
+
 2005-09-29  Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
 
        * libtoolize.m4sh (func_included_files): Do not recurse

diff --git a/libltdl/config/ltmain.m4sh b/libltdl/config/ltmain.m4sh
index 68f18bcdd1ae14e6c41430e3b97df7027fb93b76..1ac571990ef8d397adc50dc97732a840722662e5 100644 (file)
--- a/libltdl/config/ltmain.m4sh
+++ b/libltdl/config/ltmain.m4sh
@@ -4932,6 +4932,13 @@ EOF
        # Use standard objects if they are pic
        test -z "$pic_flag" && libobjs=`$ECHO "X$libobjs" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP`
 
+       delfiles=
+       if test -n "$export_symbols$include_expsyms"; then
+         $opt_dry_run || cp "$export_symbols" "$output_objdir/$libname.uexp"
+         export_symbols="$output_objdir/$libname.uexp"
+         delfiles="$delfiles $export_symbols"
+       fi
+
        orig_export_symbols=
        case $host_os in
        cygwin* | mingw*)
@@ -4984,7 +4991,7 @@ EOF
          fi
        fi
 
-       if test -n "$export_symbols" && test -n "$include_expsyms"; then
+       if test -n "$export_symbols$include_expsyms"; then
          tmp_export_symbols="$export_symbols"
          test -n "$orig_export_symbols" && tmp_export_symbols="$orig_export_symbols"
          $opt_dry_run || eval '$ECHO "X$include_expsyms" | $Xsed | $SP2NL >> "$tmp_export_symbols"'
@@ -4999,6 +5006,7 @@ EOF
          # global variables. join(1) would be nice here, but unfortunately
          # isn't a blessed tool.
          $opt_dry_run || $SED -e '/[[ ,]]DATA/!d;s,\(.*\)\([[ \,]].*\),s|^\1$|\1\2|,' < $export_symbols > $output_objdir/$libname.filter
+         delfiles="$delfiles $export_symbols $output_objdir/$libname.filter"
          export_symbols=$output_objdir/$libname.def
          $opt_dry_run || $SED -f $output_objdir/$libname.filter < $orig_export_symbols > $export_symbols
        fi
@@ -5084,7 +5092,6 @@ EOF
          test_cmds=
          concat_cmds=
          objlist=
-         delfiles=
          last_robj=
          k=1
 
@@ -5211,9 +5218,10 @@ EOF
              cmds=$archive_cmds
            fi
          fi
+       fi
 
-         # Append the command to remove the reloadable object files
-         # to the just-reset $cmds.
+       if test -n "$delfiles"; then
+         # Append the command to remove temporary files to $cmds.
          eval cmds=\"\$cmds~\$RM $delfiles\"
        fi