Merge branch 'feature/CELIX-229-Make_APR_optional' into develop
Project: http://git-wip-us.apache.org/repos/asf/celix/repo Commit: http://git-wip-us.apache.org/repos/asf/celix/commit/b3271bca Tree: http://git-wip-us.apache.org/repos/asf/celix/tree/b3271bca Diff: http://git-wip-us.apache.org/repos/asf/celix/diff/b3271bca Branch: refs/heads/develop Commit: b3271bcad4834b8deef2dd4c1250b80b9476c963 Parents: b577cce 6ac240b Author: Alexander Broekhuis <[email protected]> Authored: Fri Mar 27 12:20:54 2015 +0100 Committer: Alexander Broekhuis <[email protected]> Committed: Fri Mar 27 12:20:54 2015 +0100 ---------------------------------------------------------------------- CMakeLists.txt | 10 ++ cmake/CMakeCelix.cmake | 5 +- config.h.in | 31 ++++++ .../private/src/dm_service_dependency.c | 1 + event_admin/CMakeLists.txt | 3 + examples/embedding/CMakeLists.txt | 5 + .../chapter04-paint-example/CMakeLists.txt | 3 + framework/CMakeLists.txt | 7 +- .../private/include/bundle_context_private.h | 2 + framework/private/include/framework_private.h | 2 + framework/private/src/bundle_context.c | 8 ++ framework/private/src/framework.c | 14 +++ framework/public/include/bundle_context.h | 6 + framework/public/include/framework.h | 8 +- launcher/private/src/launcher.c | 110 ++++++++++--------- log_service/private/src/log_entry.c | 1 + log_service/private/src/log_service_activator.c | 1 + scr/CMakeLists.txt | 5 +- shell/private/src/log_command.c | 1 + shell_bonjour/CMakeLists.txt | 10 +- 20 files changed, 170 insertions(+), 63 deletions(-) ----------------------------------------------------------------------
