Attachment #147264 for bug #214491

Lines 27-32 Link Here

(-)btg-0.9.7.orig/bcore/client/Makefile.am (-1 / +1 lines)
27		27
28	libbtgclient_la_CFLAGS = @DEBUG_CFLAGS@ -DBTG_DEBUG=@BTG_DEBUG@ -DBTG_SVNREV="@BTG_SVNREV@"	28	libbtgclient_la_CFLAGS = @DEBUG_CFLAGS@ -DBTG_DEBUG=@BTG_DEBUG@ -DBTG_SVNREV="@BTG_SVNREV@"
29	libbtgclient_la_CXXFLAGS = @DEBUG_CXXFLAGS@ -DBTG_DEBUG=@BTG_DEBUG@ -DBTG_SVNREV="@BTG_SVNREV@"	29	libbtgclient_la_CXXFLAGS = @DEBUG_CXXFLAGS@ -DBTG_DEBUG=@BTG_DEBUG@ -DBTG_SVNREV="@BTG_SVNREV@"
30	libbtgclient_la_LDFLAGS = -l@BOOST_PROGRAM_OPTIONS_LIB@	30	libbtgclient_la_LIBADD = -l@BOOST_PROGRAM_OPTIONS_LIB@
31		31
32	INCLUDES = -I$(top_srcdir)	32	INCLUDES = -I$(top_srcdir)

Lines 25-33 Link Here

(-)btg-0.9.7.orig/daemon/auth/Makefile.am (-3 / +3 lines)
25		25
26	btgpasswd_LDADD = $(top_builddir)/bcore/libbtgcore.la \	26	btgpasswd_LDADD = $(top_builddir)/bcore/libbtgcore.la \
27	libauth.la \	27	libauth.la \
28	$(top_builddir)/external/ini/libini.la	28	$(top_builddir)/external/ini/libini.la \
29		29	@LIBS@ @LIBTORRENT_LIBS@ -l@BOOST_IOSTREAMS_LIB@ \
30	btgpasswd_LDFLAGS = @LIBS@ @LIBTORRENT_LIBS@ -l@BOOST_IOSTREAMS_LIB@ @LIBGNUTLS_LIBS@ @LIBGNUTLS_LIBS@ -l@BOOST_PROGRAM_OPTIONS_LIB@	30	@LIBGNUTLS_LIBS@ @LIBGNUTLS_LIBS@ -l@BOOST_PROGRAM_OPTIONS_LIB@
31		31
32	btgpasswd_CFLAGS = @CFLAGS@ @DEBUG_CFLAGS@ @LIBGNUTLS_CFLAGS@ \	32	btgpasswd_CFLAGS = @CFLAGS@ @DEBUG_CFLAGS@ @LIBGNUTLS_CFLAGS@ \
33	-DBTG_DEBUG=@BTG_DEBUG@ -DBTG_OPTION_SAVESESSIONS=@BTG_OPTION_SAVESESSIONS@ \	33	-DBTG_DEBUG=@BTG_DEBUG@ -DBTG_OPTION_SAVESESSIONS=@BTG_OPTION_SAVESESSIONS@ \

Lines 20-26 Link Here

(-)btg-0.9.7.orig/m4/rblibtorrent.m4 (-2 / +7 lines)
20	CXXFLAGS_SAVED="$CXXFLAGS"	20	CXXFLAGS_SAVED="$CXXFLAGS"
21	CXXFLAGS="$CXXFLAGS -I$RBLIBTORRENT_ROOT/include -I$RBLIBTORRENT_ROOT/include/libtorrent"	21	CXXFLAGS="$CXXFLAGS -I$RBLIBTORRENT_ROOT/include -I$RBLIBTORRENT_ROOT/include/libtorrent"
22	LDFLAGS_SAVED="$LDFLAGS"	22	LDFLAGS_SAVED="$LDFLAGS"
23	LDFLAGS="$LDFLAGS -L$RBLIBTORRENT_ROOT/lib -ltorrent"	23	LDFLAGS="$LDFLAGS -L$RBLIBTORRENT_ROOT/lib"
		24	LIBS_SAVED="$LIBS"
		25	LIBS="$LIBS -L$RBLIBTORRENT_ROOT/lib -ltorrent"
