X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=Makefile;h=6eba7ee6e3f3ff80b2d382928fa3827efa8eca47;hb=a74854dd38cb742b8fdc0d0cda7fff738a95312c;hp=ee4855a2611638372351ef87a68982fd11d26570;hpb=db15e87507a9dcc02bfa5637f7195c82d12e7e49;p=plcapi.git diff --git a/Makefile b/Makefile index ee4855a..6eba7ee 100644 --- a/Makefile +++ b/Makefile @@ -4,7 +4,7 @@ # Mark Huang # Copyright (C) 2005 The Trustees of Princeton University # -# $Id: Makefile 793 2007-08-28 15:21:17Z thierry $ +# $Id$ # # 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 +pycurl_incompatnum := $(shell printf %d 0x071000) # 7.16.0 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 +endif modules-install := $(foreach module, $(modules), $(module)-install) modules-clean := $(foreach module, $(modules), $(module)-clean)