aboutsummaryrefslogtreecommitdiffstats
path: root/epan/epan.c
diff options
context:
space:
mode:
authorGerald Combs <gerald@wireshark.org>2019-11-22 11:16:36 -0800
committerGerald Combs <gerald@wireshark.org>2019-11-23 22:45:59 +0000
commit451a241e50bd34ba097bd09a5f9f673170779aaf (patch)
treecd112515a1ddcd15fb73b1d124e7223d27b1988c /epan/epan.c
parent6a0b558ac1da13fffec560c1a522bafbe95517a1 (diff)
Add c-ares to the required library list.
Although c-ares support was techically optional, it was either on by default or required in all of our packaging. Go ahead and require it globally. C-ares is widely available and synchronous name resolution can easily result in a horrific user experience. Change-Id: Id67c797316ed6b8a0ab5052e55a43a1b9e2a2464 Reviewed-on: https://code.wireshark.org/review/35188 Petri-Dish: Gerald Combs <gerald@wireshark.org> Reviewed-by: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot Reviewed-by: Gerald Combs <gerald@wireshark.org>
Diffstat (limited to 'epan/epan.c')
-rw-r--r--epan/epan.c6
1 files changed, 0 insertions, 6 deletions
diff --git a/epan/epan.c b/epan/epan.c
index 2c0d1d58a1..77cd9c466e 100644
--- a/epan/epan.c
+++ b/epan/epan.c
@@ -72,9 +72,7 @@
#include <smi.h>
#endif
-#ifdef HAVE_C_ARES
#include <ares_version.h>
-#endif
#ifdef HAVE_NGHTTP2
#include <nghttp2/nghttp2ver.h>
@@ -745,11 +743,7 @@ epan_get_compiled_version_info(GString *str)
/* c-ares */
g_string_append(str, ", ");
-#ifdef HAVE_C_ARES
g_string_append(str, "with c-ares " ARES_VERSION_STR);
-#else
- g_string_append(str, "without c-ares");
-#endif /* HAVE_C_ARES */
/* LUA */
g_string_append(str, ", ");