Commit 56276217 authored by Adrien Béraud's avatar Adrien Béraud Committed by Guillaume Roguez

opendht: bump to 1.6.0rc1

OpenDHT 1.6.0 unifies its API so users don't need to use
extra build flags.

Change-Id: Iea965def553a1a059cc9c41d3ff15ab96b2a8f31
parent 5e80922f
......@@ -223,7 +223,6 @@ AS_IF([test -n "${CONTRIB_DIR}"], [
AC_MSG_RESULT([${CONTRIB_DIR}])
export PATH=${CONTRIB_DIR}/bin:$PATH
CPPFLAGS="${CPPFLAGS} -I${CONTRIB_DIR}/include"
CPPFLAGS+=" -DOPENDHT_PROXY_CLIENT=true -DOPENDHT_PUSH_NOTIFICATIONS=true -DOPENDHT_PROXY_SERVER=true"
CFLAGS="${CFLAGS} -DPJ_AUTOCONF=1 "
CXXFLAGS="${CXXFLAGS} -DPJ_AUTOCONF=1 "
......@@ -232,12 +231,9 @@ AS_IF([test -n "${CONTRIB_DIR}"], [
CXXFLAGS+=" -DPJ_WIN64=1"
])
CFLAGS+=" -I${CONTRIB_DIR}/include"
CFLAGS+=" -DOPENDHT_PROXY_CLIENT=true -DOPENDHT_PUSH_NOTIFICATIONS=true -DOPENDHT_PROXY_SERVER=true"
CXXFLAGS+=" -I${CONTRIB_DIR}/include"
CXXFLAGS+=" -DOPENDHT_PROXY_CLIENT=true -DOPENDHT_PUSH_NOTIFICATIONS=true -DOPENDHT_PROXY_SERVER=true"
OBJCFLAGS="${OBJCFLAGS} -I${CONTRIB_DIR}/include"
OBJCFLAGS+=" -DOPENDHT_PROXY_CLIENT=true -DOPENDHT_PUSH_NOTIFICATIONS=true -DOPENDHT_PROXY_SERVER=true"
AS_IF([test "${SYS}" = "mingw32"],[
PKG_CONFIG_PATH_CUSTOM="${CONTRIB_DIR}/lib/pkgconfig:${CONTRIB_DIR}/lib64/pkgconfig"
AC_SUBST(PKG_CONFIG_PATH_CUSTOM)
......
ef677a72dfbd59dfa604165ab3be547e1bd52ff2862a86bfed54c7f931d26a8374b30a20ad818ff45fa377bad662d8b9dc9e1db9108cda6422b9c4a8ec90dc4d opendht-4d4ba2be96ae237f21e65acdc3eab24d7d5d0e00.tar.gz
7db850afe9eebd580c7be97f591d8d3f36828387a9aedbd3c5ca48212251f9e650131dd6d81cd487ae3e58212f106abf6ea2a16e710297068778ffd25c8ebbd9 opendht-1.6.0rc1.tar.gz
# OPENDHT
OPENDHT_VERSION := 4d4ba2be96ae237f21e65acdc3eab24d7d5d0e00
OPENDHT_VERSION := 1.6.0rc1
OPENDHT_URL := https://github.com/savoirfairelinux/opendht/archive/$(OPENDHT_VERSION).tar.gz
PKGS += opendht
......
......@@ -165,13 +165,10 @@ for arg in "$[]@"; do
esac
done
dnl enable opendht proxy
dhtproxy_variables="-DOPENDHT_PROXY_CLIENT=true -DOPENDHT_PROXY_SERVER=true -DOPENDHT_PUSH_NOTIFICATIONS=true"
if $modeok && $tagok ; then
. ${top_builddir_slash}doltcompile "${args@<:@@@:>@}" ${dhtproxy_variables}
. ${top_builddir_slash}doltcompile "${args@<:@@@:>@}"
else
exec ${top_builddir_slash}libtool "$[]@" ${dhtproxy_variables}
exec ${top_builddir_slash}libtool "$[]@"
fi
__DOLTLIBTOOL__EOF__
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment