Changeset 14436
- Timestamp:
- Jan 7, 2015, 2:04:08 AM (7 years ago)
- Location:
- trunk
- Files:
-
- 2 added
- 9 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/CMakeLists.txt
r14422 r14436 30 30 tr_auto_option(USE_SYSTEM_UTP "Use system utp library" AUTO) 31 31 tr_auto_option(USE_SYSTEM_B64 "Use system b64 library" AUTO) 32 tr_list_option(WITH_CRYPTO "Use specified crypto library" AUTO openssl cyassl) 32 33 tr_auto_option(WITH_INOTIFY "Enable inotify support (on systems that support it)" AUTO) 33 34 tr_auto_option(WITH_KQUEUE "Enable kqueue support (on systems that support it)" AUTO) … … 95 96 set(EVENT2_MINIMUM 2.0.10) 96 97 set(OPENSSL_MINIMUM 0.9.4) 98 set(CYASSL_MINIMUM 3.0) 97 99 set(ZLIB_MINIMUM 1.2.3) 98 100 set(GTK_MINIMUM 3.4.0) … … 135 137 if(UNIX) 136 138 find_package(ICONV REQUIRED) 139 endif() 140 141 if(WITH_CRYPTO STREQUAL "AUTO" OR WITH_CRYPTO STREQUAL "openssl") 142 tr_get_required_flag(WITH_CRYPTO OPENSSL_IS_REQUIRED) 143 find_package(OpenSSL ${OPENSSL_MINIMUM} ${OPENSSL_IS_REQUIRED}) 144 tr_fixup_list_option(WITH_CRYPTO "openssl" OPENSSL_FOUND "AUTO" OPENSSL_IS_REQUIRED) 145 if(WITH_CRYPTO STREQUAL "openssl") 146 set(CRYPTO_PKG "openssl") 147 set(CRYPTO_INCLUDE_DIRS ${OPENSSL_INCLUDE_DIR}) 148 set(CRYPTO_LIBRARIES ${OPENSSL_LIBRARIES}) 149 endif() 150 endif() 151 if(WITH_CRYPTO STREQUAL "AUTO" OR WITH_CRYPTO STREQUAL "cyassl") 152 tr_get_required_flag(WITH_CRYPTO CYASSL_IS_REQUIRED) 153 find_package(CyaSSL ${CYASSL_MINIMUM} ${CYASSL_IS_REQUIRED}) 154 tr_fixup_list_option(WITH_CRYPTO "cyassl" CYASSL_FOUND "AUTO" CYASSL_IS_REQUIRED) 155 if(WITH_CRYPTO STREQUAL "cyassl") 156 set(CRYPTO_PKG "cyassl") 157 set(CRYPTO_INCLUDE_DIRS ${CYASSL_INCLUDE_DIRS}) 158 set(CRYPTO_LIBRARIES ${CYASSL_LIBRARIES}) 159 endif() 160 endif() 161 # We should have found the library by now 162 if(CRYPTO_PKG STREQUAL "") 163 if(WITH_CRYPTO STREQUAL "AUTO") 164 message(FATAL_ERROR "Unable to find any supported crypto library.") 165 else() 166 message(FATAL_ERROR "Requested crypto library '${WITH_CRYPTO}' is not supported.") 167 endif() 137 168 endif() 138 169 -
trunk/cli/Makefile.am
r14422 r14436 3 3 AM_CFLAGS = \ 4 4 @LIBEVENT_CFLAGS@ \ 5 @OPENSSL_CFLAGS@ \6 5 @LIBCURL_CFLAGS@ \ 7 6 @ZLIB_CFLAGS@ \ … … 23 22 @LIBEVENT_LIBS@ \ 24 23 @LIBCURL_LIBS@ \ 25 @ OPENSSL_LIBS@ \24 @CRYPTO_LIBS@ \ 26 25 @INTLLIBS@ \ 27 26 @ZLIB_LIBS@ \ -
trunk/cmake/TrMacros.cmake
r14432 r14436 22 22 elseif(NOT (${ISREQ})) 23 23 set_property(CACHE ${NAME} PROPERTY VALUE OFF) 24 endif() 25 endmacro() 26 27 function(tr_list_option_changed NAME ACC VAL FIL STK) 28 get_property(VAR_STRINGS CACHE ${NAME} PROPERTY STRINGS) 29 string(TOUPPER "${VAL}" VAL_UPCASE) 30 foreach(X ${VAR_STRINGS}) 31 string(TOUPPER "${X}" X_UPCASE) 32 if("${VAL_UPCASE}" STREQUAL "${X_UPCASE}") 33 if(NOT "${VAL}" STREQUAL "${X}") 34 set_property(CACHE ${NAME} PROPERTY VALUE "${X}") 35 message(STATUS ">>> (list) ${NAME} -> ${X}") 36 endif() 37 return() 38 endif() 39 endforeach() 40 string(REPLACE ";" "', '" VAR_STRINGS "${VAR_STRINGS}") 41 message(FATAL_ERROR "Option '${NAME}' set to unrecognized value '${VAL}'. Should be one of '${VAR_STRINGS}'.") 42 endfunction() 43 44 macro(tr_list_option NAME DESC VAL) 45 set(${NAME} "${VAL}" CACHE STRING "${DESC}") 46 set_property(CACHE ${NAME} PROPERTY STRINGS "${VAL};${ARGN}") 47 variable_watch(${NAME} tr_list_option_changed) 48 endmacro() 49 50 macro(tr_fixup_list_option NAME FVAL ISFOUND RVAL ISREQ) 51 if(${ISFOUND}) 52 set_property(CACHE ${NAME} PROPERTY VALUE "${FVAL}") 53 elseif(NOT (${ISREQ})) 54 set_property(CACHE ${NAME} PROPERTY VALUE "${RVAL}") 24 55 endif() 25 56 endmacro() -
trunk/configure.ac
r14429 r14436 38 38 ## 39 39 ## 40 40 41 CURL_MINIMUM=7.15.4 41 42 AC_SUBST(CURL_MINIMUM) 42 43 LIBEVENT_MINIMUM=2.0.10 43 44 AC_SUBST(LIBEVENT_MINIMUM) 45 ZLIB_MINIMUM=1.2.3 46 AC_SUBST(ZLIB_MINIMUM) 47 48 # crypto backends 44 49 OPENSSL_MINIMUM=0.9.4 45 50 AC_SUBST(OPENSSL_MINIMUM) 46 ZLIB_MINIMUM=1.2.3 47 AC_SUBST( ZLIB_MINIMUM)51 CYASSL_MINIMUM=3.0 52 AC_SUBST(CYASSL_MINIMUM) 48 53 49 54 ## … … 113 118 AC_SEARCH_LIBS([gethostbyname], [nsl bind]) 114 119 AC_SEARCH_LIBS([quotacursor_skipidtype], [quota]) 115 PKG_CHECK_MODULES(OPENSSL, [openssl >= $OPENSSL_MINIMUM], , [CHECK_SSL()])116 120 PKG_CHECK_MODULES(LIBCURL, [libcurl >= $CURL_MINIMUM]) 117 121 PKG_CHECK_MODULES(LIBEVENT, [libevent >= $LIBEVENT_MINIMUM]) 118 122 PKG_CHECK_MODULES(ZLIB, [zlib >= $ZLIB_MINIMUM]) 123 124 125 AC_ARG_WITH([crypto], AS_HELP_STRING([--with-crypto=PKG], 126 [Use specified crypto library: auto (default), openssl, cyassl]), 127 [want_crypto=$withval], [want_crypto=auto]) 128 129 AS_IF([test "x$want_crypto" = "xauto" -o "x$want_crypto" = "xopenssl"], [ 130 PKG_CHECK_MODULES(OPENSSL, [openssl >= $OPENSSL_MINIMUM], 131 [want_crypto="openssl"; CRYPTO_PKG="openssl"; CRYPTO_CFLAGS="$OPENSSL_CFLAGS"; CRYPTO_LIBS="$OPENSSL_LIBS"], 132 [AS_IF([test "x$want_crypto" = "xopenssl"], 133 [AC_MSG_ERROR([OpenSSL support requested, but library not found.])] 134 )] 135 ) 136 ]) 137 AS_IF([test "x$want_crypto" = "xauto" -o "x$want_crypto" = "xcyassl"], [ 138 PKG_CHECK_MODULES(CYASSL, [cyassl >= $CYASSL_MINIMUM], 139 [want_crypto="cyassl"; CRYPTO_PKG="cyassl"; CRYPTO_CFLAGS="$CYASSL_CFLAGS"; CRYPTO_LIBS="$CYASSL_LIBS"], 140 [AS_IF([test "x$want_crypto" = "xcyassl"], 141 [AC_MSG_ERROR([CyaSSL support requested, but library not found.])] 142 )] 143 ) 144 ]) 145 # we should have found the library by now 146 AS_IF([test "x$CRYPTO_PKG" = "x"], [ 147 AS_IF([test "x$want_crypto" = "xauto"], 148 [AC_MSG_ERROR([Unable to find any supported crypto library.])], 149 [AC_MSG_ERROR([Requested crypto library "$want_crypto" is not supported.])], 150 ) 151 ]) 152 153 AC_SUBST(CRYPTO_PKG) 154 AC_SUBST(CRYPTO_CFLAGS) 155 AC_SUBST(CRYPTO_LIBS) 156 119 157 120 158 AC_SYS_LARGEFILE … … 620 658 * optimized for low-resource systems: ${enable_lightweight} 621 659 * µTP enabled: ${build_utp} 660 * crypto library: ${CRYPTO_PKG} 622 661 623 662 Build Command-Line client: ${build_cli} -
trunk/daemon/Makefile.am
r14422 r14436 3 3 AM_CFLAGS = \ 4 4 @LIBEVENT_CFLAGS@ \ 5 @OPENSSL_CFLAGS@ \6 5 @LIBCURL_CFLAGS@ \ 7 6 @SYSTEMD_DAEMON_CFLAGS@ \ … … 29 28 @LIBEVENT_LIBS@ \ 30 29 @LIBCURL_LIBS@ \ 31 @ OPENSSL_LIBS@ \30 @CRYPTO_LIBS@ \ 32 31 @INTLLIBS@ \ 33 32 @SYSTEMD_DAEMON_LIBS@ \ -
trunk/gtk/Makefile.am
r14428 r14436 22 22 @GTK_CFLAGS@ \ 23 23 @LIBCURL_CFLAGS@ \ 24 @OPENSSL_CFLAGS@ \25 24 @ZLIB_CFLAGS@ \ 26 25 @PTHREAD_CFLAGS@ … … 96 95 @LIBEVENT_LIBS@ \ 97 96 @LIBCURL_LIBS@ \ 98 @ OPENSSL_LIBS@ \97 @CRYPTO_LIBS@ \ 99 98 @ZLIB_LIBS@ \ 100 99 @PTHREAD_LIBS@ \ -
trunk/libtransmission/CMakeLists.txt
r14429 r14436 17 17 crypto-utils.c 18 18 crypto-utils-fallback.c 19 crypto-utils- openssl.c19 crypto-utils-${CRYPTO_PKG}.c 20 20 error.c 21 21 fdlimit.c … … 168 168 ${PROJECT_BINARY_DIR} 169 169 ${ZLIB_INCLUDE_DIRS} 170 ${ OPENSSL_INCLUDE_DIRS}170 ${CRYPTO_INCLUDE_DIRS} 171 171 ${CURL_INCLUDE_DIRS} 172 172 ${ICONV_INCLUDE_DIRS} … … 201 201 ${CMAKE_THREAD_LIBS_INIT} 202 202 ${ZLIB_LIBRARIES} 203 ${ OPENSSL_LIBRARIES}203 ${CRYPTO_LIBRARIES} 204 204 ${CURL_LIBRARIES} 205 205 ${ICONV_LIBRARIES} -
trunk/libtransmission/Makefile.am
r14422 r14436 12 12 @LIBEVENT_CFLAGS@ \ 13 13 @LIBCURL_CFLAGS@ \ 14 @ OPENSSL_CFLAGS@ \14 @CRYPTO_CFLAGS@ \ 15 15 @PTHREAD_CFLAGS@ \ 16 16 @ZLIB_CFLAGS@ … … 179 179 @LIBCURL_LIBS@ \ 180 180 @LIBEVENT_LIBS@ \ 181 @ OPENSSL_LIBS@ \181 @CRYPTO_LIBS@ \ 182 182 @PTHREAD_LIBS@ \ 183 183 @ZLIB_LIBS@ \ -
trunk/utils/Makefile.am
r14422 r14436 4 4 @LIBEVENT_CFLAGS@ \ 5 5 @LIBCURL_CFLAGS@ \ 6 @OPENSSL_CFLAGS@ \7 6 @ZLIB_CFLAGS@ \ 8 7 @PTHREAD_CFLAGS@ \ … … 36 35 @LIBEVENT_LIBS@ \ 37 36 @LIBCURL_LIBS@ \ 38 @ OPENSSL_LIBS@ \37 @CRYPTO_LIBS@ \ 39 38 @ZLIB_LIBS@ \ 40 39 @PTHREAD_LIBS@ \
Note: See TracChangeset
for help on using the changeset viewer.