Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
Merge branch 'nh/http' into next
author
Junio C Hamano
<junkio@cox.net>
Wed, 5 Apr 2006 21:25:57 +0000
(14:25 -0700)
committer
Junio C Hamano
<junkio@cox.net>
Wed, 5 Apr 2006 21:25:57 +0000
(14:25 -0700)
* nh/http:
Fix compile with expat, but an old curl version
Makefile
patch
|
blob
|
history
raw
(from parent 1:
d6102b5
)
diff --git
a/Makefile
b/Makefile
index 3471177efbce01579ea5e22e95b3331db8f32e71..6b10eaa41321b530b95acf9f3633c765062b6297 100644
(file)
--- a/
Makefile
+++ b/
Makefile
@@
-324,10
+324,12
@@
ifndef NO_CURL
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