git://git.onelab.eu
/
plcapi.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
e848398
)
Don't build local pycurl if curl_vernum >= 7.16.0
author
Marc Fiuczynski
<mef@cs.princeton.edu>
Fri, 31 Aug 2007 02:46:47 +0000
(
02:46
+0000)
committer
Marc Fiuczynski
<mef@cs.princeton.edu>
Fri, 31 Aug 2007 02:46:47 +0000
(
02:46
+0000)
Makefile
patch
|
blob
|
history
diff --git
a/Makefile
b/Makefile
index
de39e71
..
7c4838c
100644
(file)
--- a/
Makefile
+++ b/
Makefile
@@
-4,7
+4,7
@@
# Mark Huang <mlhuang@cs.princeton.edu>
# Copyright (C) 2005 The Trustees of Princeton University
#
# Mark Huang <mlhuang@cs.princeton.edu>
# Copyright (C) 2005 The Trustees of Princeton University
#
-# $Id: Makefile,v 1.1
1 2006/12/18 17:55:58 mlhuang
Exp $
+# $Id: Makefile,v 1.1
2 2007/07/02 19:28:52 tmack
Exp $
#
# Metafiles
#
# Metafiles
@@
-16,9
+16,12
@@
modules := psycopg2
# Temporarily until we can kill the Fedora Core 2 build
curl_vernum := $(shell printf %d 0x$(shell curl-config --vernum))
pycurl_vernum := $(shell printf %d 0x070d01) # 7.13.1
# Temporarily until we can kill the Fedora Core 2 build
curl_vernum := $(shell printf %d 0x$(shell curl-config --vernum))
pycurl_vernum := $(shell printf %d 0x070d01) # 7.13.1
+pycurl_incompatnum := $(shell printf %d 0x070f00) # 7.16.0
ifeq ($(shell test $(curl_vernum) -ge $(pycurl_vernum) && echo 1),1)
ifeq ($(shell test $(curl_vernum) -ge $(pycurl_vernum) && echo 1),1)
+ifeq ($(shell test $(curl_vernum) -ge $(pycurl_incompatnum) && echo 0),1)
modules += pycurl
endif
modules += pycurl
endif
+endif
modules-install := $(foreach module, $(modules), $(module)-install)
modules-clean := $(foreach module, $(modules), $(module)-clean)
modules-install := $(foreach module, $(modules), $(module)-install)
modules-clean := $(foreach module, $(modules), $(module)-clean)