Changeset 13199
- Timestamp:
- Feb 4, 2012, 1:28:15 AM (11 years ago)
- Location:
- trunk
- Files:
-
- 1 added
- 1 deleted
- 9 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/cli/Makefile.am
r12957 r13199 19 19 transmission_cli_LDADD = \ 20 20 $(top_builddir)/libtransmission/libtransmission.a \ 21 $(top_builddir)/third-party/libnatpmp/libnatpmp.a\21 @LIBNATPMP_LIBS@ \ 22 22 @LIBUPNP_LIBS@ \ 23 23 @DHT_LIBS@ \ -
trunk/configure.ac
r13193 r13199 308 308 AC_SUBST(LIBUPNP_LIBS) 309 309 AC_SUBST(LIBUPNP_LIBS_QT) 310 311 312 313 314 dnl ---------------------------------------------------------------------------- 315 dnl 316 dnl Allow usage of system natpmp library 317 318 LIBNATPMP_CFLAGS="-I\$(top_srcdir)/third-party/libnatpmp/" 319 LIBNATPMP_LIBS="\$(top_builddir)/third-party/libnatpmp/libnatpmp.a" 320 LIBNATPMP_LIBS_QT="\$\${TRANSMISSION_TOP}/third-party/libnatpmp/libnatpmp.a" 321 build_bundled_natpmp="yes" 322 AC_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]) 326 if 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" 332 fi 333 AM_CONDITIONAL([BUILD_NATPMP],[test "x$build_bundled_natpmp" = "xyes"]) 334 AC_SUBST(LIBNATPMP_CFLAGS) 335 AC_SUBST(LIBNATPMP_LIBS) 336 AC_SUBST(LIBNATPMP_LIBS_QT) 310 337 311 338 -
trunk/daemon/Makefile.am
r12957 r13199 22 22 $(top_builddir)/libtransmission/libtransmission.a \ 23 23 @LIBUPNP_LIBS@ \ 24 $(top_builddir)/third-party/libnatpmp/libnatpmp.a\24 @LIBNATPMP_LIBS@ \ 25 25 @DHT_LIBS@ \ 26 26 @LIBUTP_LIBS@ \ -
trunk/gtk/Makefile.am
r12957 r13199 86 86 $(top_builddir)/libtransmission/libtransmission.a \ 87 87 @LIBUPNP_LIBS@ \ 88 $(top_builddir)/third-party/libnatpmp/libnatpmp.a\88 @LIBNATPMP_LIBS@ \ 89 89 @DHT_LIBS@ \ 90 90 @LIBUTP_LIBS@ \ -
trunk/libtransmission/Makefile.am
r12957 r13199 1 1 AM_CPPFLAGS = \ 2 -I. \3 2 -I$(top_srcdir) \ 4 -I$(top_srcdir)/third-party/ \5 3 -D__TRANSMISSION__ \ 6 4 -DPACKAGE_DATA_DIR=\""$(datadir)"\" … … 10 8 @LIBUTP_CFLAGS@ \ 11 9 @LIBUPNP_CFLAGS@ \ 10 @LIBNATPMP_CFLAGS@ \ 12 11 @LIBEVENT_CFLAGS@ \ 13 12 @LIBCURL_CFLAGS@ \ … … 92 91 makemeta.h \ 93 92 metainfo.h \ 94 natpmp .h \93 natpmp_local.h \ 95 94 net.h \ 96 95 peer-common.h \ … … 142 141 ./libtransmission.a \ 143 142 @LIBUPNP_LIBS@ \ 144 $(top_builddir)/third-party/libnatpmp/libnatpmp.a\143 @LIBNATPMP_LIBS@ \ 145 144 @INTLLIBS@ \ 146 145 @DHT_LIBS@ \ -
trunk/libtransmission/natpmp.c
r12225 r13199 18 18 19 19 #define ENABLE_STRNATPMPERR 20 #include <libnatpmp/natpmp.h>20 #include "natpmp.h" 21 21 22 22 #include "transmission.h" 23 #include "natpmp .h"23 #include "natpmp_local.h" 24 24 #include "net.h" /* tr_netCloseSocket */ 25 25 #include "port-forwarding.h" -
trunk/libtransmission/port-forwarding.c
r12228 r13199 19 19 20 20 #include "transmission.h" 21 #include "natpmp .h"21 #include "natpmp_local.h" 22 22 #include "net.h" 23 23 #include "peer-mgr.h" -
trunk/third-party/Makefile.am
r12957 r13199 5 5 MINIUPNP_DIR = miniupnp 6 6 endif 7 if BUILD_NATPMP 8 NATPMP_DIR = libnatpmp 9 endif 7 10 8 11 SUBDIRS = \ 9 12 dht \ 10 libnatpmp\13 $(NATPMP_DIR) \ 11 14 $(MINIUPNP_DIR) \ 12 15 $(UTP_DIR) -
trunk/utils/Makefile.am
r12957 r13199 28 28 $(top_builddir)/libtransmission/libtransmission.a \ 29 29 @LIBUPNP_LIBS@ \ 30 $(top_builddir)/third-party/libnatpmp/libnatpmp.a\30 @LIBNATPMP_LIBS@ \ 31 31 @INTLLIBS@ \ 32 32 @DHT_LIBS@ \
Note: See TracChangeset
for help on using the changeset viewer.