From 805773663e3f88d1e56d7eb61df7784da43b344d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Marjam=C3=A4ki?= <danielm77@spray.se>
Date: Mon, 14 Feb 2011 19:37:58 +0100
Subject: [PATCH] Build: Renamed HAVE_DEPENDENCIES to HAVE_RULES

---
 Makefile              | 2 +-
 cli/cmdlineparser.cpp | 4 ++--
 lib/cppcheck.cpp      | 4 ++--
 tools/dmake.cpp       | 4 ++--
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/Makefile b/Makefile
index 6dfbe39d4..d5fe8b8a2 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
 # This file is generated by tools/dmake, do not edit.
 
 ifndef CXXFLAGS
-    CXXFLAGS=-DHAVE_DEPENDENCIES -Wall -Wextra -Wshadow -pedantic -Wno-long-long -Wfloat-equal -Wcast-qual -Wsign-conversion -g
+    CXXFLAGS=-DHAVE_RULES -Wall -Wextra -Wshadow -pedantic -Wno-long-long -Wfloat-equal -Wcast-qual -Wsign-conversion -g
 endif
 
 ifndef CXX
diff --git a/cli/cmdlineparser.cpp b/cli/cmdlineparser.cpp
index d8f61bab5..428d6a2ae 100644
--- a/cli/cmdlineparser.cpp
+++ b/cli/cmdlineparser.cpp
@@ -28,7 +28,7 @@
 #include "path.h"
 #include "filelister.h"
 
-#ifdef HAVE_DEPENDENCIES
+#ifdef HAVE_RULES
 // xml is used in rules
 #include <tinyxml.h>
 #endif
@@ -505,7 +505,7 @@ bool CmdLineParser::ParseFromArgs(int argc, const char* const argv[])
                 _settings->_showtime = SHOWTIME_NONE;
         }
 
-#ifdef HAVE_DEPENDENCIES
+#ifdef HAVE_RULES
         // Rule given at command line
         else if (strncmp(argv[i], "--rule=", 7) == 0)
         {
diff --git a/lib/cppcheck.cpp b/lib/cppcheck.cpp
index 9f3d81320..494feac58 100644
--- a/lib/cppcheck.cpp
+++ b/lib/cppcheck.cpp
@@ -30,7 +30,7 @@
 #include <ctime>
 #include "timer.h"
 
-#ifdef HAVE_DEPENDENCIES
+#ifdef HAVE_RULES
 #define PCRE_STATIC
 #include <pcre.h>
 #endif
@@ -309,7 +309,7 @@ void CppCheck::checkFile(const std::string &code, const char FileName[])
         (*it)->runSimplifiedChecks(&_tokenizer, &_settings, this);
     }
 
-#ifdef HAVE_DEPENDENCIES
+#ifdef HAVE_RULES
     // Are there extra rules?
     if (!_settings.rules.empty())
     {
diff --git a/tools/dmake.cpp b/tools/dmake.cpp
index 88aa47159..b8b739ff1 100644
--- a/tools/dmake.cpp
+++ b/tools/dmake.cpp
@@ -225,7 +225,7 @@ int main(int argc, char **argv)
     // Makefile settings..
     if (release)
     {
-        makeConditionalVariable(fout, "CXXFLAGS", "-O2 -DNDEBUG -DHAVE_DEPENDENCIES -Wall");
+        makeConditionalVariable(fout, "CXXFLAGS", "-O2 -DNDEBUG -DHAVE_RULES -Wall");
     }
     else
     {
@@ -235,7 +235,7 @@ int main(int argc, char **argv)
 
         // The _GLIBCXX_DEBUG doesn't work in cygwin
         makeConditionalVariable(fout, "CXXFLAGS",
-                                "-DHAVE_DEPENDENCIES "
+                                "-DHAVE_RULES "
                                 "-Wall "
                                 "-Wextra "
                                 "-Wshadow "