summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarcel Raad <raad@teamviewer.com>2017-03-21 23:20:03 +0100
committerMarcel Raad <raad@teamviewer.com>2017-03-27 19:56:10 +0200
commit2c3af5b4c0e9e6ea7485b88fe58d3d31de45278b (patch)
treeaae7b68d7a47b7d8fff16ab1eadc7748cd45f2bb
parentf7df67cff0a756eefc8daea36e6468df694a43d0 (diff)
downloadcurl-2c3af5b4c0e9e6ea7485b88fe58d3d31de45278b.tar.gz
.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"
-rw-r--r--.gitattributes1
1 files changed, 1 insertions, 0 deletions
diff --git a/.gitattributes b/.gitattributes
index a7b3f6a28..e84adeec3 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -3,3 +3,4 @@ buildconf eol=lf
configure.ac eol=lf
*.m4 eol=lf
*.in eol=lf
+*.am eol=lf