Changeset 13199


Ignore:
Timestamp:
Feb 4, 2012, 1:28:15 AM (7 years ago)
Author:
jordan
Message:

(trunk) #4732 "allow switching between internal and system libnatpmp" -- fixed with patch scarabeus and applied by me, so any patch breakage is probably mine... ;)

Location:
trunk
Files:
1 added
1 deleted
9 edited

Legend:

Unmodified
Added
Removed
  • trunk/cli/Makefile.am

    r12957 r13199  
    1919transmission_cli_LDADD = \
    2020    $(top_builddir)/libtransmission/libtransmission.a \
    21     $(top_builddir)/third-party/libnatpmp/libnatpmp.a \
     21    @LIBNATPMP_LIBS@ \
    2222    @LIBUPNP_LIBS@ \
    2323    @DHT_LIBS@ \
  • trunk/configure.ac

    r13193 r13199  
    308308AC_SUBST(LIBUPNP_LIBS)
    309309AC_SUBST(LIBUPNP_LIBS_QT)
     310
     311
     312 
     313
     314dnl ----------------------------------------------------------------------------
     315dnl
     316dnl  Allow usage of system natpmp library
     317
     318LIBNATPMP_CFLAGS="-I\$(top_srcdir)/third-party/libnatpmp/"
     319LIBNATPMP_LIBS="\$(top_builddir)/third-party/libnatpmp/libnatpmp.a"
     320LIBNATPMP_LIBS_QT="\$\${TRANSMISSION_TOP}/third-party/libnatpmp/libnatpmp.a"
     321build_bundled_natpmp="yes"
     322AC_ARG_ENABLE([external-natpmp],
     323              AS_HELP_STRING([--enable-external-natpmp],[Use system external-natpmp]),
     324              [want_external_natpmp=${enableval}],
     325              [want_external_natpmp=no])
     326if test "x$want_external_natpmp" != "xno" ; then
     327        dnl Would be lovely if it had pkgconfig
     328        LIBNATPMP_CFLAGS="" 
     329        LIBNATPMP_LIBS="-lnatpmp"
     330        LIBNATPMP_LIBS_QT="-lnatpmp"
     331        build_bundled_natpmp="no"
     332fi
     333AM_CONDITIONAL([BUILD_NATPMP],[test "x$build_bundled_natpmp" = "xyes"])
     334AC_SUBST(LIBNATPMP_CFLAGS)
     335AC_SUBST(LIBNATPMP_LIBS)
     336AC_SUBST(LIBNATPMP_LIBS_QT)
    310337
    311338
  • trunk/daemon/Makefile.am

    r12957 r13199  
    2222    $(top_builddir)/libtransmission/libtransmission.a \
    2323    @LIBUPNP_LIBS@ \
    24     $(top_builddir)/third-party/libnatpmp/libnatpmp.a \
     24    @LIBNATPMP_LIBS@ \
    2525    @DHT_LIBS@ \
    2626    @LIBUTP_LIBS@ \
  • trunk/gtk/Makefile.am

    r12957 r13199  
    8686    $(top_builddir)/libtransmission/libtransmission.a \
    8787    @LIBUPNP_LIBS@ \
    88     $(top_builddir)/third-party/libnatpmp/libnatpmp.a \
     88    @LIBNATPMP_LIBS@ \
    8989    @DHT_LIBS@ \
    9090    @LIBUTP_LIBS@ \
  • trunk/libtransmission/Makefile.am

    r12957 r13199  
    11AM_CPPFLAGS = \
    2     -I. \
    32    -I$(top_srcdir) \
    4     -I$(top_srcdir)/third-party/ \
    53    -D__TRANSMISSION__ \
    64    -DPACKAGE_DATA_DIR=\""$(datadir)"\"
     
    108    @LIBUTP_CFLAGS@ \
    119    @LIBUPNP_CFLAGS@ \
     10    @LIBNATPMP_CFLAGS@ \
    1211    @LIBEVENT_CFLAGS@ \
    1312    @LIBCURL_CFLAGS@ \
     
    9291    makemeta.h \
    9392    metainfo.h \
    94     natpmp.h \
     93    natpmp_local.h \
    9594    net.h \
    9695    peer-common.h \
     
    142141    ./libtransmission.a  \
    143142    @LIBUPNP_LIBS@ \
    144     $(top_builddir)/third-party/libnatpmp/libnatpmp.a \
     143    @LIBNATPMP_LIBS@ \
    145144    @INTLLIBS@ \
    146145    @DHT_LIBS@ \
  • trunk/libtransmission/natpmp.c

    r12225 r13199  
    1818
    1919#define ENABLE_STRNATPMPERR
    20 #include <libnatpmp/natpmp.h>
     20#include "natpmp.h"
    2121
    2222#include "transmission.h"
    23 #include "natpmp.h"
     23#include "natpmp_local.h"
    2424#include "net.h" /* tr_netCloseSocket */
    2525#include "port-forwarding.h"
  • trunk/libtransmission/port-forwarding.c

    r12228 r13199  
    1919
    2020#include "transmission.h"
    21 #include "natpmp.h"
     21#include "natpmp_local.h"
    2222#include "net.h"
    2323#include "peer-mgr.h"
  • trunk/third-party/Makefile.am

    r12957 r13199  
    55  MINIUPNP_DIR = miniupnp
    66endif
     7if BUILD_NATPMP
     8  NATPMP_DIR = libnatpmp
     9endif
    710
    811SUBDIRS = \
    912  dht \
    10   libnatpmp \
     13  $(NATPMP_DIR) \
    1114  $(MINIUPNP_DIR) \
    1215  $(UTP_DIR)
  • trunk/utils/Makefile.am

    r12957 r13199  
    2828    $(top_builddir)/libtransmission/libtransmission.a \
    2929    @LIBUPNP_LIBS@ \
    30     $(top_builddir)/third-party/libnatpmp/libnatpmp.a \
     30    @LIBNATPMP_LIBS@ \
    3131    @INTLLIBS@ \
    3232    @DHT_LIBS@ \
Note: See TracChangeset for help on using the changeset viewer.