fix a configuration problem on TAC-4 (CVS 113)

FossilOrigin-Name: 69b73ea3a0822ce16e69813b387d596b183e7892

diff --git a/manifest b/manifest
index 045e94edac9ca3f4597ab614e7799d0851ca9af4..e0c3e9c8ff767d3fc43f7dfb987d0ae4a02c0f89 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C documentation\supdates\s(CVS\s112)
-D 2000-07-30T20:04:43
+C fix\sa\sconfiguration\sproblem\son\sTAC-4\s(CVS\s113)
+D 2000-07-31T11:57:37
 F COPYRIGHT 74a8a6531a42e124df07ab5599aad63870fa0bd4
 F Makefile.in 9e6dcd232e594fb599a5e9ba8bcf45e6c6e2fe72
 F README 51f6a4e7408b34afa5bc1c0485f61b6a4efb6958
@@ -15,13 +15,13 @@ F src/insert.c f146f149ad2422a1dc3bfa7a1651a25940f98958
 F src/main.c 82dba47063cb9837910c3bcefacb47de7486fb47
 F src/parse.y 754653f073ee03749471f86ef1bca641b35887c7
 F src/select.c d382e96c2221d08367cc87976f2b574537c9de97
-F src/shell.c 3fd7424c80654b0de8ca08165bd3c3ffe49930fe
+F src/shell.c a5eb8ee9d5f90e735900a92e7fc364a54deb2cfb
 F src/sqlite.h 82ae53028e27919250f886ff9d7c4927de81978a
 F src/sqliteInt.h 74eb0e266e05d10278e2c20a2cd8fe9fd9fa0d1a
 F src/tclsqlite.c 9f358618ae803bedf4fb96da5154fd45023bc1f7
 F src/tokenize.c 77ff8164a8751994bc9926ce282847f653ac0c16
 F src/update.c 51b9ef7434b15e31096155da920302e9db0d27fc
-F src/util.c fcd7ac9d2be8353f746e52f665e6c4f5d6b3b805
+F src/util.c b75b33e6bd5d47898bb7ed9fdd0dea4fe7c19b00
 F src/vdbe.c 4308e226d5b33a72dfe2c88a44eb0a63381fe24b
 F src/vdbe.h 6c5653241633c583549c2d8097394ab52550eb63
 F src/where.c 420f666a38b405cd58bd7af832ed99f1dbc7d336
@@ -66,7 +66,7 @@ F www/lang.tcl 1645e9107d75709be4c6099b643db235bbe0a151
 F www/opcode.tcl cb3a1abf8b7b9be9f3a228d097d6bf8b742c2b6f
 F www/sqlite.tcl 69781eaffb02e17aa4af28b76a2bedb19baa8e9f
 F www/vdbe.tcl bcbfc33bcdd0ebad95eab31286adb9e1bc289520
-P 57022a9d504e553d862f363b164c42ba53d8b489
-R f7bf520ee9c56f3008ca4098d4e4be60
+P c686c6076abadcb715fe74436fa8bab48d013b26
+R 4b5d25c1fd551b5627ff072af101684f
 U drh
-Z d5fb118e39f2c1e4c12a967c5d47998a
+Z 18beaeaf9ea7aa5b47007ee5bc459a87

diff --git a/manifest.uuid b/manifest.uuid
index aa5608d8f2e7c454acffa1adba21f54a6f2d66bf..8c20ad586d1e3e783cce5645cad795d021e0e17e 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-c686c6076abadcb715fe74436fa8bab48d013b26
\ No newline at end of file
+69b73ea3a0822ce16e69813b387d596b183e7892
\ No newline at end of file

diff --git a/src/shell.c b/src/shell.c
index ffaa82adef333d45e219a75975b42de28fdf2fb2..b8888342c7306b5c72609076cea139d1997bccf5 100644 (file)
--- a/src/shell.c
+++ b/src/shell.c
@@ -24,7 +24,7 @@
 ** This file contains code to implement the "sqlite" command line
 ** utility for accessing SQLite databases.
 **
-** $Id: shell.c,v 1.17 2000/07/29 13:20:21 drh Exp $
+** $Id: shell.c,v 1.18 2000/07/31 11:57:37 drh Exp $
 */
 #include <stdlib.h>
 #include <string.h>
@@ -33,7 +33,7 @@
 #include <unistd.h>
 #include <ctype.h>
 
-#if !defined(NO_READLINE)
+#if defined(HAVE_READLINE) && HAVE_READLINE==1
 # include <readline/readline.h>
 # include <readline/history.h>
 #else

diff --git a/src/util.c b/src/util.c
index 0d96bcdd5dc8c4062e29bb0d2ff8ecc940a5c685..9e94d46e4e476bec795d11c2911294c8ff5c2ba0 100644 (file)
--- a/src/util.c
+++ b/src/util.c
@@ -26,7 +26,7 @@
 ** This file contains functions for allocating memory, comparing
 ** strings, and stuff like that.
 **
-** $Id: util.c,v 1.13 2000/06/21 13:59:12 drh Exp $
+** $Id: util.c,v 1.14 2000/07/31 11:57:37 drh Exp $
 */
 #include "sqliteInt.h"
 #include <stdarg.h>
@@ -605,9 +605,9 @@ int main(int argc, char **argv){
 #endif
 
 /*
-** This routine is used for sorting.  Each key is a list one or more
-** null-terminated strings.  The list is terminated by two null in
-** a row.  For example, the following text is strings:
+** This routine is used for sorting.  Each key is a list of one or more
+** null-terminated strings.  The list is terminated by two nulls in
+** a row.  For example, the following text is key with three strings:
 **
 **            +one\000-two\000+three\000\000
 **