diff options
| author | Max <msuraev@sysmocom.de> | 2017-01-26 14:57:44 +0100 |
|---|---|---|
| committer | Max <msuraev@sysmocom.de> | 2017-01-26 17:06:06 +0100 |
| commit | 2dee3e996e777b67aa3185f7456c041765f0d71f (patch) | |
| tree | bd3a3c3af522c0096eaae66b2f0aa1dcce598f74 /CommonLibs | |
| parent | 1f1cebb2e503c1740ee53caf9664c0d39b5fe70e (diff) | |
Fix building against sqlite3
* Explicitly check for sqlite3 at configure stage, remove old include
dir, fix header inclusion.
* Use configure results for linking instead of hardcoded linker option
for sqlite.
* Add dependency on -dev package for .deb
Change-Id: I6d7f697d67651f02ceb77fc4da4317b64fa47f9e
Fixes: OS#1928
Diffstat (limited to 'CommonLibs')
| -rw-r--r-- | CommonLibs/Makefile.am | 8 | ||||
| -rw-r--r-- | CommonLibs/sqlite3util.cpp | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/CommonLibs/Makefile.am b/CommonLibs/Makefile.am index 26a55ed..ed9cf29 100644 --- a/CommonLibs/Makefile.am +++ b/CommonLibs/Makefile.am @@ -78,7 +78,7 @@ URLEncodeTest_SOURCES = URLEncodeTest.cpp URLEncodeTest_LDADD = libcommon.la BitVectorTest_SOURCES = BitVectorTest.cpp -BitVectorTest_LDADD = libcommon.la $(SQLITE_LA) +BitVectorTest_LDADD = libcommon.la $(SQLITE3_LIBS) InterthreadTest_SOURCES = InterthreadTest.cpp InterthreadTest_LDADD = libcommon.la @@ -92,19 +92,19 @@ TimevalTest_SOURCES = TimevalTest.cpp TimevalTest_LDADD = libcommon.la VectorTest_SOURCES = VectorTest.cpp -VectorTest_LDADD = libcommon.la $(SQLITE_LA) +VectorTest_LDADD = libcommon.la $(SQLITE3_LIBS) RegexpTest_SOURCES = RegexpTest.cpp RegexpTest_LDADD = libcommon.la ConfigurationTest_SOURCES = ConfigurationTest.cpp -ConfigurationTest_LDADD = libcommon.la $(SQLITE_LA) +ConfigurationTest_LDADD = libcommon.la $(SQLITE3_LIBS) # ReportingTest_SOURCES = ReportingTest.cpp # ReportingTest_LDADD = libcommon.la $(SQLITE_LA) LogTest_SOURCES = LogTest.cpp -LogTest_LDADD = libcommon.la $(SQLITE_LA) +LogTest_LDADD = libcommon.la $(SQLITE3_LIBS) F16Test_SOURCES = F16Test.cpp diff --git a/CommonLibs/sqlite3util.cpp b/CommonLibs/sqlite3util.cpp index 036ef2c..2b19ee6 100644 --- a/CommonLibs/sqlite3util.cpp +++ b/CommonLibs/sqlite3util.cpp @@ -4,7 +4,7 @@ */ -#include "sqlite3.h" +#include <sqlite3.h> #include "sqlite3util.h" #include <string.h> |