switch to new URI version by default, -DWITH_OLD_URI for old
This commit is contained in:
parent
2541b109e0
commit
359f386ad6
4 changed files with 6 additions and 6 deletions
1
Makefile
1
Makefile
|
@ -6,6 +6,7 @@ BASEFLAGS=-Wall -outputdir $(GIT_ANNEX_TMP_BUILD_DIR) -IUtility
|
||||||
# you can turn off some of these features.
|
# you can turn off some of these features.
|
||||||
#
|
#
|
||||||
# If you're using an old version of yesod, enable -DWITH_OLD_YESOD
|
# If you're using an old version of yesod, enable -DWITH_OLD_YESOD
|
||||||
|
# Or with an old version of the uri library, enable -DWITH_OLD_URI
|
||||||
FEATURES?=$(GIT_ANNEX_LOCAL_FEATURES) -DWITH_ASSISTANT -DWITH_S3 -DWITH_WEBAPP -DWITH_PAIRING -DWITH_XMPP -DWITH_DNS
|
FEATURES?=$(GIT_ANNEX_LOCAL_FEATURES) -DWITH_ASSISTANT -DWITH_S3 -DWITH_WEBAPP -DWITH_PAIRING -DWITH_XMPP -DWITH_DNS
|
||||||
|
|
||||||
bins=git-annex
|
bins=git-annex
|
||||||
|
|
|
@ -119,10 +119,10 @@ request url headers requesttype = go 5 url
|
||||||
Nothing -> return rsp
|
Nothing -> return rsp
|
||||||
Just newURI -> go n newURI_abs
|
Just newURI -> go n newURI_abs
|
||||||
where
|
where
|
||||||
#ifdef URI_24
|
#ifdef WITH_OLD_URI
|
||||||
newURI_abs = newURI `relativeTo` u
|
|
||||||
#else
|
|
||||||
newURI_abs = fromMaybe newURI (newURI `relativeTo` u)
|
newURI_abs = fromMaybe newURI (newURI `relativeTo` u)
|
||||||
|
#else
|
||||||
|
newURI_abs = newURI `relativeTo` u
|
||||||
#endif
|
#endif
|
||||||
addheaders req = setHeaders req (rqHeaders req ++ userheaders)
|
addheaders req = setHeaders req (rqHeaders req ++ userheaders)
|
||||||
userheaders = rights $ map parseHeader headers
|
userheaders = rights $ map parseHeader headers
|
||||||
|
|
4
debian/rules
vendored
4
debian/rules
vendored
|
@ -2,9 +2,9 @@
|
||||||
|
|
||||||
ARCH = $(shell dpkg-architecture -qDEB_BUILD_ARCH)
|
ARCH = $(shell dpkg-architecture -qDEB_BUILD_ARCH)
|
||||||
ifeq (install ok installed,$(shell dpkg-query -W -f '$${Status}' libghc-yesod-dev 2>/dev/null))
|
ifeq (install ok installed,$(shell dpkg-query -W -f '$${Status}' libghc-yesod-dev 2>/dev/null))
|
||||||
export FEATURES=-DWITH_ASSISTANT -DWITH_S3 -DWITH_OLD_YESOD -DWITH_WEBAPP -DWITH_PAIRING -DWITH_XMPP
|
export FEATURES=-DWITH_ASSISTANT -DWITH_S3 -DWITH_OLD_URI -DWITH_OLD_YESOD -DWITH_WEBAPP -DWITH_PAIRING -DWITH_XMPP
|
||||||
else
|
else
|
||||||
export FEATURES=-DWITH_ASSISTANT -DWITH_S3 -DWITH_PAIRING -DWITH_XMPP
|
export FEATURES=-DWITH_ASSISTANT -DWITH_S3 -DWITH_OLD_URI -DWITH_PAIRING -DWITH_XMPP
|
||||||
endif
|
endif
|
||||||
|
|
||||||
%:
|
%:
|
||||||
|
|
|
@ -64,7 +64,6 @@ Executable git-annex
|
||||||
C-Sources: Utility/libdiskfree.c Utility/libmounts.c
|
C-Sources: Utility/libdiskfree.c Utility/libmounts.c
|
||||||
Extensions: CPP
|
Extensions: CPP
|
||||||
GHC-Options: -threaded
|
GHC-Options: -threaded
|
||||||
CPP-Options: -DURI_24
|
|
||||||
|
|
||||||
if flag(S3)
|
if flag(S3)
|
||||||
Build-Depends: hS3
|
Build-Depends: hS3
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue