mirror of
https://github.com/transmission/transmission
synced 2024-12-23 00:04:06 +00:00
#5809: Allow building against system dht library (patch by jbeich)
This commit is contained in:
parent
7789c28f44
commit
ca8ecf3d06
2 changed files with 18 additions and 1 deletions
14
configure.ac
14
configure.ac
|
@ -197,6 +197,20 @@ dnl dht
|
||||||
DHT_CFLAGS="-I\$(top_srcdir)/third-party/dht"
|
DHT_CFLAGS="-I\$(top_srcdir)/third-party/dht"
|
||||||
DHT_LIBS="\$(top_builddir)/third-party/dht/libdht.a"
|
DHT_LIBS="\$(top_builddir)/third-party/dht/libdht.a"
|
||||||
DHT_LIBS_QT="\$\${TRANSMISSION_TOP}/third-party/dht/libdht.a"
|
DHT_LIBS_QT="\$\${TRANSMISSION_TOP}/third-party/dht/libdht.a"
|
||||||
|
build_bundled_dht="yes"
|
||||||
|
AC_ARG_ENABLE([external-dht],
|
||||||
|
AS_HELP_STRING([--enable-external-dht],[Use system external-dht]),
|
||||||
|
[want_external_dht=${enableval}],
|
||||||
|
[want_external_dht=no])
|
||||||
|
if test "x$want_external_dht" != "xno" ; then
|
||||||
|
dnl Would be lovely if it had pkgconfig
|
||||||
|
DHT_CFLAGS=""
|
||||||
|
DHT_LIBS="-ldht"
|
||||||
|
DHT_LIBS_QT="-ldht"
|
||||||
|
build_bundled_dht="no"
|
||||||
|
fi
|
||||||
|
|
||||||
|
AM_CONDITIONAL([BUILD_DHT],[test "x$build_bundled_dht" = "xyes"])
|
||||||
AC_SUBST(DHT_CFLAGS)
|
AC_SUBST(DHT_CFLAGS)
|
||||||
AC_SUBST(DHT_LIBS)
|
AC_SUBST(DHT_LIBS)
|
||||||
AC_SUBST(DHT_LIBS_QT)
|
AC_SUBST(DHT_LIBS_QT)
|
||||||
|
|
5
third-party/Makefile.am
vendored
5
third-party/Makefile.am
vendored
|
@ -1,3 +1,6 @@
|
||||||
|
if BUILD_DHT
|
||||||
|
DHT_DIR = dht
|
||||||
|
endif
|
||||||
if BUILD_UTP
|
if BUILD_UTP
|
||||||
UTP_DIR = libutp
|
UTP_DIR = libutp
|
||||||
endif
|
endif
|
||||||
|
@ -9,7 +12,7 @@ if BUILD_NATPMP
|
||||||
endif
|
endif
|
||||||
|
|
||||||
SUBDIRS = \
|
SUBDIRS = \
|
||||||
dht \
|
$(DHT_DIR) \
|
||||||
$(NATPMP_DIR) \
|
$(NATPMP_DIR) \
|
||||||
$(MINIUPNP_DIR) \
|
$(MINIUPNP_DIR) \
|
||||||
$(UTP_DIR)
|
$(UTP_DIR)
|
||||||
|
|
Loading…
Reference in a new issue