Blob Blame History Raw
diff -u -r transmission-1.34.orig/configure transmission-1.34/configure
--- transmission-1.34.orig/configure	2008-09-17 03:38:32.000000000 +0200
+++ transmission-1.34/configure	2008-09-28 11:42:58.000000000 +0200
@@ -996,7 +996,6 @@
 LIBNOTIFY_LIBS
 DBUS_GLIB_CFLAGS
 DBUS_GLIB_LIBS'
-ac_subdirs_all='third-party/libevent'
 
 # Initialize some variables set by options.
 ac_init_help=
@@ -23190,15 +23189,6 @@
 
 
 
-subdirs="$subdirs third-party/libevent"
-
-{ echo "$as_me:$LINENO: invoking libevent's configure script" >&5
-echo "$as_me: invoking libevent's configure script" >&6;}
-LIBEVENT_CPPFLAGS="-I\$(top_srcdir)/third-party/libevent"
-
-
-
-
 
 pkg_failed=no
 { echo "$as_me:$LINENO: checking for GTK" >&5
diff -u -r transmission-1.34.orig/daemon/remote.c transmission-1.34/daemon/remote.c
--- transmission-1.34.orig/daemon/remote.c	2008-09-17 03:37:40.000000000 +0200
+++ transmission-1.34/daemon/remote.c	2008-09-28 11:45:48.000000000 +0200
@@ -17,7 +17,7 @@
 
 #include <unistd.h> /* getcwd */
 
-#include <libevent/event.h>
+#include <event.h>
 #include <curl/curl.h>
 
 #include <libtransmission/transmission.h>
diff -u -r transmission-1.34.orig/gtk/tr-io.c transmission-1.34/gtk/tr-io.c
--- transmission-1.34.orig/gtk/tr-io.c	2008-09-17 03:37:35.000000000 +0200
+++ transmission-1.34/gtk/tr-io.c	2008-09-28 11:45:59.000000000 +0200
@@ -30,7 +30,7 @@
 
 #include <glib.h>
 
-#include <libevent/evutil.h> /* evutil_make_socket_nonblocking */
+#include <evutil.h> /* evutil_make_socket_nonblocking */
 
 #include "tr-io.h"
 #include "util.h"
diff -u -r transmission-1.34.orig/gtk/util.c transmission-1.34/gtk/util.c
--- transmission-1.34.orig/gtk/util.c	2008-09-17 03:37:35.000000000 +0200
+++ transmission-1.34/gtk/util.c	2008-09-28 11:46:07.000000000 +0200
@@ -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 -u -r transmission-1.34.orig/libtransmission/clients.c transmission-1.34/libtransmission/clients.c
--- transmission-1.34.orig/libtransmission/clients.c	2008-09-17 03:37:35.000000000 +0200
+++ transmission-1.34/libtransmission/clients.c	2008-09-28 11:46:20.000000000 +0200
@@ -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 -u -r transmission-1.34.orig/libtransmission/rpc-server.c transmission-1.34/libtransmission/rpc-server.c
--- transmission-1.34.orig/libtransmission/rpc-server.c	2008-09-17 03:37:35.000000000 +0200
+++ transmission-1.34/libtransmission/rpc-server.c	2008-09-28 11:46:28.000000000 +0200
@@ -18,7 +18,7 @@
 
 #include <unistd.h> /* unlink */
 
-#include <libevent/event.h>
+#include <event.h>
 #include <shttpd/defs.h> /* edit_passwords */
 #include <shttpd/shttpd.h>
 
diff -u -r transmission-1.34.orig/third-party/Makefile.in transmission-1.34/third-party/Makefile.in
--- transmission-1.34.orig/third-party/Makefile.in	2008-09-17 03:38:34.000000000 +0200
+++ transmission-1.34/third-party/Makefile.in	2008-09-28 11:43:13.000000000 +0200
@@ -246,7 +246,6 @@
 top_srcdir = @top_srcdir@
 transmissionlocaledir = @transmissionlocaledir@
 SUBDIRS = \
-    libevent \
     libnatpmp \
     miniupnp \
     shttpd
diff -u -r transmission-1.34.orig/libtransmission/net.c transmission-1.34/libtransmission/net.c
--- transmission-1.34.orig/libtransmission/net.c	2008-09-17 03:37:35.000000000 +0200
+++ transmission-1.34/libtransmission/net.c	2008-09-28 12:05:39.000000000 +0200
@@ -37,6 +37,7 @@
 #include <fcntl.h>
 #endif
 
+#include <stdarg.h>
 #include <evutil.h>
 
 #include "transmission.h"
diff -u -r transmission-1.34.orig/cli/Makefile.in transmission-1.34/cli/Makefile.in
--- transmission-1.34.orig/cli/Makefile.in	2008-09-17 03:38:34.000000000 +0200
+++ transmission-1.34/cli/Makefile.in	2008-09-28 15:07:43.000000000 +0200
@@ -53,7 +53,6 @@
 am__DEPENDENCIES_1 =
 transmissioncli_DEPENDENCIES =  \
 	$(top_builddir)/libtransmission/libtransmission.a \
-	$(top_builddir)/third-party/libevent/libevent_core.la \
 	$(top_builddir)/third-party/libnatpmp/libnatpmp.a \
 	$(top_builddir)/third-party/miniupnp/libminiupnp.a \
 	$(top_builddir)/third-party/shttpd/libshttpd.a \
@@ -273,7 +272,7 @@
 transmissioncli_SOURCES = cli.c
 transmissioncli_LDADD = \
   $(top_builddir)/libtransmission/libtransmission.a \
-  $(top_builddir)/third-party/libevent/libevent_core.la \
+  -levent -levent_core \
   $(top_builddir)/third-party/libnatpmp/libnatpmp.a \
   $(top_builddir)/third-party/miniupnp/libminiupnp.a \
   $(top_builddir)/third-party/shttpd/libshttpd.a \
diff -u -r transmission-1.34.orig/daemon/Makefile.in transmission-1.34/daemon/Makefile.in
--- transmission-1.34.orig/daemon/Makefile.in	2008-09-17 03:38:34.000000000 +0200
+++ transmission-1.34/daemon/Makefile.in	2008-09-28 15:07:01.000000000 +0200
@@ -58,7 +58,6 @@
 	$(top_builddir)/third-party/shttpd/libshttpd.a \
 	$(top_builddir)/third-party/miniupnp/libminiupnp.a \
 	$(top_builddir)/third-party/libnatpmp/libnatpmp.a \
-	$(top_builddir)/third-party/libevent/libevent_core.la \
 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
 am_transmission_remote_OBJECTS = remote.$(OBJEXT)
@@ -69,7 +68,6 @@
 	$(top_builddir)/third-party/shttpd/libshttpd.a \
 	$(top_builddir)/third-party/miniupnp/libminiupnp.a \
 	$(top_builddir)/third-party/libnatpmp/libnatpmp.a \
-	$(top_builddir)/third-party/libevent/libevent_core.la \
 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
 DEFAULT_INCLUDES = -I.@am__isrc@
@@ -293,7 +291,7 @@
     $(top_builddir)/third-party/shttpd/libshttpd.a \
     $(top_builddir)/third-party/miniupnp/libminiupnp.a \
     $(top_builddir)/third-party/libnatpmp/libnatpmp.a \
-    $(top_builddir)/third-party/libevent/libevent_core.la \
+    -levent -levent_core \
     $(INTLLIBS) \
     $(OPENSSL_LIBS) \
     $(LIBCURL_LIBS) \
diff -u -r transmission-1.34.orig/gtk/Makefile.in transmission-1.34/gtk/Makefile.in
--- transmission-1.34.orig/gtk/Makefile.in	2008-09-17 03:38:34.000000000 +0200
+++ transmission-1.34/gtk/Makefile.in	2008-09-28 15:08:03.000000000 +0200
@@ -64,7 +64,6 @@
 am__DEPENDENCIES_1 =
 transmission_DEPENDENCIES =  \
 	$(top_builddir)/libtransmission/libtransmission.a \
-	$(top_builddir)/third-party/libevent/libevent_core.la \
 	$(top_builddir)/third-party/miniupnp/libminiupnp.a \
 	$(top_builddir)/third-party/libnatpmp/libnatpmp.a \
 	$(top_builddir)/third-party/shttpd/libshttpd.a \
@@ -370,7 +369,7 @@
 dist_man_MANS = transmission.1
 transmission_LDADD = \
     $(top_builddir)/libtransmission/libtransmission.a \
-    $(top_builddir)/third-party/libevent/libevent_core.la \
+    -levent -levent_core \
     $(top_builddir)/third-party/miniupnp/libminiupnp.a \
     $(top_builddir)/third-party/libnatpmp/libnatpmp.a \
     $(top_builddir)/third-party/shttpd/libshttpd.a \
diff -u -r transmission-1.34.orig/libtransmission/Makefile.in transmission-1.34/libtransmission/Makefile.in
--- transmission-1.34.orig/libtransmission/Makefile.in	2008-09-17 03:38:34.000000000 +0200
+++ transmission-1.34/libtransmission/Makefile.in	2008-09-28 15:05:47.000000000 +0200
@@ -83,7 +83,6 @@
 	$(top_builddir)/third-party/shttpd/libshttpd.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)
 bencode_test_DEPENDENCIES = $(am__DEPENDENCIES_2)
@@ -420,7 +419,7 @@
     $(top_builddir)/third-party/shttpd/libshttpd.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) \