Blob Blame History Raw
diff -ur transmission-1.42.OLD/cli/Makefile.in transmission-1.42/cli/Makefile.in
--- transmission-1.42.OLD/cli/Makefile.in	2008-12-24 12:53:03.000000000 -0500
+++ transmission-1.42/cli/Makefile.in	2008-12-31 11:30:31.000000000 -0500
@@ -54,7 +54,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) \
@@ -289,7 +288,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 -ur transmission-1.42.OLD/configure transmission-1.42/configure
--- transmission-1.42.OLD/configure	2008-12-24 12:53:05.000000000 -0500
+++ transmission-1.42/configure	2008-12-31 11:31:37.000000000 -0500
@@ -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=
@@ -23820,16 +23819,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 -ur transmission-1.42.OLD/daemon/Makefile.in transmission-1.42/daemon/Makefile.in
--- transmission-1.42.OLD/daemon/Makefile.in	2008-12-24 12:53:03.000000000 -0500
+++ transmission-1.42/daemon/Makefile.in	2008-12-31 11:33:13.000000000 -0500
@@ -58,7 +58,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)
@@ -69,7 +68,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)
@@ -308,7 +306,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 -ur transmission-1.42.OLD/daemon/remote.c transmission-1.42/daemon/remote.c
--- transmission-1.42.OLD/daemon/remote.c	2008-12-24 12:48:44.000000000 -0500
+++ transmission-1.42/daemon/remote.c	2008-12-31 11:34:05.000000000 -0500
@@ -15,7 +15,7 @@
 #include <stdlib.h>
 #include <string.h> /* strcmp */
 
-#include <libevent/event.h>
+#include <event.h>
 #include <curl/curl.h>
 
 #include <libtransmission/transmission.h>
diff -ur transmission-1.42.OLD/gtk/Makefile.in transmission-1.42/gtk/Makefile.in
--- transmission-1.42.OLD/gtk/Makefile.in	2008-12-24 12:53:03.000000000 -0500
+++ transmission-1.42/gtk/Makefile.in	2008-12-31 11:35:10.000000000 -0500
@@ -73,7 +73,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) \
@@ -398,7 +397,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 -ur transmission-1.42.OLD/gtk/util.c transmission-1.42/gtk/util.c
--- transmission-1.42.OLD/gtk/util.c	2008-12-24 12:48:40.000000000 -0500
+++ transmission-1.42/gtk/util.c	2008-12-31 11:35:56.000000000 -0500
@@ -37,7 +37,7 @@
  #include <dbus/dbus-glib.h>
 #endif
 
-#include <libevent/evhttp.h>
+#include <evhttp.h>
 
 #include <libtransmission/transmission.h> /* TR_RATIO_NA, TR_RATIO_INF */
 #include <libtransmission/utils.h> /* tr_inf */
diff -ur transmission-1.42.OLD/libtransmission/clients.c transmission-1.42/libtransmission/clients.c
--- transmission-1.42.OLD/libtransmission/clients.c	2008-12-24 12:48:40.000000000 -0500
+++ transmission-1.42/libtransmission/clients.c	2008-12-31 11:36:35.000000000 -0500
@@ -17,7 +17,7 @@
 #include <stdlib.h> /* strtol */
 #include <string.h>
 
-#include <libevent/event.h> /* evbuffer */
+#include <event.h> /* evbuffer */
 
 #include "transmission.h"
 #include "clients.h"
diff -ur transmission-1.42.OLD/libtransmission/Makefile.in transmission-1.42/libtransmission/Makefile.in
--- transmission-1.42.OLD/libtransmission/Makefile.in	2008-12-24 12:53:03.000000000 -0500
+++ transmission-1.42/libtransmission/Makefile.in	2008-12-31 11:38:46.000000000 -0500
@@ -83,7 +83,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)
@@ -466,7 +465,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 -ur transmission-1.42.OLD/libtransmission/net.c transmission-1.42/libtransmission/net.c
--- transmission-1.42.OLD/libtransmission/net.c	2008-12-24 12:48:40.000000000 -0500
+++ transmission-1.42/libtransmission/net.c	2008-12-31 11:39:24.000000000 -0500
@@ -37,6 +37,7 @@
  #include <fcntl.h>
 #endif
 
+#include <stdarg.h>
 #include <evutil.h>
 
 #include "transmission.h"
diff -ur transmission-1.42.OLD/libtransmission/rpc-server.c transmission-1.42/libtransmission/rpc-server.c
--- transmission-1.42.OLD/libtransmission/rpc-server.c	2008-12-24 12:48:40.000000000 -0500
+++ transmission-1.42/libtransmission/rpc-server.c	2008-12-31 11:39:53.000000000 -0500
@@ -24,8 +24,8 @@
  #include <zlib.h>
 #endif
 
-#include <libevent/event.h>
-#include <libevent/evhttp.h>
+#include <event.h>
+#include <evhttp.h>
 
 #include "transmission.h"
 #include "bencode.h"
diff -ur transmission-1.42.OLD/third-party/Makefile.in transmission-1.42/third-party/Makefile.in
--- transmission-1.42.OLD/third-party/Makefile.in	2008-12-24 12:53:03.000000000 -0500
+++ transmission-1.42/third-party/Makefile.in	2008-12-31 11:40:42.000000000 -0500
@@ -254,7 +254,6 @@
 top_srcdir = @top_srcdir@
 transmissionlocaledir = @transmissionlocaledir@
 SUBDIRS = \
-    libevent \
     libnatpmp \
     miniupnp