Lab
/
libuhttpd
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

build: Check if libdl exists in the system 

Signed-off-by: Jianhui Zhao <zhaojh329@gmail.com>
main
Jianhui Zhao 2020-04-05 00:47:29 +08:00
parent df0610c1f6
commit ac25a305fe
2 changed files with 20 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/CMakeLists.txt
View File

@ -8,10 +8,18 @@ set(UHTTPD_VERSION_PATCH 1)
# Check the third party Libraries # Check the third party Libraries
find_package(Libev REQUIRED) find_package(Libev REQUIRED)
find_library(LIBDL dl)
include_directories(${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/buffer ${CMAKE_CURRENT_BINARY_DIR} ${LIBEV_INCLUDE_DIR}) include_directories(${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/buffer ${CMAKE_CURRENT_BINARY_DIR} ${LIBEV_INCLUDE_DIR})
set(EXTRA_LIBS ${LIBEV_LIBRARY} dl m) set(EXTRA_LIBS ${LIBEV_LIBRARY} m)
if(NOT ${LIBDL} STREQUAL "LIBDL-NOTFOUND")
message(STATUS "Found Libdl: ${LIBDL}")
list(APPEND EXTRA_LIBS ${LIBDL})
add_definitions(-DHAVE_DLOPEN)
endif()
set(SOURCE_FILES uhttpd.c log.c connection.c buffer/buffer.c http-parser/http_parser.c ssl.c) set(SOURCE_FILES uhttpd.c log.c connection.c buffer/buffer.c http-parser/http_parser.c ssl.c)
set(UHTTPD_SSL_SUPPORT_CONFIG 1) set(UHTTPD_SSL_SUPPORT_CONFIG 1)
@ -100,7 +108,9 @@ target_link_libraries(uhttpd_s ${EXTRA_LIBS})
# configure a header file to pass some of the CMake settings to the source code # configure a header file to pass some of the CMake settings to the source code
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/config.h.in ${CMAKE_CURRENT_BINARY_DIR}/config.h) configure_file(${CMAKE_CURRENT_SOURCE_DIR}/config.h.in ${CMAKE_CURRENT_BINARY_DIR}/config.h)
add_subdirectory(plugins) if(NOT ${LIBDL} STREQUAL "LIBDL-NOTFOUND")
add_subdirectory(plugins)
endif()
install( install(
FILES FILES

9
src/uhttpd.c
View File

@ -26,9 +26,11 @@
#include <string.h> #include <string.h>
#include <unistd.h> #include <unistd.h>
#include <errno.h> #include <errno.h>
#include <dlfcn.h>
#include <arpa/inet.h> #include <arpa/inet.h>
#include <sys/socket.h> #include <sys/socket.h>
#ifdef HAVE_DLOPEN
#include <dlfcn.h>
#endif
#include "uhttpd.h" #include "uhttpd.h"
#include "utils.h" #include "utils.h"
@ -113,6 +115,7 @@ static int uh_server_ssl_init(struct uh_server *srv, const char *cert, const cha
static int uh_load_plugin(struct uh_server *srv, const char *path) static int uh_load_plugin(struct uh_server *srv, const char *path)
{ {
#ifdef HAVE_DLOPEN
struct uh_plugin *p; struct uh_plugin *p;
void *dlh; void *dlh;
@ -143,6 +146,10 @@ static int uh_load_plugin(struct uh_server *srv, const char *path)
srv->plugins = p; srv->plugins = p;
return 0; return 0;
#else
uh_log_err("Not support plugin\n");
return -1;
#endif
} }
int uh_server_init(struct uh_server *srv, struct ev_loop *loop, const char *host, int port) int uh_server_init(struct uh_server *srv, struct ev_loop *loop, const char *host, int port)