Changeset 12954


Ignore:
Timestamp:
Oct 8, 2011, 11:53:27 PM (11 years ago)
Author:
jordan
Message:

(trunk) #4490 "Transmission 2.40b1 fails to build: undefined references" -- fixed.

Location:
trunk
Files:
8 edited

Legend:

Unmodified
Added
Removed

  • trunk/configure.ac

    r12952 r12954  
    7171AC_PROG_CC
    7272AC_PROG_CXX
     73AC_CHECK_PROG([HAVE_CXX],[$CXX],[yes],[no])
    7374AC_C_INLINE
    7475if test "x$GCC" = "xyes" ; then
    … …  
    206207AC_MSG_CHECKING([µTP])
    207208build_utp="no"
    208 if test "x$CXX" = "x" ; then
     209if test "x$HAVE_CXX" = "xyes" ; then
     210    have_utp="yes"
     211else
    209212    have_utp="no"
    210 else
    211     have_utp="yes"
    212213fi
    213214AC_ARG_ENABLE([utp],
    … …  
    410411                 third-party/miniupnp/Makefile
    411412                 third-party/libnatpmp/Makefile
    412                  third-party/libutp/Makefile
    413413                 third-party/dht/Makefile
    414414                 macosx/Makefile
    … …  
    425425                 po/Makefile.in])
    426426
     427dnl Maybe build libutp...
     428AM_CONDITIONAL([CONDITIONAL],[test "x$build_utp" = "xyes"])
     429AM_COND_IF([CONDITIONAL],
     430           [AC_CONFIG_FILES([third-party/libutp/Makefile])])
     431
    427432AC_OUTPUT
    428433

  • trunk/libtransmission/net.c

    r12300 r12954  
    3939#include <event2/util.h>
    4040
    41 #include <libutp/utp.h>
    42 
    4341#include "transmission.h"
    4442#include "fdlimit.h" /* tr_fdSocketClose() */

  • trunk/libtransmission/peer-io.c

    r12477 r12954  
    1919#include <event2/bufferevent.h>
    2020
    21 #include <libutp/utp.h>
    22 
    2321#include "transmission.h"
    2422#include "session.h"
    … …  
    2927#include "peer-io.h"
    3028#include "trevent.h" /* tr_runInEventThread() */
     29#include "tr-utp.h"
    3130#include "utils.h"
    3231

  • trunk/libtransmission/peer-mgr.c

    r12920 r12954  
    1818
    1919#include <event2/event.h>
    20 #include <libutp/utp.h>
    2120
    2221#include "transmission.h"
    … …  
    3736#include "stats.h" /* tr_statsAddUploaded, tr_statsAddDownloaded */
    3837#include "torrent.h"
     38#include "tr-utp.h"
    3939#include "utils.h"
    4040#include "webseed.h"

  • trunk/libtransmission/tr-utp.c

    r12229 r12954  
    2525
    2626#include <event2/event.h>
    27 
    28 #include <libutp/utp.h>
    2927
    3028#include "transmission.h"

  • trunk/libtransmission/tr-utp.h

    r11960 r12954  
    2929#define _TR_UTP_H_
    3030
     31/* this is included *after* transmission.h s.t. we get bool defined */
     32#include <libutp/utp.h>
     33
    3134int tr_utpPacket(const unsigned char *buf, size_t buflen,
    3235                 const struct sockaddr *from, socklen_t fromlen,

  • trunk/qt/qtr.pro

    r12916 r12954  
    2020INCLUDEPATH += $${TRANSMISSION_TOP}
    2121LIBS += $${TRANSMISSION_TOP}/libtransmission/libtransmission.a
    22 exists( $${TRANSMISSION_TOP}/third-party/libutp/libutp.a ) {
     22exists( $${TRANSMISSION_TOP}/third-party/libutp/Makefile ) {
    2323    LIBS += $${TRANSMISSION_TOP}/third-party/libutp/libutp.a
    2424}

  • trunk/third-party/libutp/utypes.h

    r12663 r12954  
    3636typedef char * str;
    3737
    38 #ifndef __cplusplus
    39 typedef uint8 bool;
    40 #endif
    41 
    4238#endif //__UTYPES_H__
Note: See TracChangeset for help on using the changeset viewer.