diff options
| author | Hans Dedecker | 2017-03-16 20:17:24 +0000 |
|---|---|---|
| committer | Hans Dedecker | 2017-03-16 20:33:23 +0000 |
| commit | 7e0d8b8e9f18135adc444a30a58c3c75dd722a33 (patch) | |
| tree | 4e4d523868676e45f58e10c7f3de0ed445ef83f1 | |
| parent | c69555cadd74d50fb88f00c3aac43dd2dc59d1f1 (diff) | |
| download | odhcp6c-7e0d8b8e9f18135adc444a30a58c3c75dd722a33.tar.gz | |
CMakeLists: don't enable libubox md5 implementation by default
Simplify odhcp6c standalone compilation by selecting local md5
implementation by default
Signed-off-by: Hans Dedecker <dedeckeh@gmail.com>
| -rw-r--r-- | CMakeLists.txt | 16 | ||||
| -rw-r--r-- | README | 2 | ||||
| -rw-r--r-- | src/dhcpv6.c | 2 |
3 files changed, 12 insertions, 8 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 745fba2..a5b0cb3 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -5,7 +5,6 @@ cmake_policy(SET CMP0015 NEW) project(odhcp6c C) set(CMAKE_SHARED_LIBRARY_LINK_C_FLAGS "") set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -g -std=c99") -set(LIBUBOX 1 CACHE BOOL "Link with libubox") add_definitions(-D_GNU_SOURCE -Wall -Werror -Wextra -pedantic) if(${EXT_PREFIX_CLASS}) @@ -17,15 +16,20 @@ if(${EXT_CER_ID}) endif(${EXT_CER_ID}) set(SOURCES src/odhcp6c.c src/dhcpv6.c src/ra.c src/script.c) -if(LIBUBOX EQUAL 0) - set(SOURCES ${SOURCES} src/md5.c) -endif() -add_executable(odhcp6c ${SOURCES}) set(LIBRARIES resolv) -if(LIBUBOX EQUAL 1) + +if(USE_LIBUBOX) + add_definitions(-DUSE_LIBUBOX) set(LIBRARIES ${LIBRARIES} ubox) + FIND_PATH(ubox_include_dir libubox/md5.h) + INCLUDE_DIRECTORIES(${ubox_include_dir}) +else() + set(SOURCES ${SOURCES} src/md5.c) endif() + +add_executable(odhcp6c ${SOURCES}) + target_link_libraries(odhcp6c ${LIBRARIES}) # Installation @@ -39,7 +39,7 @@ especially routers. It compiles to only about 35 KB (-Os -s). ** Compiling ** odhcp6c uses cmake: -* To prepare a Makefile use: "cmake -DLIBUBOX=0 ." +* To prepare a Makefile use: "cmake ." * To build / install use: "make" / "make install" afterwards. * To build DEB or RPM packages use: "make package" afterwards. diff --git a/src/dhcpv6.c b/src/dhcpv6.c index 30bfa50..b732257 100644 --- a/src/dhcpv6.c +++ b/src/dhcpv6.c @@ -36,7 +36,7 @@ #include <net/ethernet.h> #include "odhcp6c.h" -#ifdef LIBUBOX +#ifdef USE_LIBUBOX #include <libubox/md5.h> #else #include "md5.h" |