From dea7ba1a3579cb9730290456b2f4878f214b6602 Mon Sep 17 00:00:00 2001 From: Connor Rigby Date: Fri, 19 Apr 2019 08:17:27 -0700 Subject: [PATCH] Fix ESQLITE_USE_SYSTEM This fixes the logic for setting the include directory for the sqlite header file --- c_src/esqlite3_nif.c | 4 ++-- rebar.config.script | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/c_src/esqlite3_nif.c b/c_src/esqlite3_nif.c index 7653422..857880a 100644 --- a/c_src/esqlite3_nif.c +++ b/c_src/esqlite3_nif.c @@ -22,7 +22,7 @@ #include #include -#include "sqlite3.h" +#include #include "queue.h" #define MAX_ATOM_LENGTH 255 /* from atom.h, not exposed in erlang include */ @@ -989,7 +989,7 @@ esqlite_get_autocommit(ErlNifEnv *env, int argc, const ERL_NIF_TERM argv[]) cmd->ref = enif_make_copy(cmd->env, argv[1]); cmd->pid = pid; - return push_command(env, db, cmd); + return push_command(env, db, cmd); } /* diff --git a/rebar.config.script b/rebar.config.script index 9faea70..c5a47e6 100644 --- a/rebar.config.script +++ b/rebar.config.script @@ -12,8 +12,8 @@ DrvLdFlags = {NifSources, LdEnv, CFlagsExt} = case os:getenv("ESQLITE_USE_SYSTEM") of - NotDefined when NotDefined == false; NotDefined == [] -> {NifStaticSources, [], []}; - _Defined -> {NifSharedSources, [{"DRV_LDFLAGS", DrvLdFlags}], " -Ic_src/sqlite3"} + NotDefined when NotDefined == false; NotDefined == [] -> {NifStaticSources, [], " -Ic_src/sqlite3"}; + _Defined -> {NifSharedSources, [{"DRV_LDFLAGS", DrvLdFlags}], []} end. CFlags =