(trunk) #4490 "transmission fails to build: undefined references" -- reopened. r12954...

diff --git a/configure.ac b/configure.ac
index 34bf972522d3152ebc83fd305b1edfe20a68226c..632786ed88f292cb6b05772180ab76d1a312e587 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -480,8 +480,10 @@ AC_CONFIG_FILES([Makefile
                  libtransmission/Makefile
                  utils/Makefile
                  third-party/Makefile
-                 third-party/libnatpmp/Makefile
                  third-party/dht/Makefile
+                 third-party/libutp/Makefile
+                 third-party/libnatpmp/Makefile
+                 third-party/miniupnp/Makefile
                  macosx/Makefile
                  gtk/Makefile
                  gtk/icons/Makefile
@@ -495,16 +497,6 @@ AC_CONFIG_FILES([Makefile
                  web/stylesheets/Makefile
                  po/Makefile.in])
 
-dnl Maybe build libutp...
-AM_CONDITIONAL([LIBUTP_CONDITIONAL],[test "x$build_utp" = "xyes"])
-AM_COND_IF([LIBUTP_CONDITIONAL],
-           [AC_CONFIG_FILES([third-party/libutp/Makefile])])
-
-dnl Maybe build miniupnpc...
-AM_CONDITIONAL([UPNP_CONDITIONAL],[test "x$upnp_version" = "xnone"])
-AM_COND_IF([UPNP_CONDITIONAL],
-           [AC_CONFIG_FILES([third-party/miniupnp/Makefile])])
-
 AC_OUTPUT
 
 echo "