v9.7

zhanxw · Oct 1, 2024 · e671241 · e671241
1 parent 67ce4a7
commit e671241
Show file tree

Hide file tree

Showing 8 changed files with 98,566 additions and 43,359 deletions.
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,7 @@
+2024-09-30  Xiaowei Zhan  <zhanxw@bunny.swmed.edu>
+
+	* Update SQLite C codes
+
 2024-09-30  Xiaowei Zhan  <zhanxw@bunny.swmed.edu>
 
 	* Revise URL used in README

diff --git a/DESCRIPTION b/DESCRIPTION
@@ -2,7 +2,7 @@ Package: seqminer
 Type: Package
 Title: Efficiently Read Sequence Data (VCF Format, BCF Format, METAL
         Format and BGEN Format) into R
-Version: 9.6
+Version: 9.7
 Date: 2024-09-30
 Authors@R: c(person("Xiaowei", "Zhan", email = "zhanxw@gmail.com", role = c("aut", "cre")),
            person("Dajiang", "Liu", email = "dajiang.liu@gmail.com", role = "aut"),

diff --git a/src/BGenIndex.h b/src/BGenIndex.h
@@ -3,7 +3,11 @@
 
 #include <string>
 
+#ifdef HAVE_SQLITE
+#include "sqlite3.h"
+#else
 #include "sqlite/sqlite3.h"
+#endif
 
 #include "RangeList.h"
 

diff --git a/src/Makevars.in b/src/Makevars.in
@@ -28,6 +28,12 @@ PKG_LIBS=@PKG_LIBS@
 ## That will crash our program. So we wont use PCRE (@LIB_PCRE@).
 
 ## use SQLITE
+ifeq (@HAVE_SQLITE@,1)
+$(info have SQLite)
+PKG_CPPFLAGS+=-DHAVE_SQLITE 
+else
+$(info do not have SQLite)
+endif
 PKG_CPPFLAGS+=-I. \
              -DRSQLITE_USE_BUNDLED_SQLITE \
              -DSQLITE_ENABLE_RTREE \