From: Marcel Raad <raad@teamviewer.com>
Date: Tue, 21 Mar 2017 22:20:03 +0000 (+0100)
Subject: .gitattributes: turn off CRLF for *.am
X-Git-Tag: curl-7_54_0~91
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F1344%2Fhead;p=thirdparty%2Fcurl.git

.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"
---

diff --git a/.gitattributes b/.gitattributes
index a7b3f6a288..e84adeec3e 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