Index: third_party/sqlite/src/configure |
diff --git a/third_party/sqlite/src/configure b/third_party/sqlite/src/configure |
index 4033e1ab772a27f3fa80a8fd1ed2e86672b3072d..be7c89143b512b5f20c23f1d1761425699b66a28 100755 |
--- a/third_party/sqlite/src/configure |
+++ b/third_party/sqlite/src/configure |
@@ -1,6 +1,6 @@ |
#! /bin/sh |
# Guess values for system-dependent variables and create Makefiles. |
-# Generated by GNU Autoconf 2.69 for sqlite 3.10.2. |
+# Generated by GNU Autoconf 2.69 for sqlite 3.17.0. |
# |
# |
# Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc. |
@@ -726,8 +726,8 @@ MAKEFLAGS= |
# Identity of this package. |
PACKAGE_NAME='sqlite' |
PACKAGE_TARNAME='sqlite' |
-PACKAGE_VERSION='3.10.2' |
-PACKAGE_STRING='sqlite 3.10.2' |
+PACKAGE_VERSION='3.17.0' |
+PACKAGE_STRING='sqlite 3.17.0' |
PACKAGE_BUGREPORT='' |
PACKAGE_URL='' |
@@ -903,11 +903,14 @@ with_readline_inc |
enable_debug |
enable_amalgamation |
enable_load_extension |
+enable_memsys5 |
+enable_memsys3 |
enable_fts3 |
enable_fts4 |
enable_fts5 |
enable_json1 |
enable_rtree |
+enable_session |
enable_gcov |
' |
ac_precious_vars='build_alias |
@@ -1460,7 +1463,7 @@ if test "$ac_init_help" = "long"; then |
# Omit some internal or obsolete options to make the list less imposing. |
# This message is too long to be a string in the A/UX 3.1 sh. |
cat <<_ACEOF |
-\`configure' configures sqlite 3.10.2 to adapt to many kinds of systems. |
+\`configure' configures sqlite 3.17.0 to adapt to many kinds of systems. |
Usage: $0 [OPTION]... [VAR=VALUE]... |
@@ -1525,7 +1528,7 @@ fi |
if test -n "$ac_init_help"; then |
case $ac_init_help in |
- short | recursive ) echo "Configuration of sqlite 3.10.2:";; |
+ short | recursive ) echo "Configuration of sqlite 3.17.0:";; |
esac |
cat <<\_ACEOF |
@@ -1551,11 +1554,14 @@ Optional Features: |
separately |
--disable-load-extension |
Disable loading of external extensions |
+ --enable-memsys5 Enable MEMSYS5 |
+ --enable-memsys3 Enable MEMSYS3 |
--enable-fts3 Enable the FTS3 extension |
--enable-fts4 Enable the FTS4 extension |
--enable-fts5 Enable the FTS5 extension |
--enable-json1 Enable the JSON1 extension |
--enable-rtree Enable the RTREE extension |
+ --enable-session Enable the SESSION extension |
--enable-gcov Enable coverage testing using gcov |
Optional Packages: |
@@ -1646,7 +1652,7 @@ fi |
test -n "$ac_init_help" && exit $ac_status |
if $ac_init_version; then |
cat <<\_ACEOF |
-sqlite configure 3.10.2 |
+sqlite configure 3.17.0 |
generated by GNU Autoconf 2.69 |
Copyright (C) 2012 Free Software Foundation, Inc. |
@@ -2065,7 +2071,7 @@ cat >config.log <<_ACEOF |
This file contains any messages produced by compilers while |
running configure, to aid debugging if configure makes a mistake. |
-It was created by sqlite $as_me 3.10.2, which was |
+It was created by sqlite $as_me 3.17.0, which was |
generated by GNU Autoconf 2.69. Invocation command line was |
$ $0 $@ |
@@ -3923,13 +3929,13 @@ if ${lt_cv_nm_interface+:} false; then : |
else |
lt_cv_nm_interface="BSD nm" |
echo "int some_variable = 0;" > conftest.$ac_ext |
- (eval echo "\"\$as_me:3926: $ac_compile\"" >&5) |
+ (eval echo "\"\$as_me:3932: $ac_compile\"" >&5) |
(eval "$ac_compile" 2>conftest.err) |
cat conftest.err >&5 |
- (eval echo "\"\$as_me:3929: $NM \\\"conftest.$ac_objext\\\"\"" >&5) |
+ (eval echo "\"\$as_me:3935: $NM \\\"conftest.$ac_objext\\\"\"" >&5) |
(eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out) |
cat conftest.err >&5 |
- (eval echo "\"\$as_me:3932: output\"" >&5) |
+ (eval echo "\"\$as_me:3938: output\"" >&5) |
cat conftest.out >&5 |
if $GREP 'External.*some_variable' conftest.out > /dev/null; then |
lt_cv_nm_interface="MS dumpbin" |
@@ -5135,7 +5141,7 @@ ia64-*-hpux*) |
;; |
*-*-irix6*) |
# Find out which ABI we are using. |
- echo '#line 5138 "configure"' > conftest.$ac_ext |
+ echo '#line 5144 "configure"' > conftest.$ac_ext |
if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 |
(eval $ac_compile) 2>&5 |
ac_status=$? |
@@ -6660,11 +6666,11 @@ else |
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ |
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ |
-e 's:$: $lt_compiler_flag:'` |
- (eval echo "\"\$as_me:6663: $lt_compile\"" >&5) |
+ (eval echo "\"\$as_me:6669: $lt_compile\"" >&5) |
(eval "$lt_compile" 2>conftest.err) |
ac_status=$? |
cat conftest.err >&5 |
- echo "$as_me:6667: \$? = $ac_status" >&5 |
+ echo "$as_me:6673: \$? = $ac_status" >&5 |
if (exit $ac_status) && test -s "$ac_outfile"; then |
# The compiler can only warn and ignore the option if not recognized |
# So say no if there are warnings other than the usual output. |
@@ -6999,11 +7005,11 @@ else |
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ |
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ |
-e 's:$: $lt_compiler_flag:'` |
- (eval echo "\"\$as_me:7002: $lt_compile\"" >&5) |
+ (eval echo "\"\$as_me:7008: $lt_compile\"" >&5) |
(eval "$lt_compile" 2>conftest.err) |
ac_status=$? |
cat conftest.err >&5 |
- echo "$as_me:7006: \$? = $ac_status" >&5 |
+ echo "$as_me:7012: \$? = $ac_status" >&5 |
if (exit $ac_status) && test -s "$ac_outfile"; then |
# The compiler can only warn and ignore the option if not recognized |
# So say no if there are warnings other than the usual output. |
@@ -7104,11 +7110,11 @@ else |
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ |
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ |
-e 's:$: $lt_compiler_flag:'` |
- (eval echo "\"\$as_me:7107: $lt_compile\"" >&5) |
+ (eval echo "\"\$as_me:7113: $lt_compile\"" >&5) |
(eval "$lt_compile" 2>out/conftest.err) |
ac_status=$? |
cat out/conftest.err >&5 |
- echo "$as_me:7111: \$? = $ac_status" >&5 |
+ echo "$as_me:7117: \$? = $ac_status" >&5 |
if (exit $ac_status) && test -s out/conftest2.$ac_objext |
then |
# The compiler can only warn and ignore the option if not recognized |
@@ -7159,11 +7165,11 @@ else |
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ |
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ |
-e 's:$: $lt_compiler_flag:'` |
- (eval echo "\"\$as_me:7162: $lt_compile\"" >&5) |
+ (eval echo "\"\$as_me:7168: $lt_compile\"" >&5) |
(eval "$lt_compile" 2>out/conftest.err) |
ac_status=$? |
cat out/conftest.err >&5 |
- echo "$as_me:7166: \$? = $ac_status" >&5 |
+ echo "$as_me:7172: \$? = $ac_status" >&5 |
if (exit $ac_status) && test -s out/conftest2.$ac_objext |
then |
# The compiler can only warn and ignore the option if not recognized |
@@ -9539,7 +9545,7 @@ else |
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 |
lt_status=$lt_dlunknown |
cat > conftest.$ac_ext <<_LT_EOF |
-#line 9542 "configure" |
+#line 9548 "configure" |
#include "confdefs.h" |
#if HAVE_DLFCN_H |
@@ -9635,7 +9641,7 @@ else |
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 |
lt_status=$lt_dlunknown |
cat > conftest.$ac_ext <<_LT_EOF |
-#line 9638 "configure" |
+#line 9644 "configure" |
#include "confdefs.h" |
#if HAVE_DLFCN_H |
@@ -10273,7 +10279,7 @@ done |
######### |
# Figure out whether or not we have these functions |
# |
-for ac_func in fdatasync gmtime_r isnan localtime_r localtime_s malloc_usable_size strchrnul usleep utime |
+for ac_func in fdatasync gmtime_r isnan localtime_r localtime_s malloc_usable_size strchrnul usleep utime pread pread64 pwrite pwrite64 |
do : |
as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` |
ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" |
@@ -10520,6 +10526,62 @@ if test "$ac_res" != no; then : |
fi |
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing pthread_mutexattr_init" >&5 |
+$as_echo_n "checking for library containing pthread_mutexattr_init... " >&6; } |
+if ${ac_cv_search_pthread_mutexattr_init+:} false; then : |
+ $as_echo_n "(cached) " >&6 |
+else |
+ ac_func_search_save_LIBS=$LIBS |
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
+/* end confdefs.h. */ |
+ |
+/* Override any GCC internal prototype to avoid an error. |
+ Use char because int might match the return type of a GCC |
+ builtin and then its argument prototype would still apply. */ |
+#ifdef __cplusplus |
+extern "C" |
+#endif |
+char pthread_mutexattr_init (); |
+int |
+main () |
+{ |
+return pthread_mutexattr_init (); |
+ ; |
+ return 0; |
+} |
+_ACEOF |
+for ac_lib in '' pthread; do |
+ if test -z "$ac_lib"; then |
+ ac_res="none required" |
+ else |
+ ac_res=-l$ac_lib |
+ LIBS="-l$ac_lib $ac_func_search_save_LIBS" |
+ fi |
+ if ac_fn_c_try_link "$LINENO"; then : |
+ ac_cv_search_pthread_mutexattr_init=$ac_res |
+fi |
+rm -f core conftest.err conftest.$ac_objext \ |
+ conftest$ac_exeext |
+ if ${ac_cv_search_pthread_mutexattr_init+:} false; then : |
+ break |
+fi |
+done |
+if ${ac_cv_search_pthread_mutexattr_init+:} false; then : |
+ |
+else |
+ ac_cv_search_pthread_mutexattr_init=no |
+fi |
+rm conftest.$ac_ext |
+LIBS=$ac_func_search_save_LIBS |
+fi |
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_pthread_mutexattr_init" >&5 |
+$as_echo "$ac_cv_search_pthread_mutexattr_init" >&6; } |
+ac_res=$ac_cv_search_pthread_mutexattr_init |
+if test "$ac_res" != no; then : |
+ test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" |
+ |
+fi |
+ |
fi |
########## |
@@ -10699,6 +10761,20 @@ else |
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 \ |
@@ -11176,7 +11252,7 @@ else |
fi |
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 |
@@ -11267,6 +11343,44 @@ else |
OPT_FEATURE_FLAGS="-DSQLITE_OMIT_LOAD_EXTENSION=1" |
fi |
+########## |
+# Do we want to support memsys3 and/or memsys5 |
+# |
+# Check whether --enable-memsys5 was given. |
+if test "${enable_memsys5+set}" = set; then : |
+ enableval=$enable_memsys5; enable_memsys5=yes |
+else |
+ enable_memsys5=no |
+fi |
+ |
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to support MEMSYS5" >&5 |
+$as_echo_n "checking whether to support MEMSYS5... " >&6; } |
+if test "${enable_memsys5}" = "yes"; then |
+ OPT_FEATURE_FLAGS+=" -DSQLITE_ENABLE_MEMSYS5" |
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 |
+$as_echo "yes" >&6; } |
+else |
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 |
+$as_echo "no" >&6; } |
+fi |
+# Check whether --enable-memsys3 was given. |
+if test "${enable_memsys3+set}" = set; then : |
+ enableval=$enable_memsys3; enable_memsys3=yes |
+else |
+ enable_memsys3=no |
+fi |
+ |
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to support MEMSYS3" >&5 |
+$as_echo_n "checking whether to support MEMSYS3... " >&6; } |
+if test "${enable_memsys3}" = "yes" -a "${enable_memsys5}" = "no"; then |
+ OPT_FEATURE_FLAGS+=" -DSQLITE_ENABLE_MEMSYS3" |
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 |
+$as_echo "yes" >&6; } |
+else |
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 |
+$as_echo "no" >&6; } |
+fi |
+ |
######### |
# See whether we should enable Full Text Search extensions |
# Check whether --enable-fts3 was given. |
@@ -11439,6 +11553,20 @@ if test "${enable_rtree}" = "yes" ; then |
fi |
######### |
+# See whether we should enable the SESSION extension |
+# Check whether --enable-session was given. |
+if test "${enable_session+set}" = set; then : |
+ enableval=$enable_session; enable_session=yes |
+else |
+ enable_session=no |
+fi |
+ |
+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 |
@@ -12023,7 +12151,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 |
# report actual input values of CONFIG_FILES etc. instead of their |
# values after options handling. |
ac_log=" |
-This file was extended by sqlite $as_me 3.10.2, which was |
+This file was extended by sqlite $as_me 3.17.0, which was |
generated by GNU Autoconf 2.69. Invocation command line was |
CONFIG_FILES = $CONFIG_FILES |
@@ -12089,7 +12217,7 @@ _ACEOF |
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 |
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" |
ac_cs_version="\\ |
-sqlite config.status 3.10.2 |
+sqlite config.status 3.17.0 |
configured by $0, generated by GNU Autoconf 2.69, |
with options \\"\$ac_cs_config\\" |