Merge branch 'master' into xirvik

Conflicts:
	configure.ac
This commit is contained in:
rakshasa
2012-03-16 18:02:38 +09:00
+2 -2
View File
@@ -1,4 +1,4 @@
AC_INIT(rtorrent, 0.8.9, jaris@ifi.uio.no)
AC_INIT(rtorrent, 0.9.1, jaris@ifi.uio.no)
AM_INIT_AUTOMAKE
AM_CONFIG_HEADER(config.h)
@@ -47,7 +47,7 @@ PKG_CHECK_MODULES(libcurl, libcurl >= 7.15.4,
CXXFLAGS="$CXXFLAGS $libcurl_CFLAGS";
LIBS="$LIBS $libcurl_LIBS")
PKG_CHECK_MODULES(libtorrent, libtorrent >= 0.12.9,
PKG_CHECK_MODULES(libtorrent, libtorrent >= 0.13.1,
CXXFLAGS="$CXXFLAGS $libtorrent_CFLAGS";
LIBS="$LIBS $libtorrent_LIBS")