24		26
25	AC_MSG_CHECKING([whether Rasterbar Libtorrent headers can be used])	27	AC_MSG_CHECKING([whether Rasterbar Libtorrent headers can be used])
26		28
Lines 54-59 Link Here
54	AC_LANG_RESTORE	56	AC_LANG_RESTORE
55	CXXFLAGS="$CXXFLAGS_SAVED"	57	CXXFLAGS="$CXXFLAGS_SAVED"
56	LDFLAGS="$LDFLAGS_SAVED"	58	LDFLAGS="$LDFLAGS_SAVED"
		59	LIBS="$LIBS_SAVED"
57		60
58	if test x_$rblibtorrent_compiles != x_yes; then	61	if test x_$rblibtorrent_compiles != x_yes; then
59	AC_MSG_ERROR(Cannot find Rasterbar Libtorrent headers)	62	AC_MSG_ERROR(Cannot find Rasterbar Libtorrent headers)
Lines 65-71 Link Here
65		68
66	dnl RBLIBTORRENT_CXXFLAGS="-I$RBLIBTORRENT_ROOT/include -I$RBLIBTORRENT_ROOT/include/libtorrent"	69	dnl RBLIBTORRENT_CXXFLAGS="-I$RBLIBTORRENT_ROOT/include -I$RBLIBTORRENT_ROOT/include/libtorrent"
67	dnl AC_SUBST(RBLIBTORRENT_CXXFLAGS)	70	dnl AC_SUBST(RBLIBTORRENT_CXXFLAGS)
68	dnl RBLIBTORRENT_LDFLAGS="-L$RBLIBTORRENT_ROOT/lib -ltorrent"	71	dnl RBLIBTORRENT_LDFLAGS="-L$RBLIBTORRENT_ROOT/lib"
69	dnl AC_SUBST(RBLIBTORRENT_LDFLAGS)	72	dnl AC_SUBST(RBLIBTORRENT_LDFLAGS)
		73	dnl RBLIBTORRENT_LIBS="-ltorrent"
		74	dnl AC_SUBST(RBLIBTORRENT_LIBS)
70		75
71	])dnl	76	])dnl

Return to bug 214491

Lines 64-70 Link Here

(-)btg-0.9.7.orig/daemon/Makefile.am (-4 / +3 lines)
64	$(top_builddir)/daemon/ipfilter/libipfilter.la \	64	$(top_builddir)/daemon/ipfilter/libipfilter.la \
65	$(top_builddir)/daemon/auth/libauth.la $(EXTRA_LDADD) \	65	$(top_builddir)/daemon/auth/libauth.la $(EXTRA_LDADD) \
66	$(top_builddir)/external/ini/libini.la \	66	$(top_builddir)/external/ini/libini.la \
67	$(top_builddir)/bcore/libbtgcore.la	67	$(top_builddir)/bcore/libbtgcore.la \
		68	@LIBS@ @LIBTORRENT_LIBS@ -l@BOOST_IOSTREAMS_LIB@ \
		69	@LIBGNUTLS_LIBS@ -l@BOOST_PROGRAM_OPTIONS_LIB@
68		70
69	# $(top_builddir)/bcore/libcore.la \	71	# $(top_builddir)/bcore/libcore.la \
70	# $(top_builddir)/bcore/externalization/libextern.la \	72	# $(top_builddir)/bcore/externalization/libextern.la \
Lines 75-83 Link Here
75	# $(top_builddir)/external/ini/libini.la \	77	# $(top_builddir)/external/ini/libini.la \
76	# $(top_builddir)/bcore/auth/libbhash.la	78	# $(top_builddir)/bcore/auth/libbhash.la
77		79
78	btgdaemon_LDFLAGS = @LIBS@ @LIBTORRENT_LIBS@ -l@BOOST_IOSTREAMS_LIB@ @LIBGNUTLS_LIBS@ \
79	-l@BOOST_PROGRAM_OPTIONS_LIB@
80
81	btgdaemon_CFLAGS = @CFLAGS@ @DEBUG_CFLAGS@ @LIBGNUTLS_CFLAGS@ \	80	btgdaemon_CFLAGS = @CFLAGS@ @DEBUG_CFLAGS@ @LIBGNUTLS_CFLAGS@ \
82	-DBTG_DEBUG=@BTG_DEBUG@ -DBTG_OPTION_SAVESESSIONS=@BTG_OPTION_SAVESESSIONS@ \	81	-DBTG_DEBUG=@BTG_DEBUG@ -DBTG_OPTION_SAVESESSIONS=@BTG_OPTION_SAVESESSIONS@ \
83	-DBTG_OPTION_EVENTCALLBACK=@BTG_OPTION_EVENTCALLBACK@ \	82	-DBTG_OPTION_EVENTCALLBACK=@BTG_OPTION_EVENTCALLBACK@ \