From 3188586fc784a69fdb029b3c4dc49e419b949fb7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tomasz=20K=C5=82oczko?= Date: Mon, 25 Sep 2023 20:48:37 +0000 Subject: [PATCH] use pkgconfig to detect libz MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Use PKG_PROG_PKG_CONFIG and PKG_CHECK_MODULES aclocal macros to detect libz. Signed-off-by: Tomasz Kłoczko --- Makefile.in | 9 +++++---- configure.ac | 4 ++-- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/Makefile.in b/Makefile.in index ee28d0fccb..da7e67123e 100644 --- a/Makefile.in +++ b/Makefile.in @@ -70,6 +70,7 @@ TCC += -DSQLITE_THREADSAFE=@SQLITE_THREADSAFE@ # Any target libraries which libsqlite must be linked against # TLIBS = @LIBS@ $(LIBS) +ZLIB_LIBS = @ZLIB_LIBS@ # Flags controlling use of the in memory btree implementation # @@ -673,7 +674,7 @@ libtclsqlite3.la: tclsqlite.lo libsqlite3.la sqlite3$(TEXE): shell.c sqlite3.c $(LTLINK) $(READLINE_FLAGS) $(SHELL_OPT) -o $@ \ shell.c sqlite3.c \ - $(LIBREADLINE) $(TLIBS) -rpath "$(libdir)" + $(LIBREADLINE) $(TLIBS) $(ZLIB_LIBS) -rpath "$(libdir)" sqldiff$(TEXE): $(TOP)/tool/sqldiff.c sqlite3.lo sqlite3.h $(LTLINK) -o $@ $(TOP)/tool/sqldiff.c sqlite3.lo $(TLIBS) @@ -712,7 +713,7 @@ ossshell$(TEXE): $(TOP)/test/ossfuzz.c $(TOP)/test/ossshell.c sqlite3.c sqlite3. $(TOP)/test/ossfuzz.c sqlite3.c $(TLIBS) sessionfuzz$(TEXE): $(TOP)/test/sessionfuzz.c sqlite3.c sqlite3.h - $(LTLINK) -o $@ $(TOP)/test/sessionfuzz.c $(TLIBS) + $(LTLINK) -o $@ $(TOP)/test/sessionfuzz.c $(TLIBS) $(ZLIB_LIBS) dbfuzz$(TEXE): $(TOP)/test/dbfuzz.c sqlite3.c sqlite3.h $(LTLINK) -o $@ $(DBFUZZ_OPT) $(TOP)/test/dbfuzz.c sqlite3.c $(TLIBS) @@ -1270,7 +1271,7 @@ TESTFIXTURE_SRC += $(TESTFIXTURE_SRC$(USE_AMALGAMATION)) testfixture$(TEXE): $(TESTFIXTURE_SRC) $(LTLINK) -DSQLITE_NO_SYNC=1 $(TEMP_STORE) $(TESTFIXTURE_FLAGS) \ - -o $@ $(TESTFIXTURE_SRC) $(LIBTCL) $(TLIBS) + -o $@ $(TESTFIXTURE_SRC) $(LIBTCL) $(TLIBS) $(ZLIB_LIBS) coretestprogs: $(TESTPROGS) @@ -1368,7 +1369,7 @@ sqltclsh.c: sqlite3.c $(TOP)/src/tclsqlite.c $(TOP)/tool/sqltclsh.tcl $(TOP)/ext $(TCLSH_CMD) $(TOP)/tool/mkccode.tcl $(TOP)/tool/sqltclsh.c.in >sqltclsh.c sqltclsh$(TEXE): sqltclsh.c - $(LTLINK) sqltclsh.c -o $@ $(LIBTCL) $(TLIBS) + $(LTLINK) sqltclsh.c -o $@ $(LIBTCL) $(TLIBS) $(ZLIB_LIBS) sqlite3_expert$(TEXE): $(TOP)/ext/expert/sqlite3expert.h $(TOP)/ext/expert/sqlite3expert.c $(TOP)/ext/expert/expert.c sqlite3.c $(LTLINK) $(TOP)/ext/expert/sqlite3expert.h $(TOP)/ext/expert/sqlite3expert.c $(TOP)/ext/expert/expert.c sqlite3.c -o sqlite3_expert $(TLIBS) diff --git a/configure.ac b/configure.ac index 837d2fb015..8dddd6f347 100644 --- a/configure.ac +++ b/configure.ac @@ -90,6 +90,7 @@ fi # LT_INIT AC_PROG_INSTALL +PKG_PROG_PKG_CONFIG ######### # Enable large file support (if special flags are necessary) @@ -652,8 +653,7 @@ AC_SUBST(USE_AMALGAMATION) ######### # Look for zlib. Only needed by extensions and by the sqlite3.exe shell -AC_CHECK_HEADERS(zlib.h) -AC_SEARCH_LIBS(deflate, z, [HAVE_ZLIB="-DSQLITE_HAVE_ZLIB=1"], [HAVE_ZLIB=""]) +PKG_CHECK_MODULES([ZLIB], [zlib], [HAVE_ZLIB="-DSQLITE_HAVE_ZLIB=1"], [HAVE_ZLIB=""]) AC_SUBST(HAVE_ZLIB) #########