SQLite

Check-in [8ecd13a1b3]
Login

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

Overview
Comment:Check for both zlib.h and -lz before enabling zlib support in the amalgamation configure script.
Downloads: Tarball | ZIP archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA3-256: 8ecd13a1b38e58d4464585c388c1aa27d1f056dba0db239316623e81d3eb5284
User & Date: dan 2018-01-18 17:46:08.702
Context
2018-01-18
19:00
Use a loop to avoid recursion in the heightOfSelect() function. (check-in: 86de43595c user: dan tags: trunk)
17:46
Check for both zlib.h and -lz before enabling zlib support in the amalgamation configure script. (check-in: 8ecd13a1b3 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: 41bfb6b8d6 user: drh tags: trunk)
Changes
Unified Diff Ignore Whitespace Patch
Changes to autoconf/configure.ac.
︙︙
160
161
162
163
164
165
166
167
168

169
170
171
172
173
174
175

else
  EXTRA_SHELL_OBJ=libsqlite3.la
fi
AC_SUBST(EXTRA_SHELL_OBJ)
#-----------------------------------------------------------------------

AC_CHECK_FUNCS(posix_fallocate)
AC_CHECK_HEADERS(zlib.h)
AC_SEARCH_LIBS(deflate,z,[ZLIB_FLAGS="-DSQLITE_HAVE_ZLIB"])

AC_SUBST(ZLIB_FLAGS)

#-----------------------------------------------------------------------
# UPDATE: Maybe it's better if users just set CFLAGS before invoking
# configure. This option doesn't really add much...
#
#   --enable-tempstore








|
|
>








160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176

else
  EXTRA_SHELL_OBJ=libsqlite3.la
fi
AC_SUBST(EXTRA_SHELL_OBJ)
#-----------------------------------------------------------------------

AC_CHECK_FUNCS(posix_fallocate)
AC_CHECK_HEADERS(zlib.h,[
  AC_SEARCH_LIBS(deflate,z,[ZLIB_FLAGS="-DSQLITE_HAVE_ZLIB"])
])
AC_SUBST(ZLIB_FLAGS)

#-----------------------------------------------------------------------
# UPDATE: Maybe it's better if users just set CFLAGS before invoking
# configure. This option doesn't really add much...
#
#   --enable-tempstore
︙︙