diff -ru transmission-1.40.orig/cli/Makefile.in transmission-1.40/cli/Makefile.in --- transmission-1.40.orig/cli/Makefile.in 2008-11-21 09:45:25.000000000 +0100 +++ transmission-1.40/cli/Makefile.in 2008-11-21 09:53:23.000000000 +0100 @@ -53,7 +53,6 @@ am__DEPENDENCIES_1 = transmissioncli_DEPENDENCIES = \ $(top_builddir)/libtransmission/libtransmission.a \ - $(top_builddir)/third-party/libevent/libevent.la \ $(top_builddir)/third-party/libnatpmp/libnatpmp.a \ $(top_builddir)/third-party/miniupnp/libminiupnp.a \ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ @@ -288,7 +287,7 @@ transmissioncli_SOURCES = cli.c transmissioncli_LDADD = \ $(top_builddir)/libtransmission/libtransmission.a \ - $(top_builddir)/third-party/libevent/libevent.la \ + -levent -levent_core \ $(top_builddir)/third-party/libnatpmp/libnatpmp.a \ $(top_builddir)/third-party/miniupnp/libminiupnp.a \ $(INTLLIBS) \ diff -ru transmission-1.40.orig/configure transmission-1.40/configure --- transmission-1.40.orig/configure 2008-11-21 09:45:25.000000000 +0100 +++ transmission-1.40/configure 2008-11-21 09:56:16.000000000 +0100 @@ -1056,7 +1056,6 @@ LIBNOTIFY_LIBS DBUS_GLIB_CFLAGS DBUS_GLIB_LIBS' -ac_subdirs_all='third-party/libevent' # Initialize some variables set by options. ac_init_help= @@ -23764,16 +23763,6 @@ -subdirs="$subdirs third-party/libevent" - -{ $as_echo "$as_me:$LINENO: invoking libevent's configure script" >&5 -$as_echo "$as_me: invoking libevent's configure script" >&6;} -LIBEVENT_CPPFLAGS="-I\$(top_srcdir)/third-party/libevent" - - - - - pkg_failed=no { $as_echo "$as_me:$LINENO: checking for GTK" >&5 $as_echo_n "checking for GTK... " >&6; } diff -ru transmission-1.40.orig/daemon/Makefile.in transmission-1.40/daemon/Makefile.in --- transmission-1.40.orig/daemon/Makefile.in 2008-11-21 09:45:25.000000000 +0100 +++ transmission-1.40/daemon/Makefile.in 2008-11-21 09:53:54.000000000 +0100 @@ -57,7 +57,6 @@ $(top_builddir)/libtransmission/libtransmission.a \ $(top_builddir)/third-party/miniupnp/libminiupnp.a \ $(top_builddir)/third-party/libnatpmp/libnatpmp.a \ - $(top_builddir)/third-party/libevent/libevent.la \ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ $(am__DEPENDENCIES_1) @@ -68,7 +67,6 @@ $(top_builddir)/libtransmission/libtransmission.a \ $(top_builddir)/third-party/miniupnp/libminiupnp.a \ $(top_builddir)/third-party/libnatpmp/libnatpmp.a \ - $(top_builddir)/third-party/libevent/libevent.la \ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ $(am__DEPENDENCIES_1) @@ -307,7 +305,7 @@ $(top_builddir)/libtransmission/libtransmission.a \ $(top_builddir)/third-party/miniupnp/libminiupnp.a \ $(top_builddir)/third-party/libnatpmp/libnatpmp.a \ - $(top_builddir)/third-party/libevent/libevent.la \ + -levent -levent_core \ $(INTLLIBS) \ $(LIBCURL_LIBS) \ $(ZLIB_LIBS) \ diff -ru transmission-1.40.orig/daemon/remote.c transmission-1.40/daemon/remote.c --- transmission-1.40.orig/daemon/remote.c 2008-11-21 09:45:25.000000000 +0100 +++ transmission-1.40/daemon/remote.c 2008-11-21 09:56:16.000000000 +0100 @@ -15,7 +15,7 @@ #include #include /* strcmp */ -#include +#include #include #include diff -ru transmission-1.40.orig/gtk/Makefile.in transmission-1.40/gtk/Makefile.in --- transmission-1.40.orig/gtk/Makefile.in 2008-11-21 09:45:25.000000000 +0100 +++ transmission-1.40/gtk/Makefile.in 2008-11-21 09:54:28.000000000 +0100 @@ -72,7 +72,6 @@ am__DEPENDENCIES_1 = transmission_DEPENDENCIES = \ $(top_builddir)/libtransmission/libtransmission.a \ - $(top_builddir)/third-party/libevent/libevent.la \ $(top_builddir)/third-party/miniupnp/libminiupnp.a \ $(top_builddir)/third-party/libnatpmp/libnatpmp.a \ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ @@ -397,7 +396,7 @@ dist_man_MANS = transmission.1 transmission_LDADD = \ $(top_builddir)/libtransmission/libtransmission.a \ - $(top_builddir)/third-party/libevent/libevent.la \ + -levent -levent_core \ $(top_builddir)/third-party/miniupnp/libminiupnp.a \ $(top_builddir)/third-party/libnatpmp/libnatpmp.a $(GTK_LIBS) \ $(GIO_LIBS) $(LIBNOTIFY_LIBS) $(DBUS_GLIB_LIBS) \ diff -ru transmission-1.40.orig/gtk/util.c transmission-1.40/gtk/util.c --- transmission-1.40.orig/gtk/util.c 2008-11-21 09:45:25.000000000 +0100 +++ transmission-1.40/gtk/util.c 2008-11-21 09:56:16.000000000 +0100 @@ -37,7 +37,7 @@ #include #endif -#include +#include #include /* TR_RATIO_NA, TR_RATIO_INF */ #include /* tr_inf */ diff -ru transmission-1.40.orig/libtransmission/clients.c transmission-1.40/libtransmission/clients.c --- transmission-1.40.orig/libtransmission/clients.c 2008-11-21 09:45:25.000000000 +0100 +++ transmission-1.40/libtransmission/clients.c 2008-11-21 09:56:16.000000000 +0100 @@ -17,7 +17,7 @@ #include /* strtol */ #include -#include /* evbuffer */ +#include /* evbuffer */ #include "transmission.h" #include "clients.h" diff -ru transmission-1.40.orig/libtransmission/Makefile.in transmission-1.40/libtransmission/Makefile.in --- transmission-1.40.orig/libtransmission/Makefile.in 2008-11-21 09:45:25.000000000 +0100 +++ transmission-1.40/libtransmission/Makefile.in 2008-11-21 09:52:26.000000000 +0100 @@ -82,7 +82,6 @@ am__DEPENDENCIES_2 = ./libtransmission.a \ $(top_builddir)/third-party/miniupnp/libminiupnp.a \ $(top_builddir)/third-party/libnatpmp/libnatpmp.a \ - $(top_builddir)/third-party/libevent/libevent.la \ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ $(am__DEPENDENCIES_1) @@ -439,7 +438,7 @@ ./libtransmission.a \ $(top_builddir)/third-party/miniupnp/libminiupnp.a \ $(top_builddir)/third-party/libnatpmp/libnatpmp.a \ - $(top_builddir)/third-party/libevent/libevent.la \ + -levent -levent_core \ $(INTLLIBS) \ $(LIBCURL_LIBS) \ $(OPENSSL_LIBS) \ diff -ru transmission-1.40.orig/libtransmission/net.c transmission-1.40/libtransmission/net.c --- transmission-1.40.orig/libtransmission/net.c 2008-11-21 09:45:25.000000000 +0100 +++ transmission-1.40/libtransmission/net.c 2008-11-21 09:56:16.000000000 +0100 @@ -37,6 +37,7 @@ #include #endif +#include #include #include "transmission.h" diff -ru transmission-1.40.orig/libtransmission/rpc-server.c transmission-1.40/libtransmission/rpc-server.c --- transmission-1.40.orig/libtransmission/rpc-server.c 2008-11-21 09:45:25.000000000 +0100 +++ transmission-1.40/libtransmission/rpc-server.c 2008-11-21 09:56:01.000000000 +0100 @@ -24,8 +24,8 @@ #include #endif -#include -#include +#include +#include #include "transmission.h" #include "bencode.h" diff -ru transmission-1.40.orig/third-party/Makefile.in transmission-1.40/third-party/Makefile.in --- transmission-1.40.orig/third-party/Makefile.in 2008-11-21 09:45:25.000000000 +0100 +++ transmission-1.40/third-party/Makefile.in 2008-11-21 09:54:56.000000000 +0100 @@ -253,7 +253,6 @@ top_srcdir = @top_srcdir@ transmissionlocaledir = @transmissionlocaledir@ SUBDIRS = \ - libevent \ libnatpmp \ miniupnp