From 4879c6cffa27fa4e98f3bf2ae7328bb9f929e83f Mon Sep 17 00:00:00 2001 From: Bill Hoffman Date: Fri, 26 Apr 2002 09:35:03 -0400 Subject: ENH: look for nslookup and hostname in the right places --- Source/cmSiteNameCommand.cxx | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/Source/cmSiteNameCommand.cxx b/Source/cmSiteNameCommand.cxx index 5a66a9f..d4adc1a 100644 --- a/Source/cmSiteNameCommand.cxx +++ b/Source/cmSiteNameCommand.cxx @@ -24,7 +24,14 @@ bool cmSiteNameCommand::InitialPass(std::vector const& args) this->SetError("called with incorrect number of arguments"); return false; } - + std::vector paths; + paths.push_back("/usr/bsd"); + paths.push_back("/usr/sbin"); + paths.push_back("/usr/bin"); + paths.push_back("/bin"); + paths.push_back("/sbin"); + paths.push_back("/usr/local/bin"); + const char* cacheValue = m_Makefile->GetDefinition(args[0].c_str()); if(cacheValue) @@ -40,7 +47,7 @@ bool cmSiteNameCommand::InitialPass(std::vector const& args) } else { - hostname_cmd = cmSystemTools::FindProgram("hostname"); + hostname_cmd = cmSystemTools::FindProgram("hostname", paths); } std::string siteName = "unknown"; @@ -84,7 +91,7 @@ bool cmSiteNameCommand::InitialPass(std::vector const& args) } else { - nslookup_cmd = cmSystemTools::FindProgram("nslookup"); + nslookup_cmd = cmSystemTools::FindProgram("nslookup", paths); } // try to find the domain name for this computer -- cgit v0.12