From bf625b25c3f0cde70bdbb88451620d0a720f4a68 Mon Sep 17 00:00:00 2001
From: proller <proller@github.com>
Date: Wed, 19 Dec 2018 19:25:38 +0300
Subject: [PATCH 1/2] Fix build without submodules

---
 cmake/find_base64.cmake | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/cmake/find_base64.cmake b/cmake/find_base64.cmake
index ad71d11c1b4..9b6e28a8ccf 100644
--- a/cmake/find_base64.cmake
+++ b/cmake/find_base64.cmake
@@ -1,4 +1,11 @@
-option (ENABLE_BASE64 "Enable base64" ON)
+if (NOT EXISTS "${ClickHouse_SOURCE_DIR}/base64/lib/lib.c")
+    set (MISSING_INTERNAL_BASE64_LIBRARY 1)
+    message (WARNING "submodule contrib/base64 is missing. to fix try run: \n git submodule update --init --recursive")
+endif ()
+
+if (NOT MISSING_INTERNAL_BASE64_LIBRARY)
+    option (ENABLE_BASE64 "Enable base64" ON)
+endif ()
 
 if (ENABLE_BASE64)
     if (NOT EXISTS "${ClickHouse_SOURCE_DIR}/contrib/base64")
@@ -9,4 +16,3 @@ if (ENABLE_BASE64)
         set (USE_BASE64 1)
     endif()
 endif ()
-

From 6869771ae4438d547ada9250ae5ef42a834af4bc Mon Sep 17 00:00:00 2001
From: proller <proller@github.com>
Date: Wed, 19 Dec 2018 20:57:51 +0300
Subject: [PATCH 2/2] Fix includes

---
 dbms/programs/server/TCPHandler.h                    | 1 +
 dbms/src/Interpreters/RequiredSourceColumnsVisitor.h | 1 +
 dbms/src/Parsers/ASTEnumElement.h                    | 4 ++--
 utils/check-style/check-include                      | 3 +++
 4 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/dbms/programs/server/TCPHandler.h b/dbms/programs/server/TCPHandler.h
index 43c544cc401..98b76268047 100644
--- a/dbms/programs/server/TCPHandler.h
+++ b/dbms/programs/server/TCPHandler.h
@@ -25,6 +25,7 @@ namespace Poco { class Logger; }
 namespace DB
 {
 
+class ColumnsDescription;
 
 /// State of query processing.
 struct QueryState
diff --git a/dbms/src/Interpreters/RequiredSourceColumnsVisitor.h b/dbms/src/Interpreters/RequiredSourceColumnsVisitor.h
index ebf948ffeb8..859326acbe8 100644
--- a/dbms/src/Interpreters/RequiredSourceColumnsVisitor.h
+++ b/dbms/src/Interpreters/RequiredSourceColumnsVisitor.h
@@ -8,6 +8,7 @@
 #include <Parsers/ASTTablesInSelectQuery.h>
 #include <DataTypes/NestedUtils.h>
 #include <Common/typeid_cast.h>
+#include "InDepthNodeVisitor.h"
 
 namespace DB
 {
diff --git a/dbms/src/Parsers/ASTEnumElement.h b/dbms/src/Parsers/ASTEnumElement.h
index 8e0a2ec1648..c603f5086de 100644
--- a/dbms/src/Parsers/ASTEnumElement.h
+++ b/dbms/src/Parsers/ASTEnumElement.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <Parsers/IAST.h>
+#include "IAST.h"
 #include <Core/Field.h>
 #include <Common/FieldVisitors.h>
 
@@ -18,7 +18,7 @@ public:
     ASTEnumElement(const String & name, const Field & value)
         : name{name}, value {value} {}
 
-    String getID() const override { return "EnumElement"; }
+    String getID(char) const override { return "EnumElement"; }
 
     ASTPtr clone() const override
     {
diff --git a/utils/check-style/check-include b/utils/check-style/check-include
index cdc5a82d7ed..eede9940dcd 100755
--- a/utils/check-style/check-include
+++ b/utils/check-style/check-include
@@ -34,6 +34,9 @@ inc="-I. \
 -I./contrib/poco/Foundation/include \
 -I./contrib/boost/libs/*/include \
 -I./contrib/boost \
+-I/usr/include/llvm-7 \
+-I/usr/include/llvm-6.0 \
+-I/usr/include/llvm-5.0 \
 -I./contrib/llvm/llvm/include \
 -I${BUILD_DIR}/contrib/llvm/llvm/include \
 -I./contrib/libbtrie/include \