Andrew's git / gitweb.git / diff
?
Allow building with xmlparse.h
authorMatt Kraai <matt.kraai@amo.abbott.com>
Mon, 11 Feb 2013 22:03:45 +0000 (14:03 -0800)
committerJunio C Hamano <gitster@pobox.com>
Mon, 11 Feb 2013 22:33:04 +0000 (14:33 -0800)
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>
Makefile patch | blob | history
config.mak.uname patch | blob | history
http-push.c patch | blob | history
diff --git a/Makefile b/Makefile
index 5a2e02df45b3224a1fe3a5be4447fa941d521589..720fc187db1749ee8d87f8752d6c3f11dfc563f4 100644 (file)
--- 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 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.
 # 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
                else
                        EXPAT_LIBEXPAT = -lexpat
                endif
+               ifdef EXPAT_NEEDS_XMLPARSE_H
+                       BASIC_CFLAGS += -DEXPAT_NEEDS_XMLPARSE_H
+               endif
        endif
 endif
 
        endif
 endif
 
diff --git a/config.mak.uname b/config.mak.uname
index bea34f05111d6394281d984bd84e3043f2ca2442..8743a6d0af8f193c22eab4bf3791c3a8cc876502 100644 (file)
--- a/config.mak.uname
+++ b/config.mak.uname
@@ -523,6 +523,7 @@ endif
 endif
 ifeq ($(uname_S),QNX)
        COMPAT_CFLAGS += -DSA_RESTART=0
 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
        HAVE_STRINGS_H = YesPlease
        NEEDS_SOCKET = YesPlease
        NO_FNMATCH_CASEFOLD = YesPlease
diff --git a/http-push.c b/http-push.c
index 3e72e84e8414644fb521711dd9645bf0bd6738a8..bd66f6ab6edd24946d2bc84e117a2b97417b1503 100644 (file)
--- a/http-push.c
+++ b/http-push.c
@@ -11,7 +11,11 @@
 #include "list-objects.h"
 #include "sigchain.h"
 
 #include "list-objects.h"
 #include "sigchain.h"
 
+#ifdef EXPAT_NEEDS_XMLPARSE_H
+#include <xmlparse.h>
+#else
 #include <expat.h>
 #include <expat.h>
+#endif
 
 static const char http_push_usage[] =
 "git http-push [--all] [--dry-run] [--force] [--verbose] <remote> [<head>...]\n";
 
 static const char http_push_usage[] =
 "git http-push [--all] [--dry-run] [--force] [--verbose] <remote> [<head>...]\n";