1
0
mirror of https://github.com/nmap/nmap.git synced 2025-12-09 22:21:29 +00:00

Show which libraries are the ones included with Nmap and which are from

the system by prefixing "nmap-" to the former in -V output. Patch by
Ambarisha B.

Hard-code the included/non-included libraries in nmap_winconfig.h:
This commit is contained in:
david
2011-02-24 21:06:59 +00:00
parent 61543b681e
commit c4cda67b99
5 changed files with 35 additions and 2 deletions

16
nmap.cc
View File

@@ -2854,7 +2854,11 @@ static void display_nmap_version() {
unsigned int i;
#ifndef NOLUA
#ifdef LUA_INCLUDED
with.push_back(std::string("nmap-liblua-") + get_word_or_quote(LUA_RELEASE, 1));
#else
with.push_back(std::string("liblua-") + get_word_or_quote(LUA_RELEASE, 1));
#endif
#else
without.push_back("liblua");
#endif
@@ -2865,11 +2869,23 @@ static void display_nmap_version() {
without.push_back("openssl");
#endif
#ifdef PCRE_INCLUDED
with.push_back(std::string("nmap-libpcre-") + get_word_or_quote(pcre_version(), 0));
#else
with.push_back(std::string("libpcre-") + get_word_or_quote(pcre_version(), 0));
#endif
#ifdef PCAP_INCLUDED
with.push_back(std::string("nmap-libpcap-") + get_word_or_quote(pcap_lib_version(), 2));
#else
with.push_back(std::string("libpcap-") + get_word_or_quote(pcap_lib_version(), 2));
#endif
#ifdef DNET_INCLUDED
with.push_back(std::string("nmap-libdnet-") + DNET_VERSION);
#else
with.push_back(std::string("libdnet-") + DNET_VERSION);
#endif
#if HAVE_IPV6
with.push_back("ipv6");