Changeset 2749


Ignore:
Timestamp:
Aug 14, 2007, 7:26:49 PM (15 years ago)
Author:
charles
Message:

get libevent building and playing nice with all the other apps

Location:
trunk
Files:
3 added
6 edited

Legend:

Unmodified
Added
Removed
  • trunk/Makefile.am

    r2431 r2749  
    11if WITH_GTK
    22  GTK_DIR = gtk
    3 endif
    4 if WITH_LIBEVENT
    5   DAEMON_DIR = daemon
    63endif
    74if HAVE_BEOS
     
    1512endif
    1613
    17 SUBDIRS = libtransmission $(DAEMON_DIR) cli $(GTK_DIR) $(BEOS_DIR) $(MAC_DIR) $(WX_DIR)
     14SUBDIRS = third-party libtransmission daemon cli $(GTK_DIR) $(BEOS_DIR) $(MAC_DIR) $(WX_DIR)
    1815
    1916DISTCLEANFILES = \
     
    2421 AUTHORS \
    2522 LICENSE \
    26  README
     23 README \
     24 third-party
  • trunk/autogen.sh

    r2431 r2749  
    11#!/bin/sh
    22autoreconf --force --install -I config -I m4
     3cd third-party/libevent
     4sh ./autogen.sh
  • trunk/cli/Makefile.am

    r2400 r2749  
    1 AM_CPPFLAGS = -I@top_srcdir@
    2 AM_CFLAGS = $(PTHREAD_CFLAGS)
    3 
     1AM_CPPFLAGS = \
     2    -I@top_srcdir@ \
     3    @LIBEVENT_CPPFLAGS@ \
     4    $(PTHREAD_CFLAGS)
    45
    56bin_PROGRAMS = transmission-cli
    67
    78transmission_cli_SOURCES = transmissioncli.c
    8 transmission_cli_LDADD = ../libtransmission/libtransmission.a $(PTHREAD_LIBS) -lm
     9
     10transmission_cli_LDADD = \
     11    ../libtransmission/libtransmission.a \
     12    @LIBEVENT_LIBS@ \
     13    $(PTHREAD_LIBS) -lm
  • trunk/configure.ac

    r2614 r2749  
    4141dnl ----------------------------------------------------------------------------
    4242dnl
    43 dnl  libevent detection for the Daemon
    44 
    45 
    46 AC_CHECK_LIB([event],[event_init],[have_libevent=yes],[have_libevent=no])
    47 AC_ARG_WITH(libevent,
    48             AC_HELP_STRING([--with-libevent], [Build Daemon]),
    49             [want_libevent=$withval],
    50             [want_libevent=$have_libevent])
    51 use_libevent=no
    52 if test "x$want_libevent" = "xyes" ; then
    53     if test "x$have_libevent" = "xyes"; then
    54       use_libevent=yes
    55     else
    56       AC_MSG_ERROR("libevent not found!")
    57     fi
    58 fi
    59 AM_CONDITIONAL([WITH_LIBEVENT],[test "x$use_libevent" = "xyes"])
    60 
     43dnl  libevent fun
     44
     45AC_CONFIG_SUBDIRS([third-party/libevent])
     46AC_MSG_NOTICE([invoking libevent's configure script])
     47LIBEVENT_LIBS="\$(top_srcdir)/third-party/libevent/.libs/libevent.a"
     48LIBEVENT_CPPFLAGS="-I\$(top_srcdir)/third-party/libevent"
     49AC_SUBST(LIBEVENT_LIBS)
     50AC_SUBST(LIBEVENT_CPPFLAGS)
    6151
    6252
     
    208198                 libtransmission/Makefile
    209199                 libtransmission/version.h
     200                 third-party/Makefile
    210201                 macosx/Makefile
    211202                 wx/Makefile
     
    220211        Source code location:    ${srcdir}
    221212        Compiler:                ${CXX}
     213        Build libtransmission:   yes
     214        Build Daemon:            yes
    222215        Build BeOS client:       ${beos}
    223         Build Daemon:            ${use_libevent}
    224216        Build GTK+ client:       ${use_gtk}
    225217        Build OS X client:       ${darwin}
  • trunk/gtk/Makefile.am

    r2400 r2749  
    1 AM_CPPFLAGS = -I@top_srcdir@ @GTK_CFLAGS@ @GLIB_CFLAGS@ -DLOCALEDIR=\""$(transmissionlocaledir)"\"
     1AM_CPPFLAGS = \
     2    -I@top_srcdir@ \
     3    @LIBEVENT_CPPFLAGS@ \
     4    @GTK_CFLAGS@ \
     5    @GLIB_CFLAGS@ \
     6    -DLOCALEDIR=\""$(transmissionlocaledir)"\"
    27
    38AM_CFLAGS = $(PTHREAD_CFLAGS)
     
    4550    util.c
    4651
    47 transmission_gtk_LDADD = ../libtransmission/libtransmission.a @GTK_LIBS@ @GLIB_LIBS@ $(PTHREAD_LIBS) -lm
     52transmission_gtk_LDADD = \
     53    ../libtransmission/libtransmission.a \
     54    @GTK_LIBS@ @GLIB_LIBS@ \
     55    @LIBEVENT_LIBS@ \
     56    $(PTHREAD_LIBS) -lm
  • trunk/wx/Makefile.am

    r2519 r2749  
    1 AM_CPPFLAGS = -I@top_srcdir@ @WX_CPPFLAGS@
     1AM_CPPFLAGS = \
     2    -I@top_srcdir@ \
     3    @WX_CPPFLAGS@ \
     4    @LIBEVENT_CPPFLAGS@
     5
    26AM_CXXFLAGS = @WX_CXXFLAGS@
     7
    38SUBDIRS = images
    49
     
    1217    xmission.cc
    1318
    14 Xmission_LDADD = ../libtransmission/libtransmission.a @WX_LIBS@ $(PTHREAD_LIBS) -lm
     19Xmission_LDADD = \
     20    ../libtransmission/libtransmission.a \
     21    @LIBEVENT_LIBS@ \
     22    @WX_LIBS@ \
     23    $(PTHREAD_LIBS) -lm
Note: See TracChangeset for help on using the changeset viewer.