Adjust autotools files to use submodules

diff --git a/Makefile.am b/Makefile.am
index e5d04fe82a1431284cb7ed2a397b772c904496e0..0276acfe1124a719a50e9ddd496912b4621d3951 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -46,19 +46,6 @@ EXTRA_DIST += \
   libtransmission/version.h.in \
   po/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
 
 if HAVE_REVISION_FILE

diff --git a/configure.ac b/configure.ac
index 83d374b445970d97ca508f7a9dd15f1855d5267a..18200e76abda29cbc0036586863e2a9a641a19ab 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -103,6 +103,9 @@ if test "x$GCC" = "xyes" ; then
     fi
 fi
 
+AC_PROG_LN_S
+AC_PROG_MKDIR_P
+
 AC_HEADER_STDC
 AC_HEADER_TIME
 
@@ -263,7 +266,7 @@ dnl ----------------------------------------------------------------------------
 dnl
 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_QT="\$\${TRANSMISSION_TOP}/third-party/dht/libdht.a"
 build_bundled_dht="yes"
@@ -289,7 +292,7 @@ dnl ----------------------------------------------------------------------------
 dnl
 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_QT="\$\${TRANSMISSION_TOP}/third-party/libb64/libb64.a"
 build_bundled_b64="yes"
@@ -351,7 +354,7 @@ if test "x$want_utp" = "xyes"; then
         AC_DEFINE([WITH_UTP],[1])
         build_utp="system"
     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_QT="\$\${TRANSMISSION_TOP}/third-party/libutp/libutp.a"
         if test "x$libutp_extra_libs" != "x" ; then
@@ -457,9 +460,9 @@ LIBS="$ac_save_LIBS"
 AC_MSG_RESULT([$upnp_version])
 AM_CONDITIONAL([BUILD_MINIUPNP],[test "x$upnp_version" = "xnone"])
 if test "x$upnp_version" = "xnone" ; then
-    LIBUPNP_CFLAGS="-I\$(top_srcdir)/third-party/"
-    LIBUPNP_LIBS="\$(top_builddir)/third-party/miniupnp/libminiupnp.a"
-    LIBUPNP_LIBS_QT="\$\${TRANSMISSION_TOP}/third-party/miniupnp/libminiupnp.a"
+    LIBUPNP_CFLAGS="-I\$(top_builddir)/third-party/miniupnpc/include"
+    LIBUPNP_LIBS="\$(top_builddir)/third-party/miniupnpc/libminiupnp.a"
+    LIBUPNP_LIBS_QT="\$\${TRANSMISSION_TOP}/third-party/miniupnpc/libminiupnp.a"
 else
     AC_DEFINE([SYSTEM_MINIUPNP])
     LIBUPNP_CFLAGS="" 
@@ -659,7 +662,7 @@ AC_CONFIG_FILES([Makefile
                  third-party/libb64/Makefile
                  third-party/libutp/Makefile
                  third-party/libnatpmp/Makefile
-                 third-party/miniupnp/Makefile
+                 third-party/miniupnpc/Makefile
                  macosx/Makefile
                  gtk/Makefile
                  gtk/icons/Makefile

diff --git a/third-party/Makefile.am b/third-party/Makefile.am
index 24e814141491702a7bc33f8ab5df75aa9eaa1ec7..9f66878d90e23ecd3cd4213526a79fb47503faaa 100644 (file)
--- a/third-party/Makefile.am
+++ b/third-party/Makefile.am
@@ -8,7 +8,7 @@ if BUILD_UTP
   UTP_DIR = libutp
 endif
 if BUILD_MINIUPNP
-  MINIUPNP_DIR = miniupnp
+  MINIUPNP_DIR = miniupnpc
 endif
 if BUILD_NATPMP 
   NATPMP_DIR = libnatpmp