diff options
| author | João Valverde <joao.valverde@tecnico.ulisboa.pt> | 2016-03-16 22:11:17 +0000 |
|---|---|---|
| committer | João Valverde <j@v6e.pt> | 2016-03-21 19:32:00 +0000 |
| commit | 7a1d3f67ac83e12645a91b5329b6e8163954f77e (patch) | |
| tree | a59e3f5c90c2686f3f501dc6d2b12872d9735598 /CMakeLists.txt | |
| parent | 52dd4fb6330a10ed37b8e221c502b5a98de4f581 (diff) | |
Remove ADNS support
Relevant mailing list message:
https://www.wireshark.org/lists/wireshark-dev/201503/msg00007.html
Change-Id: I0cff6d4d64fb52a651bcf6b28c183e43653b1cc2
Reviewed-on: https://code.wireshark.org/review/14519
Reviewed-by: João Valverde <j@v6e.pt>
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 16 |
1 files changed, 4 insertions, 12 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index f609b8e045..caa319d6b9 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -741,11 +741,9 @@ if(ENABLE_PORTAUDIO AND BUILD_wireshark_gtk) endif() -# Prefer c-ares over adns -if(ENABLE_CARES) # C Asynchronouse resolver +# C Asynchronous resolver +if(ENABLE_CARES) set(PACKAGELIST ${PACKAGELIST} CARES) -elseif(ENABLE_ADNS) # Gnu asynchronous DNS - set(PACKAGELIST ${PACKAGELIST} ADNS) endif() # Zlib compression @@ -881,12 +879,9 @@ endif() if(HAVE_LIBCARES) set(HAVE_C_ARES 1) endif() -if(HAVE_LIBADNS) - set(HAVE_GNU_ADNS 1) -endif() -if(NOT HAVE_LIBCARES AND NOT HAVE_LIBADNS) +if(NOT HAVE_LIBCARES) # We should make this an error at some point. - message(WARNING "Not using c-ares or ADNS.") + message(WARNING "Not using c-ares.") message(WARNING "Synchronous name resolution can seriously degrade performance.") endif() if(HAVE_LIBNL AND HAVE_AIRPCAP) @@ -1183,7 +1178,6 @@ set( plugindir "\${libdir}/wireshark/plugins/${CPACK_PACKAGE_VERSION}" ) set(ICON_PATH "${CMAKE_SOURCE_DIR}/image/") set( IN_FILES - adns_dll.rc capchild/doxygen.cfg.in caputils/doxygen.cfg.in doxygen.cfg.in @@ -1361,7 +1355,6 @@ set(LIBEPAN_LIBS ${AIRPCAP_LIBRARIES} ${PCAP_LIBRARIES} ${CARES_LIBRARIES} - ${ADNS_LIBRARIES} ${KERBEROS_LIBRARIES} ${LUA_LIBRARIES} ${PYTHON_LIBRARIES} @@ -2136,7 +2129,6 @@ if(BUILD_randpkt) # @SOCKET_LIBS@ # @NSL_LIBS@ ${CARES_LIBRARIES} - ${ADNS_LIBRARIES} ${ZLIB_LIBRARIES} ) set(randpkt_FILES |