* libltdl/config/ltmain.m4sh (func_mode_link): When creating

reloadable object files, avoid issuing plain `rm -f' without
further arguments, even if the line length limit is ridiculously
low as in the `Run tests with low max_cmd_len' test.  This
failure is exposed on NetBSD.
Report by Patrick Welche.

diff --git a/ChangeLog b/ChangeLog
index c674683f3cfb11eed82b13d5ac9223df59854fe8..f09fc7792fdff79a6d5eb56cd84585c89c216118 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
 2008-01-02  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
 
+       * libltdl/config/ltmain.m4sh (func_mode_link): When creating
+       reloadable object files, avoid issuing plain `rm -f' without
+       further arguments, even if the line length limit is ridiculously
+       low as in the `Run tests with low max_cmd_len' test.  This
+       failure is exposed on NetBSD.
+       Report by Patrick Welche.
+
        * Makefile.am (EXTRA_DIST): Add ChangeLog.2007.
        * ChangeLog.2007: New, rotated, from...
        * ChangeLog: ...here.

diff --git a/libltdl/config/ltmain.m4sh b/libltdl/config/ltmain.m4sh
index 8db819d93a7f38504d57e179d3a47afbfb71a113..43e17152f5b8b4a4a4fef0d3ea3222358d1f776c 100644 (file)
--- a/libltdl/config/ltmain.m4sh
+++ b/libltdl/config/ltmain.m4sh
@@ -6184,7 +6184,10 @@ EOF
              # reloadable object file.  All subsequent reloadable object
              # files will link in the last one created.
              test -z "$concat_cmds" || concat_cmds=$concat_cmds~
-             eval concat_cmds=\"\${concat_cmds}$reload_cmds $objlist $last_robj~\$RM $last_robj\"
+             eval concat_cmds=\"\${concat_cmds}$reload_cmds $objlist $last_robj\"
+             if test -n "$last_robj"; then
+               eval concat_cmds=\"\${concat_cmds}~\$RM $last_robj\"
+             fi
              delfiles="$delfiles $output"
 
            else
@@ -6199,7 +6202,7 @@ EOF
              # Append the command to create the export file.
              test -z "$concat_cmds" || concat_cmds=$concat_cmds~
              eval concat_cmds=\"\$concat_cmds$export_symbols_cmds\"
-             if test -n "$output"; then
+             if test -n "$last_robj"; then
                eval concat_cmds=\"\$concat_cmds~\$RM $last_robj\"
              fi
            fi