commit 53691be487b0c35812f3c6ad2005d4405f117720
author Radek Krejci <rkrejci@cesnet.cz> Mon Feb 22 13:58:37 2016 +0100
committer Radek Krejci <rkrejci@cesnet.cz> Mon Feb 22 13:58:37 2016 +0100
tree f80df9f81356a06603af3185b3f484721a6abe04
parent c5c52136e89ec4cf5497fb806dfb8cc2ca3967a0

build CHANGE rename too generic macros to libnetconf specific

ENABLE_TLS and ENABLE_SSH are too generic to be used as symbols
exported via header files to the user applications. Therefore the
symbols were renamed to NC_ENABLED_SSH and NC_ENABLED_TLS.

CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index c931fa6..4caf487 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -60,14 +60,14 @@
     set(libsrc ${libsrc}
         src/session_client_ssh.c
         src/session_server_ssh.c)
-    set(SSH_MACRO "#ifndef ENABLE_SSH\n#define ENABLE_SSH\n#endif")
+    set(SSH_MACRO "#ifndef NC_ENABLED_SSH\n#define NC_ENABLED_SSH\n#endif")
 endif()
 
 if(ENABLE_TLS)
     set(libsrc ${libsrc}
         src/session_client_tls.c
         src/session_server_tls.c)
-    set(TLS_MACRO "#ifndef ENABLE_TLS\n#define ENABLE_TLS\n#endif")
+    set(TLS_MACRO "#ifndef NC_ENABLED_TLS\n#define NC_ENABLED_TLS\n#endif")
 endif()
 
 set(headers
@@ -101,7 +101,7 @@
 # dependencies - libssh
 if(ENABLE_SSH)
     find_package(LibSSH 0.6.4 REQUIRED)
-    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DENABLE_SSH ${LIBSSH_DEFINITIONS}")
+    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DNC_ENABLED_SSH ${LIBSSH_DEFINITIONS}")
     target_link_libraries(netconf2 ${LIBSSH_LIBRARIES} -lssh_threads -lcrypt)
     include_directories(${LIBSSH_INCLUDE_DIRS})
 endif()
@@ -110,7 +110,7 @@
 if(ENABLE_TLS OR ENABLE_DNSSEC)
     find_package(OpenSSL REQUIRED)
     if (ENABLE_TLS)
-        set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DENABLE_TLS")
+        set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DNC_ENABLED_TLS")
     endif()
     target_link_libraries(netconf2 ${OPENSSL_LIBRARIES})
     include_directories(${OPENSSL_INCLUDE_DIR})