* ltmain.in (SP2NL, NL2SP): Don't delete empty lines, as this

	would lose for files with embedded blanks.

diff --git a/ChangeLog b/ChangeLog
index 136aba7f06d8dd2b8c11992edf0259a52a7e2065..ea1fa1149b1f04512a6de9af08fbb27e2621c7bf 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 1999-01-05  Alexandre Oliva  <oliva@dcc.unicamp.br>
 
+       * ltmain.in (SP2NL, NL2SP): Don't delete empty lines, as this
+       would lose for files with embedded blanks.
+       
        * ltconfig.in (cygwin, archive_cmds, archive_sym_cmds): Moved
        ltdll.c into ltmain.in, to avoid its duplication, and added a sed
        script to extract it.  Also, create def and base files in $objdir,

diff --git a/ltmain.in b/ltmain.in
index 9358cd03a509caed95ef4a37fd7d0981799e3b06..72a0f76ccd3783c390381d4cdf3af4b87dfe2b39 100644 (file)
--- a/ltmain.in
+++ b/ltmain.in
@@ -1420,7 +1420,7 @@ compiler."
        oldlibs="$oldlibs $output_objdir/$libname.$libext"
 
        # Transform .lo files to .o files.
-       oldobjs="$objs "`$echo "X$libobjs" | $SP2NL | $Xsed -e '/\.'${libext}'$/d' -e "$lo2o" -e '/^$/d' | $NL2SP`
+       oldobjs="$objs "`$echo "X$libobjs" | $SP2NL | $Xsed -e '/\.'${libext}'$/d' -e "$lo2o" | $NL2SP`
       fi
 
       if test "$build_libtool_libs" = yes; then
@@ -1607,7 +1607,7 @@ EOF
        done
 
        # Use standard objects if they are PIC.
-       test -z "$pic_flag" && libobjs=`$echo "X$libobjs" | $SP2NL | $Xsed -e "$lo2o" -e '/^$/d' | $NL2SP`
+       test -z "$pic_flag" && libobjs=`$echo "X$libobjs" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP`
 
        if test -n "$whole_archive_flag_spec"; then
          if test -n "$convenience"; then
@@ -1710,7 +1710,7 @@ EOF
       $run $rm $obj $libobj
 
       # Create the old-style object.
-      reload_objs="$objs "`$echo "X$libobjs" | $SP2NL | $Xsed -e '/\.'${libext}$'/d' -e '/\.lib$/d' -e "$lo2o" -e '/^$/d' | $NL2SP`
+      reload_objs="$objs "`$echo "X$libobjs" | $SP2NL | $Xsed -e '/\.'${libext}$'/d' -e '/\.lib$/d' -e "$lo2o" | $NL2SP`
 
       output="$obj"
       eval cmds=\"$reload_cmds\"
@@ -1818,8 +1818,8 @@ EOF
 
       if test -n "$libobjs" && test "$build_old_libs" = yes; then
        # Transform all the library objects into standard objects.
-       compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e "$lo2o" -e '/^$/d' | $NL2SP`
-       finalize_command=`$echo "X$finalize_command" | $SP2NL | $Xsed -e "$lo2o" -e '/^$/d' | $NL2SP`
+       compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP`
+       finalize_command=`$echo "X$finalize_command" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP`
       fi
 
       if test "$export_dynamic" = yes && test -n "$NM" && test -n "$global_symbol_pipe"; then
@@ -1834,7 +1834,7 @@ EOF
        *.c)
          if test -z "$export_symbols"; then
            # Add our own program objects to the preloaded list.
-           dlprefiles=`$echo "X$objs $dlprefiles" | $SP2NL | $Xsed -e "$lo2o" -e '/^$/d' | $NL2SP`
+           dlprefiles=`$echo "X$objs $dlprefiles" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP`
          fi
 
          # Discover the nlist of each of the dlfiles.
@@ -2215,7 +2215,7 @@ fi\
        addlibs="$convenience"
        build_libtool_libs=no
       else
-       oldobjs="$objs "`$echo "X$libobjs" | $SP2NL | $Xsed -e '/\.'${libext}'$/d' -e '/\.lib$/d' -e "$lo2o" -e '/^$/d' | $NL2SP`
+       oldobjs="$objs "`$echo "X$libobjs" | $SP2NL | $Xsed -e '/\.'${libext}'$/d' -e '/\.lib$/d' -e "$lo2o" | $NL2SP`
        addlibs="$old_convenience"
       fi