Bug 3794: MacOS: workaround compiler errors and case-insensitivity

MacOS GCC version implicitly searches the local directory for .h
includes despite the absence of -I. in the provided options.
Furthermore it searches with case-insensitive filenames due to the
underlying case-insensitive filesystem.

The combined result is that libacl .cc files include their local copy of
acl/Url.h instead of the base directories src/URL.h which was needed.

The long term fix will be to shuffle URL.h and its related code into
a convenience library. For now we can avoid issues by prefixing the full
src/ path to the includes.

diff --git a/src/acl/DomainData.cc b/src/acl/DomainData.cc
index 3d5aa33eed5f288134d4095bc0114e7550b987ae..98716b89fd7b72124b5f591d4897cc5dc3004fda 100644 (file)
--- a/src/acl/DomainData.cc
+++ b/src/acl/DomainData.cc
@@ -38,7 +38,7 @@
 #include "cache_cf.h"
 #include "Debug.h"
 #include "wordlist.h"
-#include "URL.h"
+#include "src/URL.h"
 
 template<class T>
 inline void

diff --git a/src/acl/Url.cc b/src/acl/Url.cc
index 1be778c3a8efce384338df9cb32353c5adb90922..88fc771c681ce51ab9fd4dfa80414cf92aff80e0 100644 (file)
--- a/src/acl/Url.cc
+++ b/src/acl/Url.cc
@@ -37,7 +37,7 @@
 #include "acl/Checklist.h"
 #include "acl/RegexData.h"
 #include "rfc1738.h"
-#include "URL.h"
+#include "src/URL.h"
 
 int
 ACLUrlStrategy::match (ACLData<char const *> * &data, ACLFilledChecklist *checklist)