build: use internal libsqlite.la

Problem: content-sqlite and job-archive use external libsqlite3
but we now have an internal copy of the library.

Drop configure requirement and change the build rules for those
broker modules to use the internal copy of libsqlite3.

Author: garlick

configure.ac

@@ -349,7 +349,6 @@ if test "$have_libsystemd" = yes -a "$have_sd_bus_h" = yes; then
 fi
 PKG_CHECK_MODULES([HWLOC], [hwloc >= 1.11.1], [], [])
 PKG_CHECK_MODULES([LZ4], [liblz4], [], [])
-PKG_CHECK_MODULES([SQLITE], [sqlite3], [], [])
 PKG_CHECK_MODULES([LIBUUID], [uuid], [], [])
 PKG_CHECK_MODULES([CURSES], [ncursesw], [], [])
 PKG_CHECK_MODULES([LIBARCHIVE], [libarchive], [], [])

src/modules/Makefile.am

@@ -104,12 +104,11 @@ content_sqlite_la_SOURCES = \
         content-sqlite/content-sqlite.c
 content_sqlite_la_CPPFLAGS = \
 	$(AM_CPPFLAGS) \
-	$(SQLITE_CFLAGS) \
 	$(LZ4_CFLAGS)
 content_sqlite_la_LIBADD = \
 	$(top_builddir)/src/common/libflux-internal.la \
 	$(top_builddir)/src/common/libflux-core.la \
-	$(SQLITE_LIBS) \
+	$(top_builddir)/src/common/libsqlite3/libsqlite3.la \
 	$(LZ4_LIBS)
 content_sqlite_la_LDFLAGS = $(fluxmod_ldflags) -module
 
@@ -140,13 +139,12 @@ job_archive_la_SOURCES = \
 	job-archive/job-archive.c
 job_archive_la_CPPFLAGS = \
 	$(AM_CPPFLAGS) \
-	$(SQLITE_CFLAGS) \
 	$(FLUX_SECURITY_CFLAGS)
 job_archive_la_LIBADD = \
 	$(top_builddir)/src/common/libflux-internal.la \
 	$(top_builddir)/src/common/libflux-core.la \
-	$(JANSSON_LIBS) \
-	$(SQLITE_LIBS)
+	$(top_builddir)/src/common/libsqlite3/libsqlite3.la \
+	$(JANSSON_LIBS)
 job_archive_la_LDFLAGS = $(fluxmod_ldflags) -module
 
 job_exec_la_SOURCES =

src/modules/content-sqlite/content-sqlite.c

@@ -18,12 +18,12 @@
 #include <unistd.h>
 #include <unistd.h>
 #include <sys/statvfs.h>
-#include <sqlite3.h>
 #include <lz4.h>
 #include <flux/core.h>
 #include <jansson.h>
 #include <assert.h>
 
+#include "src/common/libsqlite3/sqlite3.h"
 #include "src/common/libutil/blobref.h"
 #include "src/common/libutil/log.h"
 #include "src/common/libutil/errno_safe.h"

src/modules/job-archive/job-archive.c

@@ -22,8 +22,8 @@
 #include <stdbool.h>
 #include <flux/core.h>
 #include <jansson.h>
-#include <sqlite3.h>
 
+#include "src/common/libsqlite3/sqlite3.h"
 #include "src/common/libutil/log.h"
 #include "src/common/libutil/fsd.h"
 #include "src/common/libutil/tstat.h"