/ Check-in [41bfb6b8]
Login

Many hyperlinks are disabled.
Use anonymous login to enable hyperlinks.

Overview
Comment:Update the autoconf configure.ac script and Makefile.am templates so that ZLIB is automatically detected and used.
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA3-256: 41bfb6b8d61699d09a7e67d2289149abfbb9ce8e75e6ff8560546cad0d2e3f2b
User & Date: drh 2018-01-18 17:09:26
Context
2018-01-18
17:46
Check for both zlib.h and -lz before enabling zlib support in the amalgamation configure script. check-in: 8ecd13a1 user: dan tags: trunk
17:09
Update the autoconf configure.ac script and Makefile.am templates so that ZLIB is automatically detected and used. check-in: 41bfb6b8 user: drh tags: trunk
16:59
Fix sessions module handling of sqlite_stat1 rows with (idx IS NULL). check-in: 0e916416 user: dan tags: trunk
Changes
Hide Diffs Side-by-Side Diffs Ignore Whitespace Patch

Changes to autoconf/Makefile.am.

     1      1   
     2         -AM_CFLAGS = @THREADSAFE_FLAGS@ @DYNAMIC_EXTENSION_FLAGS@ @FTS5_FLAGS@ @JSON1_FLAGS@ @SESSION_FLAGS@ -DSQLITE_ENABLE_FTS3 -DSQLITE_ENABLE_RTREE
            2  +AM_CFLAGS = @THREADSAFE_FLAGS@ @DYNAMIC_EXTENSION_FLAGS@ @FTS5_FLAGS@ @JSON1_FLAGS@ @ZLIB_FLAGS@ @SESSION_FLAGS@ -DSQLITE_ENABLE_FTS3 -DSQLITE_ENABLE_RTREE
     3      3   
     4      4   lib_LTLIBRARIES = libsqlite3.la
     5      5   libsqlite3_la_SOURCES = sqlite3.c
     6      6   libsqlite3_la_LDFLAGS = -no-undefined -version-info 8:6:8
     7      7   
     8      8   bin_PROGRAMS = sqlite3
     9      9   sqlite3_SOURCES = shell.c sqlite3.h

Changes to autoconf/configure.ac.

   160    160   else
   161    161     EXTRA_SHELL_OBJ=libsqlite3.la
   162    162   fi
   163    163   AC_SUBST(EXTRA_SHELL_OBJ)
   164    164   #-----------------------------------------------------------------------
   165    165   
   166    166   AC_CHECK_FUNCS(posix_fallocate)
          167  +AC_CHECK_HEADERS(zlib.h)
          168  +AC_SEARCH_LIBS(deflate,z,[ZLIB_FLAGS="-DSQLITE_HAVE_ZLIB"])
          169  +AC_SUBST(ZLIB_FLAGS)
   167    170   
   168    171   #-----------------------------------------------------------------------
   169    172   # UPDATE: Maybe it's better if users just set CFLAGS before invoking
   170    173   # configure. This option doesn't really add much...
   171    174   #
   172    175   #   --enable-tempstore
   173    176   #