summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatt Kraai <matt.kraai@amo.abbott.com>2013-02-11 14:03:45 -0800
committerJunio C Hamano <gitster@pobox.com>2013-02-11 14:33:04 -0800
commit081fd8d093887b0cc5055d8a191ae2c26274846b (patch)
treea5376dee8a17b6a4a286ff21277c577967ab3ff4
parentaa3982890fe7506badfddf6252402a335a4d72b7 (diff)
downloadgit-081fd8d093887b0cc5055d8a191ae2c26274846b.tar.gz
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>
-rw-r--r--Makefile6
-rw-r--r--config.mak.uname1
-rw-r--r--http-push.c4
3 files changed, 11 insertions, 0 deletions
diff --git a/Makefile b/Makefile
index 5a2e02df45..720fc187db 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.
@@ -1089,6 +1092,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 <xmlparse.h>
+#else
#include <expat.h>
+#endif
static const char http_push_usage[] =
"git http-push [--all] [--dry-run] [--force] [--verbose] <remote> [<head>...]\n";