Add embedded libcurl submodule

.gitmodules

@@ -1,3 +1,6 @@
 [submodule "deps/googletest"]
 	path = deps/googletest
 	url = https://github.com/google/googletest
+[submodule "deps/curl"]
+	path = deps/curl
+	url = https://github.com/curl/curl

CMakeLists.txt

@@ -62,8 +62,6 @@ include(MacroAddDoxygen REQUIRED)
 include(CMakeCXX11Support REQUIRED)
 include(PortabilityGNUCheck REQUIRED)
 
-#enable testing
-INCLUDE(CTest)
 
 
 set(OUTPUT_NAME_DAVIX "davix")
@@ -103,6 +101,14 @@ add_subdirectory(deps)
 #libuuid
 find_package(uuid)
 
+#-------------------------------------------------------------------------------
+# Are we using system, or embedded libcurl?
+#-------------------------------------------------------------------------------
+option(EMBEDDED_LIBCURL "Use embedded libcurl" TRUE)
+
+if(EMBEDDED_LIBCURL)
+  add_subdirectory(deps/curl)
+endif()
 
 ## general defs
 add_definitions( -D_GNU_SOURCE)              # GNU source, import LFS, etc...
@@ -150,5 +156,5 @@ CONFIGURE_FILE(
   "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake"
   IMMEDIATE @ONLY)
 
-ADD_CUSTOM_TARGET(uninstall
-  "${CMAKE_COMMAND}" -P "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake")
+# ADD_CUSTOM_TARGET(uninstall
+#   "${CMAKE_COMMAND}" -P "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake")

doc/CMakeLists.txt

@@ -10,17 +10,17 @@ if(ENABLE_HTML_DOCS)
 
   SET( l_doc "${CMAKE_CURRENT_BINARY_DIR}/build/html/")
 
-  find_package(Sphinx)
-  if(SPHINX_FOUND)
-    add_custom_target(sphinx
-      DEPENDS doxygen
-      COMMAND ${SPHINX_EXECUTABLE}
-      -q -b html
-      "${CMAKE_CURRENT_SOURCE_DIR}/sphinx"
-      "${l_doc}/")
-
-    add_dependencies(doc sphinx)
-  endif(SPHINX_FOUND)
+  # find_package(Sphinx)
+  # if(SPHINX_FOUND)
+  #   add_custom_target(sphinx
+  #     DEPENDS doxygen
+  #     COMMAND ${SPHINX_EXECUTABLE}
+  #     -q -b html
+  #     "${CMAKE_CURRENT_SOURCE_DIR}/sphinx"
+  #     "${l_doc}/")
+
+  #   add_dependencies(doc sphinx)
+  # endif(SPHINX_FOUND)
 
   install(DIRECTORY ${l_doc} DESTINATION ${DOC_INSTALL_DIR}/html)
 endif(ENABLE_HTML_DOCS)

test/functional/davix-tester.cpp

@@ -445,7 +445,8 @@ static std::string vecToString(const std::vector<std::string> &vec, const std::s
 }
 
 void preadvec(TestcaseHandler &handler, const RequestParams &params, const Uri uri, const std::string str_ranges, std::vector<std::string> options) {
-    handler.setName(SSTR("preadvec on " << uri.getString() << ": " << str_ranges << " | " << vecToString(options, ",")));
+    handler.setName(SSTR("preadvec on " << uri.getString()));
+    handler.info(SSTR("Options: " << str_ranges << " | " << vecToString(options, ",")));
 
     Uri u = uri;