(trunk) on non-mac platforms, try not building our own copy of libevent 1.4.x

cli/Makefile.am

@@ -17,10 +17,10 @@ transmissioncli_SOURCES = cli.c
 
 transmissioncli_LDADD = \
     $(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 \
     $(top_builddir)/third-party/dht/libdht.a \
+    $(LIBEVENT_LIBS) \
     $(INTLLIBS) \
     $(LIBCURL_LIBS) \
     $(ZLIB_LIBS) \

configure.ac

@@ -45,17 +45,17 @@ CURL_MINIMUM=7.16.3
 GIO_MINIMUM=2.15.5
 GLIB_MINIMUM=2.6.0
 GTK_MINIMUM=2.6.0
-WX_MINIMUM=2.6.0
 LIBNOTIFY_MINIMUM=0.4.3
 DBUS_GLIB_MINIMUM=0.70
+LIBEVENT_MINIMUM=1.4.5
 AC_SUBST(OPENSSL_MINIMUM)
 AC_SUBST(CURL_MINIMUM)
 AC_SUBST(GIO_MINIMUM)
 AC_SUBST(GLIB_MINIMUM)
 AC_SUBST(GTK_MINIMUM)
-AC_SUBST(WX_MINIMUM)
 AC_SUBST(LIBNOTIFY_MINIMUM)
 AC_SUBST(DBUS_GLIB_MINIMUM)
+AC_SUBST(LIBEVENT_MINIUM)
 
 AC_PROG_CC
 AC_PROG_CXX
@@ -165,17 +165,23 @@ AC_TRY_LINK([#include <stdarg.h>], [va_list ap1, ap2; va_copy(ap1, ap2);],
     )
 ])
 
+
+dnl let's try using the system's libevent now
+dnl
 dnl ----------------------------------------------------------------------------
 dnl
 dnl  libevent fun
 dnl
 dnl  we have to add the builddir into the include path because event-config.h
 dnl  is generated when libevent is build
+dnl 
+dnl AC_CONFIG_SUBDIRS([third-party/libevent])
+dnl AC_MSG_NOTICE([invoking libevent's configure script])
+dnl LIBEVENT_CPPFLAGS="-I\$(top_srcdir)/third-party/libevent -I\$(top_builddir)/third-party/libevent"
+dnl AC_SUBST(LIBEVENT_CPPFLAGS)
 
-AC_CONFIG_SUBDIRS([third-party/libevent])
-AC_MSG_NOTICE([invoking libevent's configure script])
-LIBEVENT_CPPFLAGS="-I\$(top_srcdir)/third-party/libevent -I\$(top_builddir)/third-party/libevent"
-AC_SUBST(LIBEVENT_CPPFLAGS)
+LIBEVENT_LIBS="-levent"
+AC_SUBST(LIBEVENT_LIBS)
 
 
 dnl ----------------------------------------------------------------------------

daemon/Makefile.am

@@ -21,8 +21,8 @@ LDADD = \
     $(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 \
     $(top_builddir)/third-party/dht/libdht.a \
+    $(LIBEVENT_LIBS) \
     $(INTLLIBS) \
     $(LIBCURL_LIBS) \
     $(ZLIB_LIBS) \

daemon/remote.c

@@ -23,7 +23,7 @@
  #include <unistd.h> /* getcwd */
 #endif
 
-#include <libevent/event.h>
+#include <event.h>
 
 #define CURL_DISABLE_TYPECHECK /* otherwise -Wunreachable-code goes insane */
 #include <curl/curl.h>

gtk/Makefile.am

@@ -100,13 +100,13 @@ dist_man_MANS = transmission.1
 
 transmission_LDADD = \
     $(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 \
     $(top_builddir)/third-party/dht/libdht.a \
     $(GTK_LIBS) \
     $(GIO_LIBS) \
     $(LIBNOTIFY_LIBS) \
+    $(LIBEVENT_LIBS) \
     $(DBUS_GLIB_LIBS) \
     $(OPENSSL_LIBS) \
     $(LIBCURL_LIBS) \

gtk/util.c

@@ -38,7 +38,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 */

libtransmission/Makefile.am

@@ -126,9 +126,9 @@ apps_ldadd = \
     ./libtransmission.a  \
     $(top_builddir)/third-party/miniupnp/libminiupnp.a \
     $(top_builddir)/third-party/libnatpmp/libnatpmp.a \
-    $(top_builddir)/third-party/libevent/libevent.la \
     $(top_builddir)/third-party/dht/libdht.a \
     $(INTLLIBS) \
+    $(LIBEVENT_LIBS) \
     $(LIBCURL_LIBS) \
     $(OPENSSL_LIBS) \
     $(PTHREAD_LIBS) \

libtransmission/clients.c

@@ -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"

libtransmission/net.c

@@ -40,6 +40,7 @@
 #endif
 #include <unistd.h>
 
+#include <stdarg.h> /* 1.4.x versions of evutil.h need this */
 #include <evutil.h>
 
 #include "transmission.h"

libtransmission/rpc-server.c

@@ -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"

qt/qtr.pro

@@ -13,11 +13,10 @@ PKGCONFIG = fontconfig libcurl openssl
 
 TRANSMISSION_TOP = ..
 INCLUDEPATH += $${TRANSMISSION_TOP}
-LIBS += $${TRANSMISSION_TOP}/libtransmission/libtransmission.a
+LIBS += $${TRANSMISSION_TOP}/libtransmission/libtransmission.a -levent
 LIBS += $${TRANSMISSION_TOP}/third-party/dht/libdht.a
 LIBS += $${TRANSMISSION_TOP}/third-party/miniupnp/libminiupnp.a
 LIBS += $${TRANSMISSION_TOP}/third-party/libnatpmp/libnatpmp.a
-LIBS += $${TRANSMISSION_TOP}/third-party/libevent/.libs/libevent.a
 
 TRANSLATIONS += transmission_en.ts
 

third-party/Makefile.am

@@ -1,10 +1,10 @@
 SUBDIRS = \
-    libevent \
     libnatpmp \
     miniupnp \
     dht
 
 EXTRA_DIST = \
+    libevent \
     macosx-libevent-config.h
 
 install:

transmission.spec.in

@@ -18,12 +18,14 @@ BuildRequires: openssl-devel >= @OPENSSL_MINIMUM@
 BuildRequires: glib2-devel >= @GLIB_MINIMUM@
 BuildRequires: gtk2-devel >= @GTK_MINIMUM@
 BuildRequires: libnotify-devel >= @LIBNOTIFY_MINIMUM@
+BuildRequires: libevent-devel >= @LIBEVENT_MINIMUM@
 BuildRequires: dbus-glib-devel >= @DBUS_GLIB_MINIMUM@
 
 Requires: curl >= @CURL_MINIMUM@
 Requires: openssl >= @OPENSSL_MINIMUM@
 Requires: glib2 >= @GLIB_MINIMUM@
 Requires: gtk2 >= @GTK_MINIMUM@
+Requires: libevent >= @LIBEVENT_MINIMUM@
 Requires: libnotify >= @LIBNOTIFY_MINIMUM@
 Requires: dbus-glib >= @DBUS_GLIB_MINIMUM@
 
@@ -61,4 +63,4 @@ rm -rf $RPM_BUILD_ROOT
 - fixed %files section
 - added Source0
 * Wed Jul 18 2006 Charles Kerr <charles@transmissionbt.com>
-- first draft at a spec file, cribbed from Pan's spec file
+- first draft at a spec file, cribbed from Pan's spec file