Skip to content
Permalink
Browse files

.gitattributes: turn off CRLF for *.am

If Makefile.am uses CRLF, buildconf in a Windows checkout fails with:
".ibtoolize: error: AC_CONFIG_MACRO_DIRS([m4]) conflicts with
ACLOCAL_AMFLAGS=-I m4"
  • Loading branch information...
MarcelRaad committed Mar 21, 2017
1 parent f7df67c commit 2c3af5b4c0e9e6ea7485b88fe58d3d31de45278b
Showing with 1 addition and 0 deletions.
  1. +1 −0 .gitattributes
@@ -3,3 +3,4 @@ buildconf eol=lf
configure.ac eol=lf
*.m4 eol=lf
*.in eol=lf
*.am eol=lf

2 comments on commit 2c3af5b

@jay

This comment has been minimized.

Copy link
Member

replied Mar 27, 2017

Should be fine. In the future please append to your upstream commit message the related discussion with a Ref:/Bug:/Closes line for example

.gitattributes: turn off CRLF for *.am

If Makefile.am uses CRLF, buildconf in a Windows checkout fails with:
".ibtoolize: error: AC_CONFIG_MACRO_DIRS([m4]) conflicts with
ACLOCAL_AMFLAGS=-I m4"

Closes https://github.com/curl/curl/pull/1344

Thanks

@MarcelRaad

This comment has been minimized.

Copy link
Member Author

replied Mar 27, 2017

@jay Oops, sorry! Thanks for the reminder.

Please sign in to comment.
You can’t perform that action at this time.