diff options
| author | Matt Kraai <matt.kraai@amo.abbott.com> | 2013-02-11 22:03:45 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-02-11 22:33:04 (GMT) |
| commit | 081fd8d093887b0cc5055d8a191ae2c26274846b (patch) | |
| tree | a5376dee8a17b6a4a286ff21277c577967ab3ff4 /Makefile | |
| parent | aa3982890fe7506badfddf6252402a335a4d72b7 (diff) | |
| download | git-081fd8d093887b0cc5055d8a191ae2c26274846b.zip git-081fd8d093887b0cc5055d8a191ae2c26274846b.tar.gz git-081fd8d093887b0cc5055d8a191ae2c26274846b.tar.bz2 | |
Allow building with xmlparse.h
expat 1.1 and 1.2 provide xmlparse.h instead of expat.h. Include the
former on systems that define the EXPAT_NEEDS_XMLPARSE_H variable and
define that variable on QNX systems, which ship with expat 1.1.
Signed-off-by: Matt Kraai <matt.kraai@amo.abbott.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
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. @@ -1089,6 +1092,9 @@ else else EXPAT_LIBEXPAT = -lexpat endif + ifdef EXPAT_NEEDS_XMLPARSE_H + BASIC_CFLAGS += -DEXPAT_NEEDS_XMLPARSE_H + endif endif endif |