diff --git a/CMakeLists.txt b/CMakeLists.txt index 5b229c1d6aec086cc752adb91ecf4d0a36585e11..65b2d63e03a6ae94f58bcbb2bd0277b5eeac1639 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -2,7 +2,7 @@ project(cellframe-sdk C) cmake_minimum_required(VERSION 3.0) set(CMAKE_C_STANDARD 11) -set(CELLFRAME_SDK_NATIVE_VERSION "2.9-30") +set(CELLFRAME_SDK_NATIVE_VERSION "2.9-31") add_definitions ("-DCELLFRAME_SDK_VERSION=\"${CELLFRAME_SDK_NATIVE_VERSION}\"") set(DAPSDK_MODULES "") message("Cellframe modules: ${CELLFRAME_MODULES}") diff --git a/modules/net/srv/CMakeLists.txt b/modules/net/srv/CMakeLists.txt index 70e34da69704e70015fa7b91f5c9d6f2292b6148..25282398a7c21a93efeaa7679ba3afb0dcb5a976 100644 --- a/modules/net/srv/CMakeLists.txt +++ b/modules/net/srv/CMakeLists.txt @@ -7,7 +7,11 @@ file(GLOB DAP_CHAIN_NET_SRV_HEADERS include/*.h libmaxminddb/*.h) add_library(${PROJECT_NAME} STATIC ${DAP_CHAIN_NET_SRV_SRCS} ${DAP_CHAIN_NET_SRV_HEADERS}) -target_link_libraries(dap_chain_net_srv dap_core dap_crypto dap_chain dap_chain_net dap_chain_wallet dap_modules_dynamic_cdb) +if (CELLFRAME_MODULES MATCHES "modules-dynamic") + target_link_libraries(dap_chain_net_srv dap_core dap_crypto dap_chain dap_chain_net dap_chain_wallet dap_modules_dynamic_cdb) +else() + target_link_libraries(dap_chain_net_srv dap_core dap_crypto dap_chain dap_chain_net dap_chain_wallet) +endif() target_include_directories(dap_chain_net_srv INTERFACE .) target_include_directories(${PROJECT_NAME} PUBLIC include) diff --git a/modules/net/srv/dap_chain_net_srv.c b/modules/net/srv/dap_chain_net_srv.c index abec2696aeb8f709f6f07f660ca55ec1b6846a14..2776ffc375fce58efb22973364bac68d1da3a12b 100644 --- a/modules/net/srv/dap_chain_net_srv.c +++ b/modules/net/srv/dap_chain_net_srv.c @@ -60,7 +60,9 @@ #include "dap_chain_net_srv.h" #include "dap_chain_net_srv_order.h" #include "dap_chain_net_srv_stream_session.h" +#ifdef DAP_MODULES_DYNAMIC #include "dap_modules_dynamic_cdb.h" +#endif #include "dap_chain_node_cli_cmd.h" @@ -530,7 +532,9 @@ static int s_cli_net_srv( int argc, char **argv, void *arg_func, char **a_str_re dap_string_append_printf( l_string_ret, "Missed some required params\n"); ret=-5; } - }else if( dap_strcmp( l_order_str, "recheck" ) == 0 ){ + } +#ifdef DAP_MODULES_DYNAMIC + else if( dap_strcmp( l_order_str, "recheck" ) == 0 ){ //int dap_chain_net_srv_vpn_cdb_server_list_check_orders(dap_chain_net_t *a_net); int (*dap_chain_net_srv_vpn_cdb_server_list_check_orders)(dap_chain_net_t *a_net); dap_chain_net_srv_vpn_cdb_server_list_check_orders = dap_modules_dynamic_get_cdb_func("dap_chain_net_srv_vpn_cdb_server_list_check_orders"); @@ -577,7 +581,9 @@ static int s_cli_net_srv( int argc, char **argv, void *arg_func, char **a_str_re dap_string_append(l_string_ret, "not found subcommand 'save' or 'delete'\n"); ret = -13; } - } else { + } +#endif + else { dap_string_append_printf(l_string_ret, "Unknown subcommand '%s'\n", l_order_str); ret = -3; }