diff --git a/Makefile.in b/Makefile.in index d43b85453f..acde6d3380 100644 --- a/Makefile.in +++ b/Makefile.in @@ -121,9 +121,9 @@ last_change: $(SRC) libsqlite.la: $(LIBOBJ) $(LIBTOOL) $(TCC) -o libsqlite.la $(LIBOBJ) -rpath $(prefix)/lib -libtclsqlite.la: $(LIBOBJ) tclsqlite.lo - $(LIBTOOL) $(TCC) -o libtclsqlite.la $(LIBOBJ) tclsqlite.lo \ - $(LIBTCL) -rpath $(prefix)/lib +libtclsqlite.la: tclsqlite.lo libsqlite.la + $(LIBTOOL) $(TCC) -o libtclsqlite.la tclsqlite.lo \ + libsqlite.la $(LIBTCL) -rpath $(prefix)/lib sqlite: $(TOP)/src/shell.c libsqlite.la sqlite.h $(LIBTOOL) $(TCC) $(READLINE_FLAGS) -o sqlite $(TOP)/src/shell.c \ @@ -220,10 +220,10 @@ tclsqlite: $(TOP)/src/tclsqlite.c libsqlite.la $(LIBTOOL) $(TCC) $(TCL_FLAGS) -DTCLSH=1 -o tclsqlite \ $(TOP)/src/tclsqlite.c libsqlite.la $(LIBTCL) -testfixture: $(TOP)/src/tclsqlite.c libtclsqlite.la $(TESTSRC) +testfixture: $(TOP)/src/tclsqlite.c libtclsqlite.la libsqlite.la $(TESTSRC) $(LIBTOOL) $(TCC) $(TCL_FLAGS) -DTCLSH=1 -DSQLITE_TEST=1\ -o testfixture $(TESTSRC) $(TOP)/src/tclsqlite.c \ - libtclsqlite.la $(LIBTCL) + libtclsqlite.la libsqlite.la $(LIBTCL) fulltest: testfixture sqlite ./testfixture $(TOP)/test/all.test diff --git a/configure.in b/configure.in deleted file mode 100644 index 48f465a001..0000000000 --- a/configure.in +++ /dev/null @@ -1,489 +0,0 @@ -# -# This file describes a "configure" script that is used to build -# makefiles for a particular platform. Process this file using -# Autoconf version 1.13 in order to generate that script. All -# lines of this file up to the AC_INIT macro are ignored. -# -# The build process allows for using a cross-compiler. But the default -# action is to target the same platform that we are running on. The -# configure script needs to discover the following properties of the -# build and target systems: -# -# srcdir -# -# The is the name of the directory that contains the -# "configure" shell script. All source files are -# located relative to this directory. -# -# bindir -# -# The name of the directory where executables should be -# written by the "install" target of the makefile. -# -# program_prefix -# -# Add this prefix to the names of all executables that run -# on the target machine. Default: "" -# -# ENABLE_SHARED -# -# True if shared libraries should be generated. -# -# BUILD_CC -# -# The name of a command that is used to convert C -# source files into executables that run on the build -# platform. -# -# BUILD_CFLAGS -# -# Switches that the build compiler needs in order to construct -# command-line programs. -# -# BUILD_LIBS -# -# Libraries that the build compiler needs in order to construct -# command-line programs. -# -# BUILD_EXEEXT -# -# The filename extension for executables on the build -# platform. "" for Unix and ".exe" for Windows. -# -# TARGET_CC -# -# The name of a command that runs on the build platform -# and converts C source files into *.o files for the -# target platform. In other words, the cross-compiler. -# -# TARGET_CFLAGS -# -# Switches that the target compiler needs to turn C source files -# into *.o files. Do not include TARGET_TCL_INC in this list. -# Makefiles might add additional switches such as "-I.". -# -# TARGET_TCL_LIBS -# -# This is the library directives passed to the target linker -# that cause the executable to link against Tcl. This might -# be a switch like "-ltcl8.0" or pathnames of library file -# like "../../src/libtcl8.0.a". -# -# TARGET_TCL_INC -# -# This variables define the directory that contain header -# files for Tcl. If the compiler is able to find -# on its own, then this can be blank. -# -# TARGET_READLINE_LIBS -# -# This is the library directives passed to the target linker -# that cause the executable to link against the readline library. -# This might be a switch like "-lreadline" or pathnames of library -# file like "../../src/libreadline.a". -# -# TARGET_READLINE_INC -# -# This variables define the directory that contain header -# files for the readline library. If the compiler is able -# to find on its own, then this can be blank. -# -# TARGET_LINK -# -# The name of the linker that combines *.o files generated -# by TARGET_CC into executables for the target platform. -# -# TARGET_LIBS -# -# Additional libraries or other switch that the target linker needs -# to build an executable on the target. Do not include -# on this list any libraries in TARGET_TCL_LIBS and -# TARGET_READLINE_LIBS, etc. -# -# TARGET_EXEEXT -# -# The filename extension for executables on the -# target platform. "" for Unix and ".exe" for windows. -# -# The generated configure script will make an attempt to guess -# at all of the above parameters. You can override any of -# the guesses by setting the environment variable named -# "config_AAAA" where "AAAA" is the name of the parameter -# described above. (Exception: srcdir cannot be set this way.) -# If you have a file that sets one or more of these environment -# variables, you can invoke configure as follows: -# -# configure --with-hints=FILE -# -# where FILE is the name of the file that sets the environment -# variables. FILE should be an absolute pathname. -# -# If you have a Tcl/Tk/BLT source distribution available, then the -# files in that distribution will be used instead of any other -# Tcl/Tk/BLT files the script might discover if you tell the configure -# script about the source tree. Use commandline options: -# -# --with-tcl=PATH --with-tk=PATH --with-blt=PATH -# -# Or set environment variables config_WITH_TCL, config_WITH_TK, or -# config_WITH_BLT. -# -# This configure.in file is easy to reuse on other projects. Just -# change the argument to AC_INIT(). And disable any features that -# you don't need (for example BLT) by erasing or commenting out -# the corresponding code. -# -AC_INIT(src/sqlite.h.in) - -dnl Put the RCS revision string after AC_INIT so that it will also -dnl show in in configure. -# The following RCS revision string applies to configure.in -# $Revision: 1.11 $ - -######### -# Make sure we are not building in a subdirectory of the source tree. -# -changequote(<<<,>>>) -temp=`echo $srcdir | grep '[^./]'` -changequote([,]) -if test "$temp" = ""; then - AC_MSG_ERROR([ -************************************************************************** -** This program may not be compiled in the same directory that contains ** -** the configure script or any subdirectory of that directory. Rerun ** -** the configure script from a directory that is separate from the ** -** source tree. ** -** ** -** See the README file for additional information. ** -**************************************************************************]) -fi - -######### -# Set up an appropriate program prefix -# -if test "$program_prefix" = "NONE"; then - program_prefix="" -fi -AC_SUBST(program_prefix) - -######### -# Check to see if the --with-hints=FILE option is used. If there is none, -# then check for a files named "$host.hints" and ../$hosts.hints where -# $host is the hostname of the build system. If still no hints are -# found, try looking in $system.hints and ../$system.hints where -# $system is the result of uname -s. -# -AC_ARG_WITH(hints, - [ --with-hints=FILE Read configuration options from FILE], - hints=$withval) -if test "$hints" = ""; then - host=`hostname | sed 's/\..*//'` - if test -r $host.hints; then - hints=$host.hints - else - if test -r ../$host.hints; then - hints=../$host.hints - fi - fi -fi -if test "$hints" = ""; then - sys=`uname -s` - if test -r $sys.hints; then - hints=$sys.hints - else - if test -r ../$sys.hints; then - hints=../$sys.hints - fi - fi -fi -if test "$hints" != ""; then - AC_MSG_RESULT(reading hints from $hints) - . $hints -fi - -######### -# Locate a compiler for the build machine. This compiler should -# generate command-line programs that run on the build machine. -# -default_build_cflags="-g" -if test "$config_BUILD_CC" = ""; then - AC_PROG_CC - if test "$cross_compiling" = "yes"; then - AC_MSG_ERROR([unable to find a compiler for building build tools]) - fi - BUILD_CC=$CC - default_build_cflags=$CFLAGS -else - BUILD_CC=$config_BUILD_CC - AC_MSG_CHECKING([host compiler]) - CC=$BUILD_CC - AC_MSG_RESULT($BUILD_CC) -fi -AC_MSG_CHECKING([switches for the host compiler]) -if test "$config_BUILD_CFLAGS" != ""; then - CFLAGS=$config_BUILD_CFLAGS - BUILD_CFLAGS=$config_BUILD_CFLAGS -else - BUILD_CFLAGS=$default_build_cflags -fi -AC_MSG_RESULT($BUILD_CFLAGS) -if test "$config_BUILD_LIBS" != ""; then - BUILD_LIBS=$config_BUILD_LIBS -fi -AC_SUBST(BUILD_CC) -AC_SUBST(BUILD_CFLAGS) -AC_SUBST(BUILD_LIBS) - -########## -# Locate a compiler that converts C code into *.o files that run on -# the target machine. -# -AC_MSG_CHECKING([target compiler]) -if test "$config_TARGET_CC" != ""; then - TARGET_CC=$config_TARGET_CC -else - TARGET_CC=$BUILD_CC -fi -AC_MSG_RESULT($TARGET_CC) -AC_MSG_CHECKING([switches on the target compiler]) -if test "$config_TARGET_CFLAGS" != ""; then - TARGET_CFLAGS=$config_TARGET_CFLAGS -else - TARGET_CFLAGS=$BUILD_CFLAGS -fi -AC_MSG_RESULT($TARGET_CFLAGS) -AC_MSG_CHECKING([target linker]) -if test "$config_TARGET_LINK" = ""; then - TARGET_LINK=$TARGET_CC -else - TARGET_LINK=$config_TARGET_LINK -fi -AC_MSG_RESULT($TARGET_LINK) -AC_MSG_CHECKING([switches on the target compiler]) -if test "$config_TARGET_TFLAGS" != ""; then - TARGET_TFLAGS=$config_TARGET_TFLAGS -else - TARGET_TFLAGS=$BUILD_CFLAGS -fi -if test "$config_TARGET_RANLIB" != ""; then - TARGET_RANLIB=$config_TARGET_RANLIB -else - AC_PROG_RANLIB - TARGET_RANLIB=$RANLIB -fi -if test "$config_TARGET_AR" != ""; then - TARGET_AR=$config_TARGET_AR -else - TARGET_AR='ar cr' -fi -AC_MSG_RESULT($TARGET_TFLAGS) -AC_SUBST(TARGET_CC) -AC_SUBST(TARGET_CFLAGS) -AC_SUBST(TARGET_LINK) -AC_SUBST(TARGET_LFLAGS) -AC_SUBST(TARGET_RANLIB) -AC_SUBST(TARGET_AR) - -# Set the $cross variable if we are cross-compiling. Make -# it 0 if we are not. -# -AC_MSG_CHECKING([if host and target compilers are the same]) -if test "$BUILD_CC" = "$TARGET_CC"; then - cross=0 - AC_MSG_RESULT(yes) -else - cross=1 - AC_MSG_RESULT(no) -fi - -########## -# Are we using UTF-8 or iso8859 encodings? -# -AC_ARG_ENABLE(utf8, -[ --enable-utf8 Use UTF-8 encodings],,enable_utf8=no) -AC_MSG_CHECKING([character encoding]) -if test "$enable_utf8" = "no"; then - ENCODING=ISO8859 - AC_MSG_RESULT([iso8859]) -else - ENCODING=UTF8 - AC_MSG_RESULT([UTF-8]) -fi -AC_SUBST(ENCODING) - -########### -# Lots of things are different if we are compiling for Windows using -# the CYGWIN environment. So check for that special case and handle -# things accordingly. -# -AC_MSG_CHECKING([if executables have the .exe suffix]) -if test "$config_BUILD_EXEEXT" = ".exe"; then - CYGWIN=yes - AC_MSG_RESULT(yes) -else - AC_MSG_RESULT(unknown) -fi -if test "$CYGWIN" != "yes"; then - AC_CYGWIN -fi -if test "$CYGWIN" = "yes"; then - BUILD_EXEEXT=.exe -else - BUILD_EXEEXT="" -fi -if test "$cross" = "0"; then - TARGET_EXEEXT=$BUILD_EXEEXT -else - TARGET_EXEEXT=$config_TARGET_EXEEXT -fi -if test "$TARGET_EXEEXT" = ".exe"; then - OS_UNIX=0 - OS_WIN=1 - tclsubdir=win -else - OS_UNIX=1 - OS_WIN=0 - tclsubdir=unix -fi -TARGET_CFLAGS="$TARGET_CFLAGS -DOS_UNIX=$OS_UNIX -DOS_WIN=$OS_WIN" - -AC_SUBST(BUILD_EXEEXT) -AC_SUBST(OS_UNIX) -AC_SUBST(OS_WIN) -AC_SUBST(TARGET_EXEEXT) - -########## -# Extract generic linker options from the environment. -# -if test "$config_TARGET_LIBS" != ""; then - TARGET_LIBS=$config_TARGET_LIBS -else - TARGET_LIBS="" -fi -AC_SUBST(TARGET_LIBS) - -########## -# Figure out what C libraries are required to compile Tcl programs. -# -if test "$config_TARGET_TCL_LIBS" != ""; then - TARGET_TCL_LIBS="$config_TARGET_TCL_LIBS" -else - if test "$with_tcl" != ""; then - extra=`echo $with_tcl/$tclsubdir/libtcl8*.a` - fi - CC=$TARGET_CC - AC_CHECK_FUNC(sin, LIBS="", LIBS="-lm") - AC_CHECK_LIB(dl, dlopen) - otherlibs=$LIBS - if test "$extra" != ""; then - LIBS=$extra - else - LIBS="" - AC_SEARCH_LIBS(Tcl_Init, dnl - tcl8.4 tcl8.3 tcl8.2 tcl8.1 tcl8.0 tcl80 tcl,,,$otherlibs) - fi - TARGET_TCL_LIBS="$LIBS $otherlibs" -fi -AC_SUBST(TARGET_TCL_LIBS) - -########## -# Figure out where to get the TCL header files. -# -AC_MSG_CHECKING([TCL header files]) -found=no -if test "$config_TARGET_TCL_INC" != ""; then - TARGET_TCL_INC=$config_TARGET_TCL_INC - found=yes -else - if test "$with_tcl" != ""; then - TARGET_TCL_INC="-I$with_tcl/generic -I$with_tcl/$tclsubdir" - found=yes - else - TARGET_TCL_INC="" - found=no - fi -fi -if test "$found" = "yes"; then - AC_MSG_RESULT($TARGET_TCL_INC) -else - AC_MSG_RESULT(not specified: still searching...) - AC_CHECK_HEADER(tcl.h, [found=yes]) -fi -if test "$found" = "no"; then - for dir in /usr/local /usr/X11 /usr/X11R6 /usr/pkg /usr/contrib /usr; do - AC_CHECK_FILE($dir/include/tcl.h, found=yes) - if test "$found" = "yes"; then - TARGET_TCL_INC="-I$dir/include" - break - fi - done -fi -if test "$found" = "no"; then - TARGET_TCL_INC="-DNO_TCL=1" -fi -AC_SUBST(TARGET_TCL_INC) - -########## -# Figure out what C libraries are required to compile programs -# that use "readline()" library. -# -if test "$config_TARGET_READLINE_LIBS" != ""; then - TARGET_READLINE_LIBS="$config_TARGET_READLINE_LIBS" -else - CC=$TARGET_CC - LIBS="" - AC_SEARCH_LIBS(readline, readline,,,) - TARGET_READLINE_LIBS="$LIBS" -fi -AC_SUBST(TARGET_READLINE_LIBS) - -########## -# Figure out where to get the READLINE header files. -# -AC_MSG_CHECKING([readline header files]) -found=no -if test "$config_TARGET_READLINE_INC" != ""; then - TARGET_READLINE_INC=$config_TARGET_READLINE_INC - found=yes -fi -if test "$found" = "yes"; then - AC_MSG_RESULT($TARGET_READLINE_INC) -else - AC_MSG_RESULT(not specified: still searching...) - AC_CHECK_HEADER(readline.h, [found=yes]) -fi -if test "$found" = "no"; then - for dir in /usr /usr/local /usr/local/readline /usr/contrib; do - AC_CHECK_FILE($dir/include/readline.h, found=yes) - if test "$found" = "yes"; then - TARGET_READLINE_INC="-I$dir/include" - break - fi - AC_CHECK_FILE($dir/include/readline/readline.h, found=yes) - if test "$found" = "yes"; then - TARGET_READLINE_INC="-I$dir/include/readline" - break - fi - done -fi -if test "$found" = "yes"; then - if test "$TARGET_READLINE_LIBS" = ""; then - TARGET_HAVE_READLINE=0 - else - TARGET_HAVE_READLINE=1 - fi -else - TARGET_HAVE_READLINE=0 -fi -AC_SUBST(TARGET_READLINE_INC) -AC_SUBST(TARGET_HAVE_READLINE) - -######### -# Figure out whether or not we have a "usleep()" function. -# -AC_CHECK_FUNC(usleep, [TARGET_CFLAGS="$TARGET_CFLAGS -DHAVE_USLEEP=1"]) - -######### -# Generate the output files. -# -AC_OUTPUT(Makefile) diff --git a/manifest b/manifest index c8aa46035e..56f92a29fd 100644 --- a/manifest +++ b/manifest @@ -1,6 +1,6 @@ -C Comment\supdates\smost.\s\sAlso\ssome\ssmall\schanges\sto\sthe\sVDBE.\s(CVS\s339) -D 2002-01-06T17:07:40 -F Makefile.in 352fed589f09dd94347e0bb391d047118ebd6105 +C Makefile\schanges\sfrom\sAndreas\sRottmann\s(CVS\s340) +D 2002-01-07T19:04:21 +F Makefile.in 4b445b9a47f454ecd05220d803ee1b48a81f45ac F Makefile.template c88ffcb9c339e718f434d0c7f045bcd7eea125af F README a4c0ba11354ef6ba0776b400d057c59da47a4cc0 F VERSION 6565c509ed61af074681258bd346dca53ad38128 @@ -11,7 +11,6 @@ F config.status eea88b8fe8b8b82d69b886382061efa9b77131cc F config.sub f14b07d544ca26b5d698259045136b783e18fc7f F configure 9303d975dbd577fbe61e615045ddc02015b59fb5 x F configure.ac 38e2e5594cab99eb3a753b0614fcc36f4ddbbb48 -F configure.in 0000c0d62beb47cae1d2d81a197c7fe6efd56a45 F doc/lemon.html f0f682f50210928c07e562621c3b7e8ab912a538 F doc/report1.txt a031aaf37b185e4fa540223cb516d3bccec7eeac F install-sh 9d4de14ab9fb0facae2f48780b874848cbf2f895 @@ -105,7 +104,7 @@ F www/arch.fig d5f9752a4dbf242e9cfffffd3f5762b6c63b3bcf F www/arch.png 82ef36db1143828a7abc88b1e308a5f55d4336f4 F www/arch.tcl 72a0c80e9054cc7025a50928d28d9c75c02c2b8b F www/c_interface.tcl 9123810452845783fac8e3184929463d9e70d609 -F www/changes.tcl 3a2c158047b9a899dbaa7ff11979b246f568cb6a +F www/changes.tcl 9bb023d26ece0f6083816beb29ff03d17eeb7977 F www/crosscompile.tcl 3622ebbe518927a3854a12de51344673eb2dd060 F www/download.tcl 1ea61f9d89a2a5a9b2cee36b0d5cf97321bdefe0 F www/dynload.tcl 02eb8273aa78cfa9070dd4501dca937fb22b466c @@ -119,7 +118,7 @@ F www/speed.tcl 83457b2bf6bb430900bd48ca3dd98264d9a916a5 F www/sqlite.tcl 8b5884354cb615049aed83039f8dfe1552a44279 F www/tclsqlite.tcl 880ef67cb4f2797b95bf1368fc4e0d8ca0fda956 F www/vdbe.tcl 2013852c27a02a091d39a766bc87cff329f21218 -P 011be9a9d2632d261489005d97c69b0a0bc5a108 -R 6344d21046bf26426615521a28ec7ddb +P 9b0be4fcc1cbca69f5fee906f86dfb36a323fe84 +R bf419d8b9df57fd8ac55e43d882f9c8b U drh -Z d9e4a308acd11d4e3b3d3caeececa822 +Z 58d3c56a6be7deba646bdedee2cc6967 diff --git a/manifest.uuid b/manifest.uuid index d7b4c7383a..0af7bbd64c 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -9b0be4fcc1cbca69f5fee906f86dfb36a323fe84 \ No newline at end of file +e7004afbf808b6389e67e8a335c610227c76101b \ No newline at end of file diff --git a/www/changes.tcl b/www/changes.tcl index 0244232ccb..0d1e97e542 100644 --- a/www/changes.tcl +++ b/www/changes.tcl @@ -17,9 +17,11 @@ proc chng {date desc} { puts "

    $desc

" } -chng {2002 Jan 3 (2.2.1)} { +chng {2002 Jan 4 (2.2.1)} {
  • Bug fix: An attempt to delete a single row of a table with a WHERE clause of "ROWID=x" when no such rowid exists was causing an error.
    • +
  • Bug fix: Passing in a NULL as the 3rd parameter to sqlite_open() + would sometimes cause a coredump.
    • } chng {2001 Dec 22 (2.2.0)} {