aboutsummaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2013-02-14 16:06:08 -0800
committerJunio C Hamano <gitster@pobox.com>2013-02-14 16:06:08 -0800
commitbfc1f6a1c18b3b0eba7e9126fb0b2688f865a110 (patch)
tree3cc558797c0996131e26d0a3bb3d6f0f96e5638b /Makefile
parentc0acef9b8ae84e7f67a1c231eb97ecfd897c5651 (diff)
parent081fd8d093887b0cc5055d8a191ae2c26274846b (diff)
downloadgit-bfc1f6a1c18b3b0eba7e9126fb0b2688f865a110.tar.gz
git-bfc1f6a1c18b3b0eba7e9126fb0b2688f865a110.tar.xz
Merge branch 'mk/old-expat'
* mk/old-expat: Allow building with xmlparse.h
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile6
1 files changed, 6 insertions, 0 deletions
diff --git a/Makefile b/Makefile
index b4af30d27..951dc7d2d 100644
--- a/Makefile
+++ b/Makefile
@@ -43,6 +43,9 @@ all::
# Define EXPATDIR=/foo/bar if your expat header and library files are in
# /foo/bar/include and /foo/bar/lib directories.
#
+# Define EXPAT_NEEDS_XMLPARSE_H if you have an old version of expat (e.g.,
+# 1.1 or 1.2) that provides xmlparse.h instead of expat.h.
+#
# Define NO_GETTEXT if you don't want Git output to be translated.
# A translated Git requires GNU libintl or another gettext implementation,
# plus libintl-perl at runtime.
@@ -1118,6 +1121,9 @@ else
else
EXPAT_LIBEXPAT = -lexpat
endif
+ ifdef EXPAT_NEEDS_XMLPARSE_H
+ BASIC_CFLAGS += -DEXPAT_NEEDS_XMLPARSE_H
+ endif
endif
endif