Re: [PATCH] Fix for CRLF problem

[Akim Demaille]

| Index: ChangeLog
| ===================================================================
| RCS file: /cvs/automake/automake/ChangeLog,v
| retrieving revision 1.891
| diff -u -r1.891 ChangeLog
| --- ChangeLog 2000/10/06 22:49:14     1.891
| +++ ChangeLog 2000/10/09 14:43:56
| @@ -1,3 +1,12 @@
| +2000-10-09  Morten Eriksen  <address@hidden>
| +
| +     * aclocal.in (write_aclocal): Don't write aclocal.m4 with
| +     CRLFs. This circumvents a bug in Cygwin bash.
| +
| +     * automake.in (generate_makefile): Don't write Makefile.in
| +     files with CRLFs, as it causes problems for the dependency-file
| +     extraction in AM_OUTPUT_DEPENDENCY_COMMANDS.
| +

This looks fine to me.  Any resistance?

| Index: aclocal.in
| ===================================================================
| RCS file: /cvs/automake/automake/aclocal.in,v
| retrieving revision 1.46
| diff -u -r1.46 aclocal.in
| --- aclocal.in        2000/10/06 22:49:14     1.46
| +++ aclocal.in        2000/10/09 14:43:57
| @@ -429,6 +429,13 @@
|  
|      open (ACLOCAL, "> " . $output_file)
|         || die "aclocal: couldn't open \`$output_file' for writing: $!\n";
| +
| +    # In case we're running under MSWindows, don't write with CRLF.
| +    # (This circumvents a bug in at least Cygwin bash where the shell
| +    # parsing fails on lines ending with the continuation character '\'
| +    # and CRLF.)
| +    binmode ACLOCAL;
| +
|      print ACLOCAL "dnl $output_file generated automatically by aclocal 
$VERSION\n";
|      print ACLOCAL "\
|  dnl Copyright (C) 1994, 1995-9, 2000 Free Software Foundation, Inc.
| Index: automake.in
| ===================================================================
| RCS file: /cvs/automake/automake/automake.in,v
| retrieving revision 1.796
| diff -u -r1.796 automake.in
| --- automake.in       2000/09/15 20:09:55     1.796
| +++ automake.in       2000/10/09 14:44:05
| @@ -689,6 +689,11 @@
|      }
|      print "automake: creating ", $makefile, ".in\n" if $verbose;
|  
| +    # In case we're running under MSWindows, don't write with CRLF
| +    # (as it causes problems for the dependency-file extraction in
| +    # AM_OUTPUT_DEPENDENCY_COMMANDS).
| +    binmode GM_FILE;
| +
|      print GM_FILE $output_vars;
|      # We make sure that `all:' is the first target.
|      print GM_FILE $output_all;
|