From: Junio C Hamano Date: Wed, 5 Apr 2006 21:25:57 +0000 (-0700) Subject: Merge branch 'nh/http' into next X-Git-Tag: v1.3.0-rc4~38 X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/806d097e6b1c2c996a2a01cf8eaf3d7326e70c3c?hp=-c Merge branch 'nh/http' into next * nh/http: Fix compile with expat, but an old curl version --- 806d097e6b1c2c996a2a01cf8eaf3d7326e70c3c diff --combined Makefile index 3471177efb,164151999d..6b10eaa413 --- a/Makefile +++ b/Makefile @@@ -114,7 -114,7 +114,7 @@@ SPARSE_FLAGS = -D__BIG_ENDIAN__ -D__pow SCRIPT_SH = \ git-add.sh git-bisect.sh git-branch.sh git-checkout.sh \ - git-cherry.sh git-clone.sh git-commit.sh \ + git-cherry.sh git-clean.sh git-clone.sh git-commit.sh \ git-count-objects.sh git-diff.sh git-fetch.sh \ git-format-patch.sh git-log.sh git-ls-remote.sh \ git-merge-one-file.sh git-parse-remote.sh \ @@@ -208,7 -208,7 +208,7 @@@ LIB_OBJS = quote.o read-cache.o refs.o run-command.o \ server-info.o setup.o sha1_file.o sha1_name.o strbuf.o \ tag.o tree.o usage.o config.o environment.o ctype.o copy.o \ - fetch-clone.o revision.o pager.o tree-walk.o \ + fetch-clone.o revision.o pager.o tree-walk.o xdiff-interface.o \ $(DIFF_OBJS) GITLIBS = $(LIB_FILE) $(XDIFF_LIB) @@@ -324,10 -324,12 +324,12 @@@ ifndef NO_CUR curl_check := $(shell (echo 070908; curl-config --vernum) | sort -r | sed -ne 2p) ifeq "$(curl_check)" "070908" ifndef NO_EXPAT - EXPAT_LIBEXPAT = -lexpat PROGRAMS += git-http-push$X endif endif + ifndef NO_EXPAT + EXPAT_LIBEXPAT = -lexpat + endif endif ifndef NO_OPENSSL