applied patch from #328
This commit is contained in:
parent
16a8aa88e8
commit
8bcc275f1b
13
configure.in
13
configure.in
|
@ -112,6 +112,8 @@ AC_ARG_WITH(
|
|||
[[logging=$withval]],
|
||||
[[logging=none]]
|
||||
)
|
||||
|
||||
COMPILETIME_OPTIONS=""
|
||||
dnl Check the value for the --with-logging switch
|
||||
AC_MSG_CHECKING([what form of logging to use])
|
||||
case "$logging" in
|
||||
|
@ -121,10 +123,12 @@ case "$logging" in
|
|||
"default")
|
||||
AC_MSG_RESULT(default)
|
||||
AC_DEFINE(TORRENT_LOGGING,,[define to use some logging])
|
||||
COMPILETIME_OPTIONS+="-DTORRENT_LOGGING "
|
||||
;;
|
||||
"verbose")
|
||||
AC_MSG_RESULT(verbose)
|
||||
AC_DEFINE(TORRENT_VERBOSE_LOGGING,,[define to use verbose logging])
|
||||
COMPILETIME_OPTIONS+="-DTORRENT_VERBOSE_LOGGING "
|
||||
;;
|
||||
*)
|
||||
AC_MSG_RESULT()
|
||||
|
@ -148,10 +152,12 @@ case "$dht" in
|
|||
"off")
|
||||
AC_MSG_RESULT(off)
|
||||
AC_DEFINE(TORRENT_DISABLE_DHT,,[define not to use DHT support])
|
||||
COMPILETIME_OPTIONS+="-DTORRENT_DISABLE_DHT "
|
||||
;;
|
||||
"logging")
|
||||
AC_MSG_RESULT(logging)
|
||||
AC_DEFINE(TORRENT_DHT_VERBOSE_LOGGING,,[define to use DHT support with extra logging])
|
||||
COMPILETIME_OPTIONS+="-DTORRENT_DHT_VERBOSE_LOGGING "
|
||||
;;
|
||||
*)
|
||||
AC_MSG_RESULT()
|
||||
|
@ -175,11 +181,13 @@ case "$encryption" in
|
|||
AC_MSG_RESULT(on)
|
||||
CHECK_SSL()
|
||||
AC_DEFINE(TORRENT_USE_OPENSSL,,[define to use openssl with libtorrent])
|
||||
COMPILETIME_OPTIONS+="-DTORRENT_USE_OPENSSL "
|
||||
|
||||
;;
|
||||
"off")
|
||||
AC_MSG_RESULT(off)
|
||||
AC_DEFINE(TORRENT_DISABLE_ENCRYPTION,,[define not to use encryption support])
|
||||
COMPILETIME_OPTIONS+="-DTORRENT_DISABLE_ENCRYPTION "
|
||||
;;
|
||||
*)
|
||||
AC_MSG_RESULT()
|
||||
|
@ -283,9 +291,11 @@ AC_ARG_ENABLE(
|
|||
no)
|
||||
AC_DEFINE(NDEBUG,,[Define to disable debugging])
|
||||
DEBUGFLAGS=""
|
||||
COMPILETIME_OPTIONS+="-DNDEBUG "
|
||||
;;
|
||||
yes)
|
||||
DEBUGFLAGS="-g"
|
||||
COMPILETIME_OPTIONS+="-DLT_DEBUG "
|
||||
;;
|
||||
*)
|
||||
DEBUGFLAGS="$enableval"
|
||||
|
@ -296,6 +306,9 @@ AC_ARG_ENABLE(
|
|||
)
|
||||
AC_SUBST(DEBUGFLAGS)
|
||||
|
||||
dnl Compile time options.
|
||||
AC_SUBST(COMPILETIME_OPTIONS)
|
||||
|
||||
AC_CONFIG_FILES(Makefile src/Makefile include/Makefile test/Makefile libtorrent.pc)
|
||||
if [[ "x$examples" == "xyes" ]]; then
|
||||
AC_CONFIG_FILES(examples/Makefile)
|
||||
|
|
|
@ -12,5 +12,5 @@ Name: libtorrent
|
|||
Description: Bittorrent library.
|
||||
Version: @VERSION@
|
||||
Libs: -L${libdir} -ltorrent
|
||||
Libs.private: @LIBS@ -l@BOOST_IOSTREAMS_LIB@ -l@BOOST_DATE_TIME_LIB@ -l@BOOST_FILESYSTEM_LIB@ -l@BOOST_THREAD_LIB@ @PTHREAD_LIBS@ @SSL_LIBS@
|
||||
Cflags: -I${includedir} -I${includedir}/libtorrent @CPPFLAGS@
|
||||
Libs.private: @LIBS@ @BOOST_IOSTREAMS_LIB@ @BOOST_DATE_TIME_LIB@ @BOOST_FILESYSTEM_LIB@ @BOOST_THREAD_LIB@ @PTHREAD_LIBS@ @SSL_LIBS@
|
||||
Cflags: -I${includedir} -I${includedir}/libtorrent @COMPILETIME_OPTIONS@ @CPPFLAGS@
|
||||
|
|
Loading…
Reference in New Issue