| Index: third_party/sqlite/src/configure
|
| diff --git a/third_party/sqlite/src/configure b/third_party/sqlite/src/configure
|
| old mode 100644
|
| new mode 100755
|
| index 102307db0013f3cd422fe40e9e510291bf89c4fa..2c3706845a6497de42f1b1704ad68744db0b0dc6
|
| --- 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.62 for sqlite 3.7.6.3.
|
| +# Generated by GNU Autoconf 2.62 for sqlite 3.8.7.4.
|
| #
|
| # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
|
| # 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
|
| @@ -743,8 +743,8 @@ SHELL=${CONFIG_SHELL-/bin/sh}
|
| # Identity of this package.
|
| PACKAGE_NAME='sqlite'
|
| PACKAGE_TARNAME='sqlite'
|
| -PACKAGE_VERSION='3.7.6.3'
|
| -PACKAGE_STRING='sqlite 3.7.6.3'
|
| +PACKAGE_VERSION='3.8.7.4'
|
| +PACKAGE_STRING='sqlite 3.8.7.4'
|
| PACKAGE_BUGREPORT=''
|
|
|
| # Factoring default headers for most tests.
|
| @@ -874,12 +874,10 @@ TEMP_STORE
|
| BUILD_EXEEXT
|
| SQLITE_OS_UNIX
|
| SQLITE_OS_WIN
|
| -SQLITE_OS_OS2
|
| TARGET_EXEEXT
|
| TCL_VERSION
|
| TCL_BIN_DIR
|
| TCL_SRC_DIR
|
| -TCL_LIBS
|
| TCL_INCLUDE_SPEC
|
| TCL_LIB_FILE
|
| TCL_LIB_FLAG
|
| @@ -1485,7 +1483,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.7.6.3 to adapt to many kinds of systems.
|
| +\`configure' configures sqlite 3.8.7.4 to adapt to many kinds of systems.
|
|
|
| Usage: $0 [OPTION]... [VAR=VALUE]...
|
|
|
| @@ -1550,7 +1548,7 @@ fi
|
|
|
| if test -n "$ac_init_help"; then
|
| case $ac_init_help in
|
| - short | recursive ) echo "Configuration of sqlite 3.7.6.3:";;
|
| + short | recursive ) echo "Configuration of sqlite 3.8.7.4:";;
|
| esac
|
| cat <<\_ACEOF
|
|
|
| @@ -1666,7 +1664,7 @@ fi
|
| test -n "$ac_init_help" && exit $ac_status
|
| if $ac_init_version; then
|
| cat <<\_ACEOF
|
| -sqlite configure 3.7.6.3
|
| +sqlite configure 3.8.7.4
|
| generated by GNU Autoconf 2.62
|
|
|
| Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
|
| @@ -1680,7 +1678,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.7.6.3, which was
|
| +It was created by sqlite $as_me 3.8.7.4, which was
|
| generated by GNU Autoconf 2.62. Invocation command line was
|
|
|
| $ $0 $@
|
| @@ -3734,13 +3732,13 @@ if test "${lt_cv_nm_interface+set}" = set; then
|
| else
|
| lt_cv_nm_interface="BSD nm"
|
| echo "int some_variable = 0;" > conftest.$ac_ext
|
| - (eval echo "\"\$as_me:3737: $ac_compile\"" >&5)
|
| + (eval echo "\"\$as_me:3735: $ac_compile\"" >&5)
|
| (eval "$ac_compile" 2>conftest.err)
|
| cat conftest.err >&5
|
| - (eval echo "\"\$as_me:3740: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
|
| + (eval echo "\"\$as_me:3738: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
|
| (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
|
| cat conftest.err >&5
|
| - (eval echo "\"\$as_me:3743: output\"" >&5)
|
| + (eval echo "\"\$as_me:3741: output\"" >&5)
|
| cat conftest.out >&5
|
| if $GREP 'External.*some_variable' conftest.out > /dev/null; then
|
| lt_cv_nm_interface="MS dumpbin"
|
| @@ -4962,7 +4960,7 @@ ia64-*-hpux*)
|
| ;;
|
| *-*-irix6*)
|
| # Find out which ABI we are using.
|
| - echo '#line 4965 "configure"' > conftest.$ac_ext
|
| + echo '#line 4963 "configure"' > conftest.$ac_ext
|
| if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
|
| (eval $ac_compile) 2>&5
|
| ac_status=$?
|
| @@ -6831,11 +6829,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:6834: $lt_compile\"" >&5)
|
| + (eval echo "\"\$as_me:6832: $lt_compile\"" >&5)
|
| (eval "$lt_compile" 2>conftest.err)
|
| ac_status=$?
|
| cat conftest.err >&5
|
| - echo "$as_me:6838: \$? = $ac_status" >&5
|
| + echo "$as_me:6836: \$? = $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.
|
| @@ -7170,11 +7168,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:7173: $lt_compile\"" >&5)
|
| + (eval echo "\"\$as_me:7171: $lt_compile\"" >&5)
|
| (eval "$lt_compile" 2>conftest.err)
|
| ac_status=$?
|
| cat conftest.err >&5
|
| - echo "$as_me:7177: \$? = $ac_status" >&5
|
| + echo "$as_me:7175: \$? = $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.
|
| @@ -7275,11 +7273,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:7278: $lt_compile\"" >&5)
|
| + (eval echo "\"\$as_me:7276: $lt_compile\"" >&5)
|
| (eval "$lt_compile" 2>out/conftest.err)
|
| ac_status=$?
|
| cat out/conftest.err >&5
|
| - echo "$as_me:7282: \$? = $ac_status" >&5
|
| + echo "$as_me:7280: \$? = $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
|
| @@ -7330,11 +7328,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:7333: $lt_compile\"" >&5)
|
| + (eval echo "\"\$as_me:7331: $lt_compile\"" >&5)
|
| (eval "$lt_compile" 2>out/conftest.err)
|
| ac_status=$?
|
| cat out/conftest.err >&5
|
| - echo "$as_me:7337: \$? = $ac_status" >&5
|
| + echo "$as_me:7335: \$? = $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
|
| @@ -10143,7 +10141,7 @@ else
|
| lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
|
| lt_status=$lt_dlunknown
|
| cat > conftest.$ac_ext <<_LT_EOF
|
| -#line 10146 "configure"
|
| +#line 10144 "configure"
|
| #include "confdefs.h"
|
|
|
| #if HAVE_DLFCN_H
|
| @@ -10239,7 +10237,7 @@ else
|
| lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
|
| lt_status=$lt_dlunknown
|
| cat > conftest.$ac_ext <<_LT_EOF
|
| -#line 10242 "configure"
|
| +#line 10240 "configure"
|
| #include "confdefs.h"
|
|
|
| #if HAVE_DLFCN_H
|
| @@ -11992,7 +11990,8 @@ fi
|
|
|
|
|
|
|
| -for ac_header in sys/types.h stdlib.h stdint.h inttypes.h
|
| +
|
| +for ac_header in sys/types.h stdlib.h stdint.h inttypes.h malloc.h
|
| do
|
| as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
|
| if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
|
| @@ -12145,7 +12144,9 @@ done
|
|
|
|
|
|
|
| -for ac_func in usleep fdatasync localtime_r gmtime_r localtime_s
|
| +
|
| +
|
| +for ac_func in usleep fdatasync localtime_r gmtime_r localtime_s utime malloc_usable_size
|
| do
|
| as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
|
| { $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
|
| @@ -12255,7 +12256,7 @@ USE_AMALGAMATION=1
|
| # if not, then we fall back to plain tclsh.
|
| # TODO: try other versions before falling back?
|
| #
|
| -for ac_prog in tclsh8.5 tclsh
|
| +for ac_prog in tclsh8.6 tclsh8.5 tclsh
|
| do
|
| # Extract the first word of "$ac_prog", so it can be a program name with args.
|
| set dummy $ac_prog; ac_word=$2
|
| @@ -12711,21 +12712,12 @@ else
|
| TARGET_EXEEXT=$config_TARGET_EXEEXT
|
| fi
|
| if test "$TARGET_EXEEXT" = ".exe"; then
|
| - if test $OS2_SHELL ; then
|
| - SQLITE_OS_UNIX=0
|
| - SQLITE_OS_WIN=0
|
| - SQLITE_OS_OS2=1
|
| - CFLAGS="$CFLAGS -DSQLITE_OS_OS2=1"
|
| - else
|
| - SQLITE_OS_UNIX=0
|
| - SQLITE_OS_WIN=1
|
| - SQLITE_OS_OS2=0
|
| - CFLAGS="$CFLAGS -DSQLITE_OS_WIN=1"
|
| - fi
|
| + SQLITE_OS_UNIX=0
|
| + SQLITE_OS_WIN=1
|
| + CFLAGS="$CFLAGS -DSQLITE_OS_WIN=1"
|
| else
|
| SQLITE_OS_UNIX=1
|
| SQLITE_OS_WIN=0
|
| - SQLITE_OS_OS2=0
|
| CFLAGS="$CFLAGS -DSQLITE_OS_UNIX=1"
|
| fi
|
|
|
| @@ -12734,7 +12726,6 @@ fi
|
|
|
|
|
|
|
| -
|
| ##########
|
| # Figure out all the parameters needed to compile against Tcl.
|
| #
|
| @@ -12775,14 +12766,16 @@ $as_echo "$as_me: error: ${with_tclconfig} directory doesn't contain tclConfig.s
|
| fi
|
|
|
| # Start autosearch by asking tclsh
|
| - if test x"$cross_compiling" = xno; then
|
| - for i in `echo 'puts stdout $auto_path' | ${TCLSH_CMD}`
|
| - do
|
| - if test -f "$i/tclConfig.sh" ; then
|
| - ac_cv_c_tclconfig="$i"
|
| - break
|
| - fi
|
| - done
|
| + if test x"${ac_cv_c_tclconfig}" = x ; then
|
| + if test x"$cross_compiling" = xno; then
|
| + for i in `echo 'puts stdout $auto_path' | ${TCLSH_CMD}`
|
| + 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
|
| @@ -12904,7 +12897,6 @@ $as_echo "file not found" >&6; }
|
|
|
|
|
|
|
| -
|
| fi
|
| fi
|
| if test "${use_tcl}" = "no" ; then
|
| @@ -13440,6 +13432,93 @@ fi
|
|
|
| if test "${use_loadextension}" = "yes" ; then
|
| OPT_FEATURE_FLAGS=""
|
| + { $as_echo "$as_me:$LINENO: checking for library containing dlopen" >&5
|
| +$as_echo_n "checking for library containing dlopen... " >&6; }
|
| +if test "${ac_cv_search_dlopen+set}" = set; then
|
| + $as_echo_n "(cached) " >&6
|
| +else
|
| + ac_func_search_save_LIBS=$LIBS
|
| +cat >conftest.$ac_ext <<_ACEOF
|
| +/* confdefs.h. */
|
| +_ACEOF
|
| +cat confdefs.h >>conftest.$ac_ext
|
| +cat >>conftest.$ac_ext <<_ACEOF
|
| +/* 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 dlopen ();
|
| +int
|
| +main ()
|
| +{
|
| +return dlopen ();
|
| + ;
|
| + return 0;
|
| +}
|
| +_ACEOF
|
| +for ac_lib in '' dl; 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
|
| + rm -f conftest.$ac_objext conftest$ac_exeext
|
| +if { (ac_try="$ac_link"
|
| +case "(($ac_try" in
|
| + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
|
| + *) ac_try_echo=$ac_try;;
|
| +esac
|
| +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
|
| +$as_echo "$ac_try_echo") >&5
|
| + (eval "$ac_link") 2>conftest.er1
|
| + ac_status=$?
|
| + grep -v '^ *+' conftest.er1 >conftest.err
|
| + rm -f conftest.er1
|
| + cat conftest.err >&5
|
| + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
| + (exit $ac_status); } && {
|
| + test -z "$ac_c_werror_flag" ||
|
| + test ! -s conftest.err
|
| + } && test -s conftest$ac_exeext && {
|
| + test "$cross_compiling" = yes ||
|
| + $as_test_x conftest$ac_exeext
|
| + }; then
|
| + ac_cv_search_dlopen=$ac_res
|
| +else
|
| + $as_echo "$as_me: failed program was:" >&5
|
| +sed 's/^/| /' conftest.$ac_ext >&5
|
| +
|
| +
|
| +fi
|
| +
|
| +rm -rf conftest.dSYM
|
| +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
|
| + conftest$ac_exeext
|
| + if test "${ac_cv_search_dlopen+set}" = set; then
|
| + break
|
| +fi
|
| +done
|
| +if test "${ac_cv_search_dlopen+set}" = set; then
|
| + :
|
| +else
|
| + ac_cv_search_dlopen=no
|
| +fi
|
| +rm conftest.$ac_ext
|
| +LIBS=$ac_func_search_save_LIBS
|
| +fi
|
| +{ $as_echo "$as_me:$LINENO: result: $ac_cv_search_dlopen" >&5
|
| +$as_echo "$ac_cv_search_dlopen" >&6; }
|
| +ac_res=$ac_cv_search_dlopen
|
| +if test "$ac_res" != no; then
|
| + test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
|
| +
|
| +fi
|
| +
|
| else
|
| OPT_FEATURE_FLAGS="-DSQLITE_OMIT_LOAD_EXTENSION=1"
|
| fi
|
| @@ -13942,7 +14021,7 @@ exec 6>&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.7.6.3, which was
|
| +This file was extended by sqlite $as_me 3.8.7.4, which was
|
| generated by GNU Autoconf 2.62. Invocation command line was
|
|
|
| CONFIG_FILES = $CONFIG_FILES
|
| @@ -13995,7 +14074,7 @@ Report bugs to <bug-autoconf@gnu.org>."
|
| _ACEOF
|
| cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
|
| ac_cs_version="\\
|
| -sqlite config.status 3.7.6.3
|
| +sqlite config.status 3.8.7.4
|
| configured by $0, generated by GNU Autoconf 2.62,
|
| with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
|
|
|
|
|