Add a couple of files to gitignore. Always include the header first.

Build Sophia before trying to link with it.

cmake/BuildSophia.cmake

@@ -30,4 +30,5 @@ macro(sophia_build)
 	)
     message(STATUS "Use bundled Sophia: ${PROJECT_SOURCE_DIR}/third_party/sophia/")
     set (sophia_lib "${PROJECT_BINARY_DIR}/third_party/sophia/libsophia.a")
+    add_dependencies(build_bundled_libs libsophia)
 endmacro(sophia_build)

src/box/sophia_engine.cc

@@ -26,12 +26,11 @@
  * THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
+#include "sophia_engine.h"
 #include "cfg.h"
 #include "xrow.h"
 #include "tuple.h"
 #include "scoped_guard.h"
-#include "engine.h"
-#include "sophia_engine.h"
 #include "txn.h"
 #include "index.h"
 #include "sophia_index.h"

src/box/sophia_engine.h

@@ -28,6 +28,7 @@
  * THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
+#include "engine.h"
 
 struct SophiaFactory: public EngineFactory {
 	SophiaFactory();

sophia @ 3f313230

-Subproject commit 2eb631891536c2e2df57639991bee86fde7488d9
+Subproject commit 3f313230c8305859a8a14a45dace37415ee12479