diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2013-02-14 16:06:08 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-02-14 16:06:08 -0800 |
| commit | bfc1f6a1c18b3b0eba7e9126fb0b2688f865a110 (patch) | |
| tree | 3cc558797c0996131e26d0a3bb3d6f0f96e5638b /Makefile | |
| parent | Merge branch 'da/p4merge-mktemp-fix' (diff) | |
| parent | Allow building with xmlparse.h (diff) | |
| download | tgif-bfc1f6a1c18b3b0eba7e9126fb0b2688f865a110.tar.xz | |
Merge branch 'mk/old-expat'
* mk/old-expat:
Allow building with xmlparse.h
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 6 |
1 files changed, 6 insertions, 0 deletions
@@ -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 |