| Index: third_party/sqlite/src/configure.ac
|
| diff --git a/third_party/sqlite/src/configure.ac b/third_party/sqlite/src/configure.ac
|
| index 0b94d33930be1051a8446a67c06f3122ade0bbf4..095db6bf81af7e597fea1954f8185f955ecd5ab7 100644
|
| --- a/third_party/sqlite/src/configure.ac
|
| +++ b/third_party/sqlite/src/configure.ac
|
| @@ -108,7 +108,7 @@ AC_CHECK_HEADERS([sys/types.h stdlib.h stdint.h inttypes.h malloc.h])
|
| #########
|
| # Figure out whether or not we have these functions
|
| #
|
| -AC_CHECK_FUNCS([fdatasync gmtime_r isnan localtime_r localtime_s malloc_usable_size strchrnul usleep utime])
|
| +AC_CHECK_FUNCS([fdatasync gmtime_r isnan localtime_r localtime_s malloc_usable_size strchrnul usleep utime pread pread64 pwrite pwrite64])
|
|
|
| #########
|
| # By default, we use the amalgamation (this may be changed below...)
|
| @@ -195,6 +195,7 @@ AC_SUBST(SQLITE_THREADSAFE)
|
|
|
| if test "$SQLITE_THREADSAFE" = "1"; then
|
| AC_SEARCH_LIBS(pthread_create, pthread)
|
| + AC_SEARCH_LIBS(pthread_mutexattr_init, pthread)
|
| fi
|
|
|
| ##########
|
| @@ -333,6 +334,20 @@ if test "${use_tcl}" = "yes" ; then
|
| fi
|
| fi
|
|
|
| + # Recent versions of Xcode on Macs hid the tclConfig.sh file
|
| + # in a strange place.
|
| + if test x"${ac_cv_c_tclconfig}" = x ; then
|
| + if test x"$cross_compiling" = xno; then
|
| + for i in /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX*.sdk/usr/lib
|
| + do
|
| + if test -f "$i/tclConfig.sh" ; then
|
| + ac_cv_c_tclconfig="$i"
|
| + break
|
| + fi
|
| + done
|
| + fi
|
| + fi
|
| +
|
| # then check for a private Tcl installation
|
| if test x"${ac_cv_c_tclconfig}" = x ; then
|
| for i in \
|
| @@ -545,7 +560,7 @@ AC_SEARCH_LIBS(fdatasync, [rt])
|
| AC_ARG_ENABLE(debug, AC_HELP_STRING([--enable-debug],[enable debugging & verbose explain]),
|
| [use_debug=$enableval],[use_debug=no])
|
| if test "${use_debug}" = "yes" ; then
|
| - TARGET_DEBUG="-DSQLITE_DEBUG=1"
|
| + TARGET_DEBUG="-DSQLITE_DEBUG=1 -DSQLITE_ENABLE_SELECTTRACE -DSQLITE_ENABLE_WHERETRACE"
|
| else
|
| TARGET_DEBUG="-DNDEBUG"
|
| fi
|
| @@ -573,6 +588,30 @@ else
|
| OPT_FEATURE_FLAGS="-DSQLITE_OMIT_LOAD_EXTENSION=1"
|
| fi
|
|
|
| +##########
|
| +# Do we want to support memsys3 and/or memsys5
|
| +#
|
| +AC_ARG_ENABLE(memsys5,
|
| + AC_HELP_STRING([--enable-memsys5],[Enable MEMSYS5]),
|
| + [enable_memsys5=yes],[enable_memsys5=no])
|
| +AC_MSG_CHECKING([whether to support MEMSYS5])
|
| +if test "${enable_memsys5}" = "yes"; then
|
| + OPT_FEATURE_FLAGS+=" -DSQLITE_ENABLE_MEMSYS5"
|
| + AC_MSG_RESULT([yes])
|
| +else
|
| + AC_MSG_RESULT([no])
|
| +fi
|
| +AC_ARG_ENABLE(memsys3,
|
| + AC_HELP_STRING([--enable-memsys3],[Enable MEMSYS3]),
|
| + [enable_memsys3=yes],[enable_memsys3=no])
|
| +AC_MSG_CHECKING([whether to support MEMSYS3])
|
| +if test "${enable_memsys3}" = "yes" -a "${enable_memsys5}" = "no"; then
|
| + OPT_FEATURE_FLAGS+=" -DSQLITE_ENABLE_MEMSYS3"
|
| + AC_MSG_RESULT([yes])
|
| +else
|
| + AC_MSG_RESULT([no])
|
| +fi
|
| +
|
| #########
|
| # See whether we should enable Full Text Search extensions
|
| AC_ARG_ENABLE(fts3, AC_HELP_STRING([--enable-fts3],
|
| @@ -615,6 +654,16 @@ if test "${enable_rtree}" = "yes" ; then
|
| fi
|
|
|
| #########
|
| +# See whether we should enable the SESSION extension
|
| +AC_ARG_ENABLE(session, AC_HELP_STRING([--enable-session],
|
| + [Enable the SESSION extension]),
|
| + [enable_session=yes],[enable_session=no])
|
| +if test "${enable_session}" = "yes" ; then
|
| + OPT_FEATURE_FLAGS+=" -DSQLITE_ENABLE_SESSION"
|
| + OPT_FEATURE_FLAGS+=" -DSQLITE_ENABLE_PREUPDATE_HOOK"
|
| +fi
|
| +
|
| +#########
|
| # attempt to duplicate any OMITS and ENABLES into the $(OPT_FEATURE_FLAGS) parameter
|
| for option in $CFLAGS $CPPFLAGS
|
| do
|
|
|