Changeset 8599


Ignore:
Timestamp:
Jun 3, 2009, 3:47:08 PM (13 years ago)
Author:
charles
Message:

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

Location:
trunk
Files:
13 edited

Legend:

Unmodified
Added
Removed
  • trunk/cli/Makefile.am

    r8433 r8599  
    1818transmissioncli_LDADD = \
    1919    $(top_builddir)/libtransmission/libtransmission.a \
    20     $(top_builddir)/third-party/libevent/libevent.la \
    2120    $(top_builddir)/third-party/libnatpmp/libnatpmp.a \
    2221    $(top_builddir)/third-party/miniupnp/libminiupnp.a \
    2322    $(top_builddir)/third-party/dht/libdht.a \
     23    $(LIBEVENT_LIBS) \
    2424    $(INTLLIBS) \
    2525    $(LIBCURL_LIBS) \
  • trunk/configure.ac

    r8597 r8599  
    4646GLIB_MINIMUM=2.6.0
    4747GTK_MINIMUM=2.6.0
    48 WX_MINIMUM=2.6.0
    4948LIBNOTIFY_MINIMUM=0.4.3
    5049DBUS_GLIB_MINIMUM=0.70
     50LIBEVENT_MINIMUM=1.4.5
    5151AC_SUBST(OPENSSL_MINIMUM)
    5252AC_SUBST(CURL_MINIMUM)
     
    5454AC_SUBST(GLIB_MINIMUM)
    5555AC_SUBST(GTK_MINIMUM)
    56 AC_SUBST(WX_MINIMUM)
    5756AC_SUBST(LIBNOTIFY_MINIMUM)
    5857AC_SUBST(DBUS_GLIB_MINIMUM)
     58AC_SUBST(LIBEVENT_MINIUM)
    5959
    6060AC_PROG_CC
     
    166166])
    167167
     168
     169dnl let's try using the system's libevent now
     170dnl
    168171dnl ----------------------------------------------------------------------------
    169172dnl
     
    172175dnl  we have to add the builddir into the include path because event-config.h
    173176dnl  is generated when libevent is build
    174 
    175 AC_CONFIG_SUBDIRS([third-party/libevent])
    176 AC_MSG_NOTICE([invoking libevent's configure script])
    177 LIBEVENT_CPPFLAGS="-I\$(top_srcdir)/third-party/libevent -I\$(top_builddir)/third-party/libevent"
    178 AC_SUBST(LIBEVENT_CPPFLAGS)
     177dnl
     178dnl AC_CONFIG_SUBDIRS([third-party/libevent])
     179dnl AC_MSG_NOTICE([invoking libevent's configure script])
     180dnl LIBEVENT_CPPFLAGS="-I\$(top_srcdir)/third-party/libevent -I\$(top_builddir)/third-party/libevent"
     181dnl AC_SUBST(LIBEVENT_CPPFLAGS)
     182
     183LIBEVENT_LIBS="-levent"
     184AC_SUBST(LIBEVENT_LIBS)
    179185
    180186
  • trunk/daemon/Makefile.am

    r8433 r8599  
    2222    $(top_builddir)/third-party/miniupnp/libminiupnp.a \
    2323    $(top_builddir)/third-party/libnatpmp/libnatpmp.a \
    24     $(top_builddir)/third-party/libevent/libevent.la \
    2524    $(top_builddir)/third-party/dht/libdht.a \
     25    $(LIBEVENT_LIBS) \
    2626    $(INTLLIBS) \
    2727    $(LIBCURL_LIBS) \
  • trunk/daemon/remote.c

    r8596 r8599  
    2424#endif
    2525
    26 #include <libevent/event.h>
     26#include <event.h>
    2727
    2828#define CURL_DISABLE_TYPECHECK /* otherwise -Wunreachable-code goes insane */
  • trunk/gtk/Makefile.am

    r8433 r8599  
    101101transmission_LDADD = \
    102102    $(top_builddir)/libtransmission/libtransmission.a \
    103     $(top_builddir)/third-party/libevent/libevent.la \
    104103    $(top_builddir)/third-party/miniupnp/libminiupnp.a \
    105104    $(top_builddir)/third-party/libnatpmp/libnatpmp.a \
     
    108107    $(GIO_LIBS) \
    109108    $(LIBNOTIFY_LIBS) \
     109    $(LIBEVENT_LIBS) \
    110110    $(DBUS_GLIB_LIBS) \
    111111    $(OPENSSL_LIBS) \
  • trunk/gtk/util.c

    r8283 r8599  
    3939#endif
    4040
    41 #include <libevent/evhttp.h>
     41#include <evhttp.h>
    4242
    4343#include <libtransmission/transmission.h> /* TR_RATIO_NA, TR_RATIO_INF */
  • trunk/libtransmission/Makefile.am

    r8549 r8599  
    127127    $(top_builddir)/third-party/miniupnp/libminiupnp.a \
    128128    $(top_builddir)/third-party/libnatpmp/libnatpmp.a \
    129     $(top_builddir)/third-party/libevent/libevent.la \
    130129    $(top_builddir)/third-party/dht/libdht.a \
    131130    $(INTLLIBS) \
     131    $(LIBEVENT_LIBS) \
    132132    $(LIBCURL_LIBS) \
    133133    $(OPENSSL_LIBS) \
  • trunk/libtransmission/clients.c

    r8561 r8599  
    1818#include <string.h>
    1919
    20 #include <libevent/event.h> /* evbuffer */
     20#include <event.h> /* evbuffer */
    2121
    2222#include "transmission.h"
  • trunk/libtransmission/net.c

    r8408 r8599  
    4141#include <unistd.h>
    4242
     43#include <stdarg.h> /* 1.4.x versions of evutil.h need this */
    4344#include <evutil.h>
    4445
  • trunk/libtransmission/rpc-server.c

    r8592 r8599  
    2525#endif
    2626
    27 #include <libevent/event.h>
    28 #include <libevent/evhttp.h>
     27#include <event.h>
     28#include <evhttp.h>
    2929
    3030#include "transmission.h"
  • trunk/qt/qtr.pro

    r8459 r8599  
    1414TRANSMISSION_TOP = ..
    1515INCLUDEPATH += $${TRANSMISSION_TOP}
    16 LIBS += $${TRANSMISSION_TOP}/libtransmission/libtransmission.a
     16LIBS += $${TRANSMISSION_TOP}/libtransmission/libtransmission.a -levent
    1717LIBS += $${TRANSMISSION_TOP}/third-party/dht/libdht.a
    1818LIBS += $${TRANSMISSION_TOP}/third-party/miniupnp/libminiupnp.a
    1919LIBS += $${TRANSMISSION_TOP}/third-party/libnatpmp/libnatpmp.a
    20 LIBS += $${TRANSMISSION_TOP}/third-party/libevent/.libs/libevent.a
    2120
    2221TRANSLATIONS += transmission_en.ts
  • trunk/third-party/Makefile.am

    r8433 r8599  
    11SUBDIRS = \
    2     libevent \
    32    libnatpmp \
    43    miniupnp \
     
    65
    76EXTRA_DIST = \
     7    libevent \
    88    macosx-libevent-config.h
    99
  • trunk/transmission.spec.in

    r8354 r8599  
    1919BuildRequires: gtk2-devel >= @GTK_MINIMUM@
    2020BuildRequires: libnotify-devel >= @LIBNOTIFY_MINIMUM@
     21BuildRequires: libevent-devel >= @LIBEVENT_MINIMUM@
    2122BuildRequires: dbus-glib-devel >= @DBUS_GLIB_MINIMUM@
    2223
     
    2526Requires: glib2 >= @GLIB_MINIMUM@
    2627Requires: gtk2 >= @GTK_MINIMUM@
     28Requires: libevent >= @LIBEVENT_MINIMUM@
    2729Requires: libnotify >= @LIBNOTIFY_MINIMUM@
    2830Requires: dbus-glib >= @DBUS_GLIB_MINIMUM@
Note: See TracChangeset for help on using the changeset viewer.