Adjust autotools files to use submodules
This commit is contained in:
parent
e83a062417
commit
3093df8755
13
Makefile.am
13
Makefile.am
|
@ -46,19 +46,6 @@ EXTRA_DIST += \
|
||||||
libtransmission/version.h.in \
|
libtransmission/version.h.in \
|
||||||
po/CMakeLists.txt \
|
po/CMakeLists.txt \
|
||||||
qt/CMakeLists.txt \
|
qt/CMakeLists.txt \
|
||||||
third-party/b64-01-newline.patch \
|
|
||||||
third-party/b64-02-unsigned-char.patch \
|
|
||||||
third-party/b64.cmake \
|
|
||||||
third-party/dht.cmake \
|
|
||||||
third-party/event2.cmake \
|
|
||||||
third-party/event2-01-win32.patch \
|
|
||||||
third-party/event2-02-win32.patch \
|
|
||||||
third-party/natpmp.cmake \
|
|
||||||
third-party/utp-01-ticket-5002.patch \
|
|
||||||
third-party/utp-02-win32.patch \
|
|
||||||
third-party/utp-03-msvc14.patch \
|
|
||||||
third-party/utp.cmake \
|
|
||||||
third-party/utp_config.h \
|
|
||||||
utils/CMakeLists.txt
|
utils/CMakeLists.txt
|
||||||
|
|
||||||
if HAVE_REVISION_FILE
|
if HAVE_REVISION_FILE
|
||||||
|
|
17
configure.ac
17
configure.ac
|
@ -103,6 +103,9 @@ if test "x$GCC" = "xyes" ; then
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
AC_PROG_LN_S
|
||||||
|
AC_PROG_MKDIR_P
|
||||||
|
|
||||||
AC_HEADER_STDC
|
AC_HEADER_STDC
|
||||||
AC_HEADER_TIME
|
AC_HEADER_TIME
|
||||||
|
|
||||||
|
@ -263,7 +266,7 @@ dnl ----------------------------------------------------------------------------
|
||||||
dnl
|
dnl
|
||||||
dnl dht
|
dnl dht
|
||||||
|
|
||||||
DHT_CFLAGS="-I\$(top_srcdir)/third-party/dht"
|
DHT_CFLAGS="-I\$(top_builddir)/third-party/dht/include"
|
||||||
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"
|
build_bundled_dht="yes"
|
||||||
|
@ -289,7 +292,7 @@ dnl ----------------------------------------------------------------------------
|
||||||
dnl
|
dnl
|
||||||
dnl libb64
|
dnl libb64
|
||||||
|
|
||||||
LIBB64_CFLAGS="-I\$(top_srcdir)/third-party/libb64"
|
LIBB64_CFLAGS="-I\$(top_srcdir)/third-party/libb64/include"
|
||||||
LIBB64_LIBS="\$(top_builddir)/third-party/libb64/libb64.a"
|
LIBB64_LIBS="\$(top_builddir)/third-party/libb64/libb64.a"
|
||||||
LIBB64_LIBS_QT="\$\${TRANSMISSION_TOP}/third-party/libb64/libb64.a"
|
LIBB64_LIBS_QT="\$\${TRANSMISSION_TOP}/third-party/libb64/libb64.a"
|
||||||
build_bundled_b64="yes"
|
build_bundled_b64="yes"
|
||||||
|
@ -351,7 +354,7 @@ if test "x$want_utp" = "xyes"; then
|
||||||
AC_DEFINE([WITH_UTP],[1])
|
AC_DEFINE([WITH_UTP],[1])
|
||||||
build_utp="system"
|
build_utp="system"
|
||||||
elif test "x$CXX" != "x"; then
|
elif test "x$CXX" != "x"; then
|
||||||
LIBUTP_CFLAGS="-I\$(top_srcdir)/third-party/"
|
LIBUTP_CFLAGS="-I\$(top_builddir)/third-party/libutp/include"
|
||||||
LIBUTP_LIBS="\$(top_builddir)/third-party/libutp/libutp.a"
|
LIBUTP_LIBS="\$(top_builddir)/third-party/libutp/libutp.a"
|
||||||
LIBUTP_LIBS_QT="\$\${TRANSMISSION_TOP}/third-party/libutp/libutp.a"
|
LIBUTP_LIBS_QT="\$\${TRANSMISSION_TOP}/third-party/libutp/libutp.a"
|
||||||
if test "x$libutp_extra_libs" != "x" ; then
|
if test "x$libutp_extra_libs" != "x" ; then
|
||||||
|
@ -457,9 +460,9 @@ LIBS="$ac_save_LIBS"
|
||||||
AC_MSG_RESULT([$upnp_version])
|
AC_MSG_RESULT([$upnp_version])
|
||||||
AM_CONDITIONAL([BUILD_MINIUPNP],[test "x$upnp_version" = "xnone"])
|
AM_CONDITIONAL([BUILD_MINIUPNP],[test "x$upnp_version" = "xnone"])
|
||||||
if test "x$upnp_version" = "xnone" ; then
|
if test "x$upnp_version" = "xnone" ; then
|
||||||
LIBUPNP_CFLAGS="-I\$(top_srcdir)/third-party/"
|
LIBUPNP_CFLAGS="-I\$(top_builddir)/third-party/miniupnpc/include"
|
||||||
LIBUPNP_LIBS="\$(top_builddir)/third-party/miniupnp/libminiupnp.a"
|
LIBUPNP_LIBS="\$(top_builddir)/third-party/miniupnpc/libminiupnp.a"
|
||||||
LIBUPNP_LIBS_QT="\$\${TRANSMISSION_TOP}/third-party/miniupnp/libminiupnp.a"
|
LIBUPNP_LIBS_QT="\$\${TRANSMISSION_TOP}/third-party/miniupnpc/libminiupnp.a"
|
||||||
else
|
else
|
||||||
AC_DEFINE([SYSTEM_MINIUPNP])
|
AC_DEFINE([SYSTEM_MINIUPNP])
|
||||||
LIBUPNP_CFLAGS=""
|
LIBUPNP_CFLAGS=""
|
||||||
|
@ -659,7 +662,7 @@ AC_CONFIG_FILES([Makefile
|
||||||
third-party/libb64/Makefile
|
third-party/libb64/Makefile
|
||||||
third-party/libutp/Makefile
|
third-party/libutp/Makefile
|
||||||
third-party/libnatpmp/Makefile
|
third-party/libnatpmp/Makefile
|
||||||
third-party/miniupnp/Makefile
|
third-party/miniupnpc/Makefile
|
||||||
macosx/Makefile
|
macosx/Makefile
|
||||||
gtk/Makefile
|
gtk/Makefile
|
||||||
gtk/icons/Makefile
|
gtk/icons/Makefile
|
||||||
|
|
|
@ -8,7 +8,7 @@ if BUILD_UTP
|
||||||
UTP_DIR = libutp
|
UTP_DIR = libutp
|
||||||
endif
|
endif
|
||||||
if BUILD_MINIUPNP
|
if BUILD_MINIUPNP
|
||||||
MINIUPNP_DIR = miniupnp
|
MINIUPNP_DIR = miniupnpc
|
||||||
endif
|
endif
|
||||||
if BUILD_NATPMP
|
if BUILD_NATPMP
|
||||||
NATPMP_DIR = libnatpmp
|
NATPMP_DIR = libnatpmp
|
||||||
|
|
Loading…
Reference in New Issue