From: Junio C Hamano Date: Fri, 15 Feb 2013 00:06:08 +0000 (-0800) Subject: Merge branch 'mk/old-expat' X-Git-Tag: v1.8.2-rc0~11 X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/bfc1f6a1c18b3b0eba7e9126fb0b2688f865a110?hp=c0acef9b8ae84e7f67a1c231eb97ecfd897c5651 Merge branch 'mk/old-expat' * mk/old-expat: Allow building with xmlparse.h --- diff --git a/Makefile b/Makefile index b4af30d271..951dc7d2d7 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 diff --git a/config.mak.uname b/config.mak.uname index bea34f0511..8743a6d0af 100644 --- a/config.mak.uname +++ b/config.mak.uname @@ -523,6 +523,7 @@ endif endif ifeq ($(uname_S),QNX) COMPAT_CFLAGS += -DSA_RESTART=0 + EXPAT_NEEDS_XMLPARSE_H = YesPlease HAVE_STRINGS_H = YesPlease NEEDS_SOCKET = YesPlease NO_FNMATCH_CASEFOLD = YesPlease diff --git a/http-push.c b/http-push.c index 3e72e84e84..bd66f6ab6e 100644 --- a/http-push.c +++ b/http-push.c @@ -11,7 +11,11 @@ #include "list-objects.h" #include "sigchain.h" +#ifdef EXPAT_NEEDS_XMLPARSE_H +#include +#else #include +#endif static const char http_push_usage[] = "git http-push [--all] [--dry-run] [--force] [--verbose] [...]\n";