Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(697)

Unified Diff: third_party/sqlite/src/autoconf/configure.ac

Issue 1610963002: Import SQLite 3.10.2. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « third_party/sqlite/src/autoconf/config.sub ('k') | third_party/sqlite/src/autoconf/depcomp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: third_party/sqlite/src/autoconf/configure.ac
diff --git a/third_party/sqlite/src/autoconf/configure.ac b/third_party/sqlite/src/autoconf/configure.ac
index 46b6563edca3742643298f873ef40585f3d6edd4..2200daffeeefc5cf4ed4dadb42b0abb8b411d5bf 100644
--- a/third_party/sqlite/src/autoconf/configure.ac
+++ b/third_party/sqlite/src/autoconf/configure.ac
@@ -4,11 +4,13 @@
#
# --enable-threadsafe
# --enable-readline
+# --enable-editline
+# --enable-static-shell
# --enable-dynamic-extensions
#
AC_PREREQ(2.61)
-AC_INIT(sqlite, 3.7.5, http://www.sqlite.org)
+AC_INIT(sqlite, --SQLITE-VERSION--, http://www.sqlite.org)
AC_CONFIG_SRCDIR([sqlite3.c])
# Use automake.
@@ -18,7 +20,6 @@ AC_SYS_LARGEFILE
# Check for required programs.
AC_PROG_CC
-AC_PROG_RANLIB
AC_PROG_LIBTOOL
AC_PROG_MKDIR_P
@@ -30,12 +31,29 @@ AC_CONFIG_FILES([Makefile sqlite3.pc])
AC_SUBST(BUILD_CFLAGS)
#-----------------------------------------------------------------------
+# --enable-editline
# --enable-readline
#
+AC_ARG_ENABLE(editline, [AS_HELP_STRING(
+ [--enable-editline],
+ [use BSD libedit])],
+ [], [enable_editline=yes])
AC_ARG_ENABLE(readline, [AS_HELP_STRING(
[--enable-readline],
- [use readline in shell tool (yes, no) [default=yes]])],
- [], [enable_readline=yes])
+ [use readline])],
+ [], [enable_readline=no])
+if test x"$enable_editline" != xno ; then
+ sLIBS=$LIBS
+ LIBS=""
+ AC_SEARCH_LIBS([readline],[edit],[enable_readline=no],[enable_editline=no])
+ READLINE_LIBS=$LIBS
+ if test x"$LIBS" != "x"; then
+ AC_DEFINE([HAVE_EDITLINE],1,Define to use BSD editline)
+ else
+ unset ac_cv_search_readline
+ fi
+ LIBS=$sLIBS
+fi
if test x"$enable_readline" != xno ; then
sLIBS=$LIBS
LIBS=""
@@ -78,6 +96,46 @@ AC_MSG_RESULT($enable_dynamic_extensions)
AC_SUBST(DYNAMIC_EXTENSION_FLAGS)
#-----------------------------------------------------------------------
+#-----------------------------------------------------------------------
+# --enable-fts5
+#
+AC_ARG_ENABLE(fts5, [AS_HELP_STRING(
+ [--enable-fts5], [include fts5 support [default=no]])],
+ [], [enable_fts5=no])
+if test x"$enable_fts5" == "xyes"; then
+ AC_SEARCH_LIBS(log, m)
+ FTS5_FLAGS=-DSQLITE_ENABLE_FTS5
+fi
+AC_SUBST(FTS5_FLAGS)
+#-----------------------------------------------------------------------
+
+#-----------------------------------------------------------------------
+# --enable-json1
+#
+AC_ARG_ENABLE(json1, [AS_HELP_STRING(
+ [--enable-json1], [include json1 support [default=no]])],
+ [], [enable_json1=no])
+if test x"$enable_json1" == "xyes"; then
+ JSON1_FLAGS=-DSQLITE_ENABLE_JSON1
+fi
+AC_SUBST(JSON1_FLAGS)
+#-----------------------------------------------------------------------
+
+#-----------------------------------------------------------------------
+# --enable-static-shell
+#
+AC_ARG_ENABLE(static-shell, [AS_HELP_STRING(
+ [--enable-static-shell],
+ [statically link libsqlite3 into shell tool [default=yes]])],
+ [], [enable_static_shell=yes])
+if test x"$enable_static_shell" == "xyes"; then
+ EXTRA_SHELL_OBJ=sqlite3.$OBJEXT
+else
+ EXTRA_SHELL_OBJ=libsqlite3.la
+fi
+AC_SUBST(EXTRA_SHELL_OBJ)
+#-----------------------------------------------------------------------
+
AC_CHECK_FUNCS(posix_fallocate)
#-----------------------------------------------------------------------
« no previous file with comments | « third_party/sqlite/src/autoconf/config.sub ('k') | third_party/sqlite/src/autoconf/depcomp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698