fujin/rtorrent
1
0
Fork 0
mirror of https://github.com/rakshasa/rtorrent.git synced 2026-10-14 13:16:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'zetafunction-autoconf'

Browse Source
This commit is contained in:
rakshasa
2019-07-08 20:30:09 +02:00
parent 3ec2f52db5 285972a20d
commit adc9b1dec5
2 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
configure.ac
+8 -5
View File
@@ -32,6 +32,7 @@ TORRENT_WITHOUT_STATVFS
TORRENT_WITHOUT_STATFS TORRENT_WITHOUT_STATFS
AX_PTHREAD([], AC_MSG_ERROR([requires pthread])) AX_PTHREAD([], AC_MSG_ERROR([requires pthread]))
PKG_CHECK_MODULES([CURSES],[ncursesw],[ PKG_CHECK_MODULES([CURSES],[ncursesw],[
AC_DEFINE(HAVE_NCURSESW_CURSES_H, 1) AC_DEFINE(HAVE_NCURSESW_CURSES_H, 1)
], ],
@@ -44,14 +45,10 @@ PKG_CHECK_MODULES([CURSES],[ncursesw],[
fi]) fi])
]) ])
PKG_CHECK_MODULES([LIBCURL], [libcurl], , [LIBCURL_CHECK_CONFIG]) PKG_CHECK_MODULES([LIBCURL], [libcurl],, [LIBCURL_CHECK_CONFIG])
PKG_CHECK_MODULES([CPPUNIT], [cppunit],, [no_cppunit="yes"]) PKG_CHECK_MODULES([CPPUNIT], [cppunit],, [no_cppunit="yes"])
PKG_CHECK_MODULES([DEPENDENCIES], [libtorrent >= 0.13.7]) PKG_CHECK_MODULES([DEPENDENCIES], [libtorrent >= 0.13.7])
LIBS="$PTHREAD_LIBS $CURSES_LIB $CURSES_LIBS $CPPUNIT_LIBS $LIBCURL $LIBCURL_LIBS $DEPENDENCIES_LIBS $LIBS"
CFLAGS="$CFLAGS $PTHREAD_CFLAGS $CPPUNIT_CFLAGS $LIBCURL_CPPFLAGS $LIBCURL_CFLAGS $DEPENDENCIES_CFLAGS $CURSES_CFLAGS"
CXXFLAGS="$CXXFLAGS $PTHREAD_CFLAGS $CPPUNIT_CFLAGS $LIBCURL_CPPFLAGS $LIBCURL_CFLAGS $DEPENDENCIES_CFLAGS $CURSES_CFLAGS"
AC_LANG_PUSH(C++) AC_LANG_PUSH(C++)
TORRENT_WITH_XMLRPC_C TORRENT_WITH_XMLRPC_C
AC_LANG_POP(C++) AC_LANG_POP(C++)
@@ -68,6 +65,12 @@ CC_ATTRIBUTE_UNUSED(
AC_DEFINE([__UNUSED], [], [Null-wrapper if unused attribute is unsupported]) AC_DEFINE([__UNUSED], [], [Null-wrapper if unused attribute is unsupported])
) )
dnl Only update global build variables immediately before generating the output,
dnl to avoid affecting the global build environment for other autoconf checks.
LIBS="$PTHREAD_LIBS $CURSES_LIB $CURSES_LIBS $CPPUNIT_LIBS $LIBCURL $LIBCURL_LIBS $DEPENDENCIES_LIBS $LIBS"
CFLAGS="$CFLAGS $PTHREAD_CFLAGS $CPPUNIT_CFLAGS $LIBCURL_CPPFLAGS $LIBCURL_CFLAGS $DEPENDENCIES_CFLAGS $CURSES_CFLAGS"
CXXFLAGS="$CXXFLAGS $PTHREAD_CFLAGS $CPPUNIT_CFLAGS $LIBCURL_CPPFLAGS $LIBCURL_CFLAGS $DEPENDENCIES_CFLAGS $CURSES_CFLAGS"
AC_OUTPUT([ AC_OUTPUT([
Makefile Makefile
doc/Makefile doc/Makefile
src/ui/root.cc
+2 -2
View File
@@ -71,8 +71,8 @@ Root::Root() :
m_windowInput(NULL), m_windowInput(NULL),
m_windowStatusbar(NULL), m_windowStatusbar(NULL),
m_input_history_length(99), m_input_history_length(99),
m_input_history_pointer_get(0), m_input_history_last_input(""),
m_input_history_last_input("") { m_input_history_pointer_get(0) {
// Initialise prefilled m_input_history and m_input_history_pointers objects. // Initialise prefilled m_input_history and m_input_history_pointers objects.
for (int type = ui::DownloadList::INPUT_LOAD_DEFAULT; type != ui::DownloadList::INPUT_EOI; type++) { for (int type = ui::DownloadList::INPUT_LOAD_DEFAULT; type != ui::DownloadList::INPUT_EOI; type++) {