The branch, master has been updated via b9f25b7 Bump version to 1.1.2. via 2924b90 cmake: Fix ns_name_compress detection. from dbb889b Bump version to 1.1.1.
https://git.samba.org/?p=resolv_wrapper.git;a=shortlog;h=master - Log ----------------------------------------------------------------- commit b9f25b75571cb26eb927d3ba26632fce81cbbd26 Author: Andreas Schneider <a...@samba.org> Date: Tue Jan 13 11:39:13 2015 +0100 Bump version to 1.1.2. commit 2924b90ea6ceea662410d42ed0c293c1cbbf4f45 Author: Andreas Schneider <a...@samba.org> Date: Tue Jan 13 11:37:31 2015 +0100 cmake: Fix ns_name_compress detection. On some platforms it is a macro and not a function. So we need to check if the macro exists. Signed-off-by: Andreas Schneider <a...@samba.org> ----------------------------------------------------------------------- Summary of changes: CMakeLists.txt | 8 +++++--- ChangeLog | 3 +++ ConfigureChecks.cmake | 2 +- 3 files changed, 9 insertions(+), 4 deletions(-) Changeset truncated at 500 lines: diff --git a/CMakeLists.txt b/CMakeLists.txt index 3e7ae6a..0d1947f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -8,7 +8,7 @@ set(APPLICATION_NAME ${PROJECT_NAME}) set(APPLICATION_VERSION_MAJOR "1") set(APPLICATION_VERSION_MINOR "1") -set(APPLICATION_VERSION_PATCH "1") +set(APPLICATION_VERSION_PATCH "2") set(APPLICATION_VERSION "${APPLICATION_VERSION_MAJOR}.${APPLICATION_VERSION_MINOR}.${APPLICATION_VERSION_PATCH}") @@ -19,7 +19,7 @@ set(APPLICATION_VERSION "${APPLICATION_VERSION_MAJOR}.${APPLICATION_VERSION_MINO # Increment AGE. Set REVISION to 0 # If the source code was changed, but there were no interface changes: # Increment REVISION. -set(LIBRARY_VERSION "0.0.2") +set(LIBRARY_VERSION "0.0.3") set(LIBRARY_SOVERSION "0") # where to look first for cmake modules, before ${CMAKE_ROOT}/Modules/ is checked @@ -30,7 +30,6 @@ set(CMAKE_MODULE_PATH # add definitions include(DefineCMakeDefaults) include(DefinePlatformDefaults) -include(DefineCompilerFlags) include(DefineInstallationPaths) include(DefineOptions.cmake) include(CPackConfig.cmake) @@ -47,6 +46,9 @@ find_package(Threads) include(ConfigureChecks.cmake) configure_file(config.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config.h) +# Add compiler flags for the project now. +include(DefineCompilerFlags) + # check subdirectories add_subdirectory(src) diff --git a/ChangeLog b/ChangeLog index 55a9d9d..071b5f3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,9 @@ ChangeLog ========== +version 1.1.2 (released 2015-01-13) + * Fix detection for ns_name_compress. + version 1.1.1 (released 2015-01-12) * Fixed building on older Linux distributions. * Fix a possible segfault. diff --git a/ConfigureChecks.cmake b/ConfigureChecks.cmake index a68959f..be2f04c 100644 --- a/ConfigureChecks.cmake +++ b/ConfigureChecks.cmake @@ -94,7 +94,7 @@ check_function_exists(__res_search HAVE___RES_SEARCH) check_function_exists(res_nsearch HAVE_RES_NSEARCH) check_function_exists(__res_nsearch HAVE___RES_NSEARCH) -check_function_exists(ns_name_compress HAVE_NS_NAME_COMPRESS) +check_symbol_exists(ns_name_compress "sys/types.h;arpa/nameser.h" HAVE_NS_NAME_COMPRESS) if (UNIX) if (NOT LINUX) -- Resolv Wrapper Repository