CERBERUS/nmap
1
0
Fork 0
mirror of https://github.com/nmap/nmap.git synced 2026-05-13 16:57:06 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Show nmap- prefix for included libssh2 and libz

Browse source
This commit is contained in:
dmiller 2017-07-29 19:42:47 +00:00
parent 01d4a1563d
commit 17bcd4c4fc
2 changed files with 10 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

8
nmap.cc
View file

@ -2843,13 +2843,21 @@ static void display_nmap_version() {
#endif
#if HAVE_LIBSSH2
#ifdef LIBSSH2_INCLUDED
with.push_back(std::string("nmap-libssh2-") + get_word_or_quote(LIBSSH2_VERSION_TEXT, 1));
#else
with.push_back(std::string("libssh2-") + get_word_or_quote(LIBSSH2_VERSION_TEXT, 1));
#endif
#else
without.push_back("libssh2");
#endif
#if HAVE_LIBZ_V
#ifdef ZLIB_INCLUDED
with.push_back(std::string("nmap-libz-") + get_word_or_quote(LIBZ_VERSION_TEXT, 1));
#else
with.push_back(std::string("libz-") + get_word_or_quote(LIBZ_VERSION_TEXT, 1));
#endif
#else
without.push_back("libz");
#endif

2
nmap_config.h.in
View file

@ -238,6 +238,8 @@ extern "C" int gethostname (char *, unsigned int);
#undef PCAP_INCLUDED
#undef DNET_INCLUDED
#undef PCRE_INCLUDED
#undef LIBSSH2_INCLUDED
#undef ZLIB_INCLUDED
#undef DEC
#undef LINUX