* config/ltmain.m4sh: Really don't require versions of GNU

sed newer than 3.02 for Cygwin and MinGW, and don't break
dryrun mode.

diff --git a/ChangeLog b/ChangeLog
index 60a02c658dbf8dc4f0cfe69ede2ef2e8e855fd55..1458a4365d2b1e861b00d393affa09894275fa6f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2004-10-10  Charles Wilson  <spam.protected>
+
+       * config/ltmain.m4sh: Really don't require versions of GNU 
+       sed newer than 3.02 for Cygwin and MinGW, and don't break
+       dryrun mode.
+
 2004-10-10  Bob Friesenhahn  <bfriesen@simple.dallas.tx.us>
 
        * config/getopt.m4sh: Under MinGW, reported paths may include ':'

diff --git a/config/ltmain.m4sh b/config/ltmain.m4sh
index 1f17d5e32009d1cd23ff48504a7ad7634aa8bca1..45edebe63ac15f2533b206409ed924ffa0390d06 100644 (file)
--- a/config/ltmain.m4sh
+++ b/config/ltmain.m4sh
@@ -745,15 +745,16 @@ extern \"C\" {
            $run eval "${SED} -n -e '/^: @PROGRAM@$/d' -e 's/^.* \(.*\)$/\1/p' "'< "$nlist" > "$export_symbols"'
            case $host in
            *cygwin* | *mingw* )
-              $run ${ECHO} EXPORTS > "$output_objdir/$output.def"
-              $run cat "$export_symbols" >> "$output_objdir/$output.def"
+              $run eval "${ECHO} EXPORTS "'> "$output_objdir/$output.def"'
+              $run eval 'cat "$export_symbols" >> "$output_objdir/$output.def"'
              ;;
            esac
          else
            $run eval "${SED} -e 's/\([[]][[.*^$]]\)/\\\1/g' -e 's/^/ /' -e 's/$/$/'"' < "$export_symbols" > "$output_objdir/$output.exp"'
            case $host in
            *cygwin | *mingw* )
-             $run eval "${SED} -e '1iEXPORTS'"' < "$output_objdir/$output.exp" > "$output_objdir/$output.def"'
+             $run eval "${ECHO} EXPORTS "'> "$output_objdir/$output.def"'
+             $run eval 'cat "$output_objdir/$output.exp" >> "$output_objdir/$output.def"'
              ;;
            esac
            $run eval '$GREP -f "$output_objdir/$output.exp" < "$nlist" > "$nlist"T'