switch to vendored easylogging

CMakeLists.txt

@@ -36,10 +36,10 @@ if (${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} GREATER 3.0)
 else ()
   if (CMAKE_COMPILER_IS_GNUCXX)
     message ("** Assuming that GNU CXX uses -std=c++11 flag for C++11 compatibility.")
-    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
+    list(APPEND CMAKE_CXX_FLAGS "-std=c++11")
   elseif (CMAKE_CXX_COMPILER_ID MATCHES "Clang")
     message ("** Assuming that Clang uses -std=c++11 flag for C++11 compatibility.")
-    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
+    list(APPEND CMAKE_CXX_FLAGS "-std=c++11")
   else()
     message ("** No CMAKE C++11 check. If the build breaks, you're on your own.")
   endif()
@@ -141,22 +141,29 @@ if (${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} GREATER 3.5) # Need 3.6 or abo
 endif()
 
 if (USE_INTERNAL_TINYXML)
-  message("-- Using local TinyXML2 copy")
+  message("-- Using vendored TinyXML2")
   set(TINYXML_DIR vendor/github.com/leethomason/tinyxml2)
   set(BUILD_STATIC_LIBS ON CACHE BOOL "build static libs")
   set(BUILD_SHARED_LIBS OFF CACHE BOOL "build shared libs")
   set(BUILD_TESTS OFF CACHE BOOL "build tests")
   add_subdirectory(${TINYXML_DIR})
-  include_directories(${CMAKE_CURRENT_LIST_DIR}/${TINYXML_DIR}/)
-  link_directories(${CMAKE_BINARY_DIR}/${TINYXML_DIR}/)
+  include_directories(${CMAKE_CURRENT_LIST_DIR}/${TINYXML_DIR})
+  link_directories(${CMAKE_BINARY_DIR}/${TINYXML_DIR})
   set(TINYXML_LIBRARIES tinyxml2)
 else ()
   find_package (TinyXML REQUIRED)
   include_directories (${TINYXML_INCLUDE_DIR})
 endif ()
 
+message("-- Using vendored easylogging++")
+set(EASYLOGGING_DIR vendor/github.com/muflihun/easyloggingpp)
+set(build_static_lib ON CACHE BOOL "build static libs")
+add_subdirectory(${EASYLOGGING_DIR})
+include_directories(${CMAKE_CURRENT_LIST_DIR}/${EASYLOGGING_DIR}/src)
+link_directories(${CMAKE_BINARY_DIR}/${EASYLOGGING_DIR})
+set(EASYLOGGING_LIBRARIES easyloggingpp)
+
 set(SOURCE_FILES
-  internal/easylogging++.cc
   encfs/autosprintf.cpp
   encfs/base64.cpp
   encfs/BlockFileIO.cpp
@@ -194,6 +201,7 @@ target_link_libraries(encfs
   ${FUSE_LIBRARIES}
   ${OPENSSL_LIBRARIES}
   ${TINYXML_LIBRARIES}
+  ${EASYLOGGING_LIBRARIES}
   ${CMAKE_THREAD_LIBS_INIT}
   ${Intl_LIBRARIES}
 )

encfs/BlockNameIO.cpp

@@ -30,7 +30,7 @@
 #include "Interface.h"
 #include "NameIO.h"
 #include "base64.h"
-#include "internal/easylogging++.h"
+#include "easylogging++.h"
 #include "intl/gettext.h"
 
 namespace encfs {

encfs/CipherFileIO.cpp

@@ -20,7 +20,7 @@
 
 #include "CipherFileIO.h"
 
-#include "internal/easylogging++.h"
+#include "easylogging++.h"
 #include <cerrno>
 #include <cinttypes>
 #include <cstring>

encfs/ConfigVar.cpp

@@ -20,7 +20,7 @@
 
 #include "ConfigVar.h"
 
-#include "internal/easylogging++.h"
+#include "easylogging++.h"
 #include <cstring>
 
 #include "Error.h"

encfs/Context.cpp

@@ -18,7 +18,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "internal/easylogging++.h"
+#include "easylogging++.h"
 #include <utility>
 
 #include "Context.h"

encfs/DirNode.cpp

@@ -35,7 +35,7 @@
 #include <sys/fsuid.h>
 #endif
 
-#include "internal/easylogging++.h"
+#include "easylogging++.h"
 #include <cstring>
 #include <utility>
 

encfs/Error.h

@@ -3,7 +3,7 @@
 
 // Provides compatibility with RLog's rAssert, which throws an Error exception.
 
-#include "internal/easylogging++.h"
+#include "easylogging++.h"
 #include <stdexcept>
 
 namespace encfs {

encfs/FileUtils.cpp

@@ -25,7 +25,7 @@
 #define _BSD_SOURCE      // pick up setenv on RH7.3
 #define _DEFAULT_SOURCE  // Replaces _BSD_SOURCE
 
-#include "internal/easylogging++.h"
+#include "easylogging++.h"
 #include <cctype>
 #include <cerrno>
 #include <cstdio>

encfs/MACFileIO.cpp

@@ -20,7 +20,7 @@
 
 #include "MACFileIO.h"
 
-#include "internal/easylogging++.h"
+#include "easylogging++.h"
 #include <cinttypes>
 #include <cstring>
 #include <sys/stat.h>

encfs/NameIO.cpp

@@ -20,7 +20,7 @@
 
 #include "NameIO.h"
 
-#include "internal/easylogging++.h"
+#include "easylogging++.h"
 #include <cstring>
 // for static build.  Need to reference the modules which are registered at
 // run-time, to ensure that the linker doesn't optimize them away.

encfs/RawFileIO.cpp

@@ -21,7 +21,7 @@
 #ifdef linux
 #define _XOPEN_SOURCE 500  // pick up pread , pwrite
 #endif
-#include "internal/easylogging++.h"
+#include "easylogging++.h"
 #include <cerrno>
 #include <cinttypes>
 #include <cstring>

encfs/SSL_Cipher.cpp

@@ -18,7 +18,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "internal/easylogging++.h"
+#include "easylogging++.h"
 #include <cstring>
 #include <openssl/crypto.h>
 #include <openssl/err.h>

encfs/StreamNameIO.cpp

@@ -20,7 +20,7 @@
 
 #include "StreamNameIO.h"
 
-#include "internal/easylogging++.h"
+#include "easylogging++.h"
 #include <cstring>
 #include <utility>
 

encfs/encfs.cpp

@@ -41,7 +41,7 @@
 #include <attr/xattr.h>
 #endif
 
-#include "internal/easylogging++.h"
+#include "easylogging++.h"
 #include <functional>
 #include <string>
 #include <vector>

encfs/encfs.h

@@ -21,7 +21,7 @@
 #ifndef _encfs_incl_
 #define _encfs_incl_
 
-#include "internal/easylogging++.h"
+#include "easylogging++.h"
 #include <fuse.h>
 #include <sys/types.h>
 #include <unistd.h>

encfs/test.cpp

@@ -38,7 +38,7 @@
 #include "NameIO.h"
 #include "Range.h"
 #include "StreamNameIO.h"
-#include "internal/easylogging++.h"
+#include "easylogging++.h"
 
 #define NO_DES
 #include <openssl/ssl.h>

vendor/README.md

@@ -0,0 +1,24 @@
+# Vendored Packages
+
+Some external dependencies are vendored here.  Use 
+[git-vendor](https://github.com/brettlangdon/git-vendor) to view, 
+add, or update vendored packages.
+
+For example:
+
+```sh
+$ git-vendor list
+easylogging@master:
+        name:   easylogging
+        dir:    vendor/github.com/muflihun/easyloggingpp
+        repo:   https://github.com/muflihun/easyloggingpp
+        ref:    master
+        commit: e2b86551a5ba1d63b21b57a2bae1ddb0b0e5135e
+
+tinyxml2@master:
+        name:   tinyxml2
+        dir:    vendor/github.com/leethomason/tinyxml2
+        repo:   https://github.com/leethomason/tinyxml2.git
+        ref:    master
+        commit: 1979f3c87e68f489c7f6d88532aae4d76d9d3a78
+```