Release 2.0-alpha-1 (CVS 247)

FossilOrigin-Name: 264f23315e682909abb47912f48733f641772a4c

diff --git a/Makefile.in b/Makefile.in
index b0213a2908d4c3adab38d005a799163efd163547..a4f9c3f1dd142ae6cf3906dd7384baa8703a8d1d 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,8 +1,19 @@
 #!/usr/make
 #
 # Makefile for SQLITE
+#
+# This makefile is suppose to be configured automatically using the
+# autoconf.  But if that does not work for you, you can configure
+# the makefile manually.  Just set the parameters below to values that
+# work well for your system.
+#
+# If the configure script does not work out-of-the-box, you might
+# be able to get it to work by giving it some hints.  See the comment
+# at the beginning of configure.in for additional information.
+#
 
-# The toplevel directory of the source tree
+# The toplevel directory of the source tree.  This is the directory
+# that contains this "Makefile.in" and the "configure.in" script.
 #
 TOP = @srcdir@
 
@@ -12,7 +23,8 @@ TOP = @srcdir@
 BCC = @BUILD_CC@ @BUILD_CFLAGS@
 
 # C Compile and options for use in building executables that 
-# will run on the target platform.
+# will run on the target platform.  (BCC and TCC are usually the
+# same unless your are cross-compiling.)
 #
 TCC = @TARGET_CC@ @TARGET_CFLAGS@ -I. -I${TOP}/src
 
@@ -21,14 +33,6 @@ TCC = @TARGET_CC@ @TARGET_CFLAGS@ -I. -I${TOP}/src
 AR = @TARGET_AR@
 RANLIB = @TARGET_RANLIB@
 
-# Compiler options needed for programs that use the GDBM library.
-#
-GDBM_FLAGS = @TARGET_GDBM_INC@
-
-# The library that programs using GDBM must link against.
-#
-LIBGDBM = @TARGET_GDBM_LIBS@
-
 # Compiler options needed for programs that use the TCL library.
 #
 TCL_FLAGS = @TARGET_TCL_INC@
@@ -45,6 +49,15 @@ READLINE_FLAGS = -DHAVE_READLINE=@TARGET_HAVE_READLINE@ @TARGET_READLINE_INC@
 #
 LIBREADLINE = @TARGET_READLINE_LIBS@
 
+# Should the database engine assume text is coded as UTF-8 or iso8859?
+#
+# ENCODING  = UTF8
+# ENCODING  = ISO8859
+ENCODING = @ENCODING@
+
+# You should not have to change anything below this line
+###############################################################################
+
 # Object files for the SQLite library.
 #
 LIBOBJ = btree.o build.o delete.o expr.o insert.o \
@@ -107,7 +120,7 @@ libsqlite.a:        $(LIBOBJ)
 
 sqlite:        $(TOP)/src/shell.c libsqlite.a sqlite.h
        $(TCC) $(READLINE_FLAGS) -o sqlite $(TOP)/src/shell.c \
-               libsqlite.a $(LIBGDBM) $(LIBREADLINE)
+               libsqlite.a $(LIBREADLINE)
 
 # Rules to build the LEMON compiler generator
 #
@@ -125,19 +138,19 @@ HDR = \
    parse.h
 
 btree.o:       $(TOP)/src/btree.c $(HDR) $(TOP)/src/pager.h
-       $(TCC) $(GDBM_FLAGS) -c $(TOP)/src/btree.c
+       $(TCC) -c $(TOP)/src/btree.c
 
 build.o:       $(TOP)/src/build.c $(HDR)
-       $(TCC) $(GDBM_FLAGS) -c $(TOP)/src/build.c
+       $(TCC) -c $(TOP)/src/build.c
 
 main.o:        $(TOP)/src/main.c $(HDR)
-       $(TCC) $(GDBM_FLAGS) -c $(TOP)/src/main.c
+       $(TCC) -c $(TOP)/src/main.c
 
 pager.o:       $(TOP)/src/pager.c $(HDR) $(TOP)/src/pager.h
-       $(TCC) $(GDBM_FLAGS) -c $(TOP)/src/pager.c
+       $(TCC) -c $(TOP)/src/pager.c
 
 parse.o:       parse.c $(HDR)
-       $(TCC) $(GDBM_FLAGS) -c parse.c
+       $(TCC) -c parse.c
 
 parse.h:       parse.c
 
@@ -147,59 +160,56 @@ parse.c:  $(TOP)/src/parse.y lemon
 
 sqlite.h:      $(TOP)/src/sqlite.h.in 
        sed -e s/--VERS--/`cat ${TOP}/VERSION`/ \
-            -e s/--ENCODING--/@ENCODING@/ \
+            -e s/--ENCODING--/$(ENCODING)/ \
                  $(TOP)/src/sqlite.h.in >sqlite.h
 
 tokenize.o:    $(TOP)/src/tokenize.c $(HDR)
-       $(TCC) $(GDBM_FLAGS) -c $(TOP)/src/tokenize.c
+       $(TCC) -c $(TOP)/src/tokenize.c
 
 util.o:        $(TOP)/src/util.c $(HDR)
-       $(TCC) $(GDBM_FLAGS) -c $(TOP)/src/util.c
+       $(TCC) -c $(TOP)/src/util.c
 
 vdbe.o:        $(TOP)/src/vdbe.c $(HDR)
-       $(TCC) $(GDBM_FLAGS) -c $(TOP)/src/vdbe.c
+       $(TCC) -c $(TOP)/src/vdbe.c
 
 where.o:       $(TOP)/src/where.c $(HDR)
-       $(TCC) $(GDBM_FLAGS) -c $(TOP)/src/where.c
+       $(TCC) -c $(TOP)/src/where.c
 
 delete.o:      $(TOP)/src/delete.c $(HDR)
-       $(TCC) $(GDBM_FLAGS) -c $(TOP)/src/delete.c
+       $(TCC) -c $(TOP)/src/delete.c
 
 expr.o:        $(TOP)/src/expr.c $(HDR)
-       $(TCC) $(GDBM_FLAGS) -c $(TOP)/src/expr.c
+       $(TCC) -c $(TOP)/src/expr.c
 
 insert.o:      $(TOP)/src/insert.c $(HDR)
-       $(TCC) $(GDBM_FLAGS) -c $(TOP)/src/insert.c
+       $(TCC) -c $(TOP)/src/insert.c
 
 random.o:      $(TOP)/src/random.c $(HDR)
-       $(TCC) $(GDBM_FLAGS) -c $(TOP)/src/random.c
+       $(TCC) -c $(TOP)/src/random.c
 
 select.o:      $(TOP)/src/select.c $(HDR)
-       $(TCC) $(GDBM_FLAGS) -c $(TOP)/src/select.c
+       $(TCC) -c $(TOP)/src/select.c
 
 table.o:       $(TOP)/src/table.c $(HDR)
-       $(TCC) $(GDBM_FLAGS) -c $(TOP)/src/table.c
+       $(TCC) -c $(TOP)/src/table.c
 
 update.o:      $(TOP)/src/update.c $(HDR)
-       $(TCC) $(GDBM_FLAGS) -c $(TOP)/src/update.c
+       $(TCC) -c $(TOP)/src/update.c
 
 tclsqlite.o:   $(TOP)/src/tclsqlite.c $(HDR)
-       $(TCC) $(GDBM_FLAGS) $(TCL_FLAGS) -c $(TOP)/src/tclsqlite.c
+       $(TCC) $(TCL_FLAGS) -c $(TOP)/src/tclsqlite.c
 
 printf.o:      $(TOP)/src/printf.c $(HDR)
-       $(TCC) $(GDBM_FLAGS) $(TCL_FLAGS) -c $(TOP)/src/printf.c
-
-gdbmdump:      $(TOP)/tool/gdbmdump.c
-       $(TCC) $(GDBM_FLAGS) -o gdbmdump $(TOP)/tool/gdbmdump.c $(LIBGDBM)
+       $(TCC) $(TCL_FLAGS) -c $(TOP)/src/printf.c
 
 tclsqlite:     $(TOP)/src/tclsqlite.c libsqlite.a
        $(TCC) $(TCL_FLAGS) -DTCLSH=1 -o tclsqlite \
-               $(TOP)/src/tclsqlite.c libsqlite.a $(LIBGDBM) $(LIBTCL)
+               $(TOP)/src/tclsqlite.c libsqlite.a $(LIBTCL)
 
 testfixture:   $(TOP)/src/tclsqlite.c libsqlite.a $(TESTSRC)
        $(TCC) $(TCL_FLAGS) -DTCLSH=1 -DSQLITE_TEST=1 -o testfixture \
                $(TESTSRC) $(TOP)/src/tclsqlite.c \
-               libsqlite.a $(LIBGDBM) $(LIBTCL)
+               libsqlite.a $(LIBTCL)
 
 test:  testfixture sqlite
        ./testfixture $(TOP)/test/all.test

diff --git a/VERSION b/VERSION
index 9084fa2f716a7117829f3f32a5f4cef400e02903..5671c39b699b82ae955366e5b9a86c782768864b 100644 (file)
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-1.1.0
+2.0-alpha-1

diff --git a/configure b/configure
index 5d1c70a6bcbf2ccc4b2b113ef1f8a67e68aa45d4..2a99d4f31f8df2d560f940e658281b6f1836aa2d 100755 (executable)
--- a/configure
+++ b/configure
@@ -15,8 +15,6 @@ ac_help="$ac_help
   --with-hints=FILE       Read configuration options from FILE"
 ac_help="$ac_help
   --enable-utf8           Use UTF-8 encodings"
-ac_help="$ac_help
-  --disable-gdbm          Omit the GDBM drivers"
 
 # Initialize some variables set by options.
 # The variables have the same names as the options, with
@@ -529,7 +527,7 @@ fi
 
 
 # The following RCS revision string applies to configure.in
-# $Revision: 1.10 $
+# $Revision: 1.11 $
 
 #########
 # Make sure we are not building in a subdirectory of the source tree.
@@ -604,7 +602,7 @@ if test "$config_BUILD_CC" = ""; then
   # Extract the first word of "gcc", so it can be a program name with args.
 set dummy gcc; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:608: checking for $ac_word" >&5
+echo "configure:606: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -634,7 +632,7 @@ if test -z "$CC"; then
   # Extract the first word of "cc", so it can be a program name with args.
 set dummy cc; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:638: checking for $ac_word" >&5
+echo "configure:636: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -685,7 +683,7 @@ fi
       # Extract the first word of "cl", so it can be a program name with args.
 set dummy cl; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:689: checking for $ac_word" >&5
+echo "configure:687: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -717,7 +715,7 @@ fi
 fi
 
 echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6
-echo "configure:721: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
+echo "configure:719: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
 
 ac_ext=c
 # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
@@ -728,12 +726,12 @@ cross_compiling=$ac_cv_prog_cc_cross
 
 cat > conftest.$ac_ext << EOF
 
-#line 732 "configure"
+#line 730 "configure"
 #include "confdefs.h"
 
 main(){return(0);}
 EOF
-if { (eval echo configure:737: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:735: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   ac_cv_prog_cc_works=yes
   # If we can't run a trivial program, we are probably using a cross compiler.
   if (./conftest; exit) 2>/dev/null; then
@@ -759,12 +757,12 @@ if test $ac_cv_prog_cc_works = no; then
   { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; }
 fi
 echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
-echo "configure:763: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
+echo "configure:761: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
 echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6
 cross_compiling=$ac_cv_prog_cc_cross
 
 echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6
-echo "configure:768: checking whether we are using GNU C" >&5
+echo "configure:766: checking whether we are using GNU C" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -773,7 +771,7 @@ else
   yes;
 #endif
 EOF
-if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:777: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
+if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:775: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
   ac_cv_prog_gcc=yes
 else
   ac_cv_prog_gcc=no
@@ -792,7 +790,7 @@ ac_test_CFLAGS="${CFLAGS+set}"
 ac_save_CFLAGS="$CFLAGS"
 CFLAGS=
 echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
-echo "configure:796: checking whether ${CC-cc} accepts -g" >&5
+echo "configure:794: checking whether ${CC-cc} accepts -g" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -831,12 +829,12 @@ fi
 else
   BUILD_CC=$config_BUILD_CC
   echo $ac_n "checking host compiler""... $ac_c" 1>&6
-echo "configure:835: checking host compiler" >&5
+echo "configure:833: checking host compiler" >&5
   CC=$BUILD_CC
   echo "$ac_t""$BUILD_CC" 1>&6
 fi
 echo $ac_n "checking switches for the host compiler""... $ac_c" 1>&6
-echo "configure:840: checking switches for the host compiler" >&5
+echo "configure:838: checking switches for the host compiler" >&5
 if test "$config_BUILD_CFLAGS" != ""; then
   CFLAGS=$config_BUILD_CFLAGS
   BUILD_CFLAGS=$config_BUILD_CFLAGS
@@ -856,7 +854,7 @@ fi
 # the target machine.
 #
 echo $ac_n "checking target compiler""... $ac_c" 1>&6
-echo "configure:860: checking target compiler" >&5
+echo "configure:858: checking target compiler" >&5
 if test "$config_TARGET_CC" != ""; then
   TARGET_CC=$config_TARGET_CC
 else
@@ -864,7 +862,7 @@ else
 fi
 echo "$ac_t""$TARGET_CC" 1>&6
 echo $ac_n "checking switches on the target compiler""... $ac_c" 1>&6
-echo "configure:868: checking switches on the target compiler" >&5
+echo "configure:866: checking switches on the target compiler" >&5
 if test "$config_TARGET_CFLAGS" != ""; then
   TARGET_CFLAGS=$config_TARGET_CFLAGS
 else
@@ -872,7 +870,7 @@ else
 fi
 echo "$ac_t""$TARGET_CFLAGS" 1>&6
 echo $ac_n "checking target linker""... $ac_c" 1>&6
-echo "configure:876: checking target linker" >&5
+echo "configure:874: checking target linker" >&5
 if test "$config_TARGET_LINK" = ""; then
   TARGET_LINK=$TARGET_CC
 else
@@ -880,7 +878,7 @@ else
 fi
 echo "$ac_t""$TARGET_LINK" 1>&6
 echo $ac_n "checking switches on the target compiler""... $ac_c" 1>&6
-echo "configure:884: checking switches on the target compiler" >&5
+echo "configure:882: checking switches on the target compiler" >&5
 if test "$config_TARGET_TFLAGS" != ""; then
   TARGET_TFLAGS=$config_TARGET_TFLAGS
 else
@@ -892,7 +890,7 @@ else
   # Extract the first word of "ranlib", so it can be a program name with args.
 set dummy ranlib; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:896: checking for $ac_word" >&5
+echo "configure:894: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -938,7 +936,7 @@ echo "$ac_t""$TARGET_TFLAGS" 1>&6
 # it 0 if we are not.
 #
 echo $ac_n "checking if host and target compilers are the same""... $ac_c" 1>&6
-echo "configure:942: checking if host and target compilers are the same" >&5
+echo "configure:940: checking if host and target compilers are the same" >&5
 if test "$BUILD_CC" = "$TARGET_CC"; then
   cross=0
   echo "$ac_t""yes" 1>&6
@@ -959,7 +957,7 @@ else
 fi
 
 echo $ac_n "checking character encoding""... $ac_c" 1>&6
-echo "configure:963: checking character encoding" >&5
+echo "configure:961: checking character encoding" >&5
 if test "$enable_utf8" = "no"; then
   ENCODING=ISO8859
   echo "$ac_t""iso8859" 1>&6
@@ -975,7 +973,7 @@ fi
 # things accordingly.
 #
 echo $ac_n "checking if executables have the .exe suffix""... $ac_c" 1>&6
-echo "configure:979: checking if executables have the .exe suffix" >&5
+echo "configure:977: checking if executables have the .exe suffix" >&5
 if test "$config_BUILD_EXEEXT" = ".exe"; then
   CYGWIN=yes
   echo "$ac_t""yes" 1>&6
@@ -984,12 +982,12 @@ else
 fi
 if test "$CYGWIN" != "yes"; then
   echo $ac_n "checking for Cygwin environment""... $ac_c" 1>&6
-echo "configure:988: checking for Cygwin environment" >&5
+echo "configure:986: checking for Cygwin environment" >&5
 if eval "test \"`echo '$''{'ac_cv_cygwin'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 993 "configure"
+#line 991 "configure"
 #include "confdefs.h"
 
 int main() {
@@ -1000,7 +998,7 @@ int main() {
 return __CYGWIN__;
 ; return 0; }
 EOF
-if { (eval echo configure:1004: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:1002: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_cygwin=yes
 else
@@ -1064,12 +1062,12 @@ else
   fi
   CC=$TARGET_CC
   echo $ac_n "checking for sin""... $ac_c" 1>&6
-echo "configure:1068: checking for sin" >&5
+echo "configure:1066: checking for sin" >&5
 if eval "test \"`echo '$''{'ac_cv_func_sin'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 1073 "configure"
+#line 1071 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char sin(); below.  */
@@ -1092,7 +1090,7 @@ sin();
 
 ; return 0; }
 EOF
-if { (eval echo configure:1096: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1094: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_sin=yes"
 else
@@ -1113,7 +1111,7 @@ LIBS="-lm"
 fi
 
   echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6
-echo "configure:1117: checking for dlopen in -ldl" >&5
+echo "configure:1115: checking for dlopen in -ldl" >&5
 ac_lib_var=`echo dl'_'dlopen | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -1121,7 +1119,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-ldl  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 1125 "configure"
+#line 1123 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -1132,7 +1130,7 @@ int main() {
 dlopen()
 ; return 0; }
 EOF
-if { (eval echo configure:1136: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1134: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -1166,14 +1164,14 @@ fi
     LIBS=""
     
 echo $ac_n "checking for library containing Tcl_Init""... $ac_c" 1>&6
-echo "configure:1170: checking for library containing Tcl_Init" >&5
+echo "configure:1168: checking for library containing Tcl_Init" >&5
 if eval "test \"`echo '$''{'ac_cv_search_Tcl_Init'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   ac_func_search_save_LIBS="$LIBS"
 ac_cv_search_Tcl_Init="no"
 cat > conftest.$ac_ext <<EOF
-#line 1177 "configure"
+#line 1175 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -1184,7 +1182,7 @@ int main() {
 Tcl_Init()
 ; return 0; }
 EOF
-if { (eval echo configure:1188: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1186: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   ac_cv_search_Tcl_Init="none required"
 else
@@ -1195,7 +1193,7 @@ rm -f conftest*
 test "$ac_cv_search_Tcl_Init" = "no" && for i in         tcl8.4 tcl8.3 tcl8.2 tcl8.1 tcl8.0 tcl80 tcl; do
 LIBS="-l$i $otherlibs $ac_func_search_save_LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 1199 "configure"
+#line 1197 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -1206,7 +1204,7 @@ int main() {
 Tcl_Init()
 ; return 0; }
 EOF
-if { (eval echo configure:1210: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1208: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   ac_cv_search_Tcl_Init="-l$i"
 break
@@ -1235,7 +1233,7 @@ fi
 # Figure out where to get the TCL header files.
 #
 echo $ac_n "checking TCL header files""... $ac_c" 1>&6
-echo "configure:1239: checking TCL header files" >&5
+echo "configure:1237: checking TCL header files" >&5
 found=no
 if test "$config_TARGET_TCL_INC" != ""; then
   TARGET_TCL_INC=$config_TARGET_TCL_INC
@@ -1254,7 +1252,7 @@ if test "$found" = "yes"; then
 else
   echo "$ac_t""not specified: still searching..." 1>&6
   echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6
-echo "configure:1258: checking how to run the C preprocessor" >&5
+echo "configure:1256: checking how to run the C preprocessor" >&5
 # On Suns, sometimes $CPP names a directory.
 if test -n "$CPP" && test -d "$CPP"; then
   CPP=
@@ -1269,13 +1267,13 @@ else
   # On the NeXT, cc -E runs the code through the compiler's parser,
   # not just through cpp.
   cat > conftest.$ac_ext <<EOF
-#line 1273 "configure"
+#line 1271 "configure"
 #include "confdefs.h"
 #include <assert.h>
 Syntax Error
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1279: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1277: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   :
@@ -1286,13 +1284,13 @@ else
   rm -rf conftest*
   CPP="${CC-cc} -E -traditional-cpp"
   cat > conftest.$ac_ext <<EOF
-#line 1290 "configure"
+#line 1288 "configure"
 #include "confdefs.h"
 #include <assert.h>
 Syntax Error
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1296: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1294: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   :
@@ -1303,13 +1301,13 @@ else
   rm -rf conftest*
   CPP="${CC-cc} -nologo -E"
   cat > conftest.$ac_ext <<EOF
-#line 1307 "configure"
+#line 1305 "configure"
 #include "confdefs.h"
 #include <assert.h>
 Syntax Error
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1313: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1311: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   :
@@ -1335,17 +1333,17 @@ echo "$ac_t""$CPP" 1>&6
 
 ac_safe=`echo "tcl.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for tcl.h""... $ac_c" 1>&6
-echo "configure:1339: checking for tcl.h" >&5
+echo "configure:1337: checking for tcl.h" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 1344 "configure"
+#line 1342 "configure"
 #include "confdefs.h"
 #include <tcl.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1349: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1347: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -1372,7 +1370,7 @@ if test "$found" = "no"; then
     
 ac_safe=`echo "$dir/include/tcl.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $dir/include/tcl.h""... $ac_c" 1>&6
-echo "configure:1376: checking for $dir/include/tcl.h" >&5
+echo "configure:1374: checking for $dir/include/tcl.h" >&5
 if eval "test \"`echo '$''{'ac_cv_file_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1405,182 +1403,6 @@ if test "$found" = "no"; then
 fi
 
 
-##########
-# Figure out what C libraries are required to compile programs
-# that use GDBM.
-#
-use_gdbm=true
-# Check whether --enable-gdbm or --disable-gdbm was given.
-if test "${enable_gdbm+set}" = set; then
-  enableval="$enable_gdbm"
-  use_gdbm=$enableval
-else
-  use_gdbm=true
-
-fi
-
-if test "$use_gdbm" = "no"; then use_gdbm=false; fi
-if test "$use_gdbm" = "yes"; then use_gdbm=true; fi
-if $use_gdbm; then
-  if test "$config_TARGET_GDBM_LIBS" != ""; then
-    TARGET_GDBM_LIBS="$config_TARGET_GDBM_LIBS"
-  else
-    CC=$TARGET_CC
-    LIBS=""
-    
-echo $ac_n "checking for library containing gdbm_open""... $ac_c" 1>&6
-echo "configure:1433: checking for library containing gdbm_open" >&5
-if eval "test \"`echo '$''{'ac_cv_search_gdbm_open'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  ac_func_search_save_LIBS="$LIBS"
-ac_cv_search_gdbm_open="no"
-cat > conftest.$ac_ext <<EOF
-#line 1440 "configure"
-#include "confdefs.h"
-/* Override any gcc2 internal prototype to avoid an error.  */
-/* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
-char gdbm_open();
-
-int main() {
-gdbm_open()
-; return 0; }
-EOF
-if { (eval echo configure:1451: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  ac_cv_search_gdbm_open="none required"
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-fi
-rm -f conftest*
-test "$ac_cv_search_gdbm_open" = "no" && for i in gdbm; do
-LIBS="-l$i  $ac_func_search_save_LIBS"
-cat > conftest.$ac_ext <<EOF
-#line 1462 "configure"
-#include "confdefs.h"
-/* Override any gcc2 internal prototype to avoid an error.  */
-/* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
-char gdbm_open();
-
-int main() {
-gdbm_open()
-; return 0; }
-EOF
-if { (eval echo configure:1473: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  ac_cv_search_gdbm_open="-l$i"
-break
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-fi
-rm -f conftest*
-done
-LIBS="$ac_func_search_save_LIBS"
-fi
-
-echo "$ac_t""$ac_cv_search_gdbm_open" 1>&6
-if test "$ac_cv_search_gdbm_open" != "no"; then
-  test "$ac_cv_search_gdbm_open" = "none required" || LIBS="$ac_cv_search_gdbm_open $LIBS"
-  
-else :
-  
-fi
-    TARGET_GDBM_LIBS="$LIBS"
-  fi
-fi
-
-
-##########
-# Figure out where to get the GDBM header files.
-#
-if $use_gdbm; then
-  echo $ac_n "checking GDBM header files""... $ac_c" 1>&6
-echo "configure:1503: checking GDBM header files" >&5
-  found=no
-  if test "$config_TARGET_GDBM_INC" != ""; then
-    TARGET_GDBM_INC=$config_TARGET_GDBM_INC
-    found=yes
-  fi
-  if test "$found" = "yes"; then
-    echo "$ac_t""$TARGET_GDBM_INC" 1>&6
-  else
-    echo "$ac_t""not specified: still searching..." 1>&6
-    ac_safe=`echo "gdbm.h" | sed 'y%./+-%__p_%'`
-echo $ac_n "checking for gdbm.h""... $ac_c" 1>&6
-echo "configure:1515: checking for gdbm.h" >&5
-if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 1520 "configure"
-#include "confdefs.h"
-#include <gdbm.h>
-EOF
-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1525: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
-if test -z "$ac_err"; then
-  rm -rf conftest*
-  eval "ac_cv_header_$ac_safe=yes"
-else
-  echo "$ac_err" >&5
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_header_$ac_safe=no"
-fi
-rm -f conftest*
-fi
-if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-  found=yes
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-  fi
-  if test "$found" = "no"; then
-    for dir in /usr/local /usr/pkg /usr/contrib; do
-      
-ac_safe=`echo "$dir/include/gdbm.h" | sed 'y%./+-%__p_%'`
-echo $ac_n "checking for $dir/include/gdbm.h""... $ac_c" 1>&6
-echo "configure:1552: checking for $dir/include/gdbm.h" >&5
-if eval "test \"`echo '$''{'ac_cv_file_$ac_safe'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test "$cross_compiling" = yes; then
-    { echo "configure: error: Cannot check for file existence when cross compiling" 1>&2; exit 1; }
-else
-  if test -r $dir/include/gdbm.h; then
-    eval "ac_cv_file_$ac_safe=yes"
-  else
-    eval "ac_cv_file_$ac_safe=no"
-  fi
-fi
-fi
-if eval "test \"`echo '$ac_cv_file_'$ac_safe`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-  found=yes
-else
-  echo "$ac_t""no" 1>&6
-
-fi
-
-      if test "$found" = "yes"; then
-        TARGET_GDBM_INC="-I$dir/include"
-        break
-      fi
-    done
-  fi
-else
-  TARGET_GDBM_INC="-DDISABLE_GDBM"
-fi
-
-
 ##########
 # Figure out what C libraries are required to compile programs
 # that use "readline()" library.
@@ -1592,14 +1414,14 @@ else
   LIBS=""
   
 echo $ac_n "checking for library containing readline""... $ac_c" 1>&6
-echo "configure:1596: checking for library containing readline" >&5
+echo "configure:1418: checking for library containing readline" >&5
 if eval "test \"`echo '$''{'ac_cv_search_readline'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   ac_func_search_save_LIBS="$LIBS"
 ac_cv_search_readline="no"
 cat > conftest.$ac_ext <<EOF
-#line 1603 "configure"
+#line 1425 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -1610,7 +1432,7 @@ int main() {
 readline()
 ; return 0; }
 EOF
-if { (eval echo configure:1614: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1436: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   ac_cv_search_readline="none required"
 else
@@ -1621,7 +1443,7 @@ rm -f conftest*
 test "$ac_cv_search_readline" = "no" && for i in readline; do
 LIBS="-l$i  $ac_func_search_save_LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 1625 "configure"
+#line 1447 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -1632,7 +1454,7 @@ int main() {
 readline()
 ; return 0; }
 EOF
-if { (eval echo configure:1636: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1458: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   ac_cv_search_readline="-l$i"
 break
@@ -1660,7 +1482,7 @@ fi
 # Figure out where to get the READLINE header files.
 #
 echo $ac_n "checking readline header files""... $ac_c" 1>&6
-echo "configure:1664: checking readline header files" >&5
+echo "configure:1486: checking readline header files" >&5
 found=no
 if test "$config_TARGET_READLINE_INC" != ""; then
   TARGET_READLINE_INC=$config_TARGET_READLINE_INC
@@ -1672,17 +1494,17 @@ else
   echo "$ac_t""not specified: still searching..." 1>&6
   ac_safe=`echo "readline.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for readline.h""... $ac_c" 1>&6
-echo "configure:1676: checking for readline.h" >&5
+echo "configure:1498: checking for readline.h" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 1681 "configure"
+#line 1503 "configure"
 #include "confdefs.h"
 #include <readline.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1686: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1508: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -1709,7 +1531,7 @@ if test "$found" = "no"; then
     
 ac_safe=`echo "$dir/include/readline.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $dir/include/readline.h""... $ac_c" 1>&6
-echo "configure:1713: checking for $dir/include/readline.h" >&5
+echo "configure:1535: checking for $dir/include/readline.h" >&5
 if eval "test \"`echo '$''{'ac_cv_file_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1738,7 +1560,7 @@ fi
     
 ac_safe=`echo "$dir/include/readline/readline.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $dir/include/readline/readline.h""... $ac_c" 1>&6
-echo "configure:1742: checking for $dir/include/readline/readline.h" >&5
+echo "configure:1564: checking for $dir/include/readline/readline.h" >&5
 if eval "test \"`echo '$''{'ac_cv_file_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1782,12 +1604,12 @@ fi
 # Figure out whether or not we have a "usleep()" function.
 #
 echo $ac_n "checking for usleep""... $ac_c" 1>&6
-echo "configure:1786: checking for usleep" >&5
+echo "configure:1608: checking for usleep" >&5
 if eval "test \"`echo '$''{'ac_cv_func_usleep'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 1791 "configure"
+#line 1613 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char usleep(); below.  */
@@ -1810,7 +1632,7 @@ usleep();
 
 ; return 0; }
 EOF
-if { (eval echo configure:1814: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1636: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_usleep=yes"
 else
@@ -1998,8 +1820,6 @@ s%@TARGET_LIBS@%$TARGET_LIBS%g
 s%@TARGET_TCL_LIBS@%$TARGET_TCL_LIBS%g
 s%@CPP@%$CPP%g
 s%@TARGET_TCL_INC@%$TARGET_TCL_INC%g
-s%@TARGET_GDBM_LIBS@%$TARGET_GDBM_LIBS%g
-s%@TARGET_GDBM_INC@%$TARGET_GDBM_INC%g
 s%@TARGET_READLINE_LIBS@%$TARGET_READLINE_LIBS%g
 s%@TARGET_READLINE_INC@%$TARGET_READLINE_INC%g
 s%@TARGET_HAVE_READLINE@%$TARGET_HAVE_READLINE%g

diff --git a/configure.in b/configure.in
index 8e0ec93c76012e397bf832057667936806933e8d..48f465a00194d1d5a28af1b76ae68f29e1654d46 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -75,25 +75,12 @@
 #        files for Tcl.  If the compiler is able to find <tcl.h>
 #        on its own, then this can be blank.
 #
-#    TARGET_GDBM_LIBS
-#
-#        This is the library directives passed to the target linker
-#        that cause the executable to link against GDBM.  This might
-#        be a switch like "-lgdbm" or pathnames of library file
-#        like "../../src/libgdbm.a".
-#
-#    TARGET_GDBM_INC
-#
-#        This variables define the directory that contain header
-#        files for GDBM.  If the compiler is able to find <gdbm.h>
-#        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 GDBM.  This might
-#        be a switch like "-lreadline" or pathnames of library file
-#        like "../../src/libreadline.a".
+#        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
 #
@@ -110,7 +97,7 @@
 #
 #        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, TARGET_GDBM_LIBS,
+#        on this list any libraries in TARGET_TCL_LIBS and
 #        TARGET_READLINE_LIBS, etc.
 #
 #    TARGET_EXEEXT
@@ -151,7 +138,7 @@ 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.10 $
+# $Revision: 1.11 $
 
 #########
 # Make sure we are not building in a subdirectory of the source tree.
@@ -436,59 +423,6 @@ if test "$found" = "no"; then
 fi
 AC_SUBST(TARGET_TCL_INC)
 
-##########
-# Figure out what C libraries are required to compile programs
-# that use GDBM.
-#
-use_gdbm=true
-AC_ARG_ENABLE(gdbm, 
-[  --disable-gdbm          Omit the GDBM drivers],
-  use_gdbm=$enableval, use_gdbm=true
-)
-if test "$use_gdbm" = "no"; then use_gdbm=false; fi
-if test "$use_gdbm" = "yes"; then use_gdbm=true; fi
-if $use_gdbm; then
-  if test "$config_TARGET_GDBM_LIBS" != ""; then
-    TARGET_GDBM_LIBS="$config_TARGET_GDBM_LIBS"
-  else
-    CC=$TARGET_CC
-    LIBS=""
-    AC_SEARCH_LIBS(gdbm_open, gdbm,,,)
-    TARGET_GDBM_LIBS="$LIBS"
-  fi
-fi
-AC_SUBST(TARGET_GDBM_LIBS)
-
-##########
-# Figure out where to get the GDBM header files.
-#
-if $use_gdbm; then
-  AC_MSG_CHECKING([GDBM header files])
-  found=no
-  if test "$config_TARGET_GDBM_INC" != ""; then
-    TARGET_GDBM_INC=$config_TARGET_GDBM_INC
-    found=yes
-  fi
-  if test "$found" = "yes"; then
-    AC_MSG_RESULT($TARGET_GDBM_INC)
-  else
-    AC_MSG_RESULT(not specified: still searching...)
-    AC_CHECK_HEADER(gdbm.h, [found=yes])
-  fi
-  if test "$found" = "no"; then
-    for dir in /usr/local /usr/pkg /usr/contrib; do
-      AC_CHECK_FILE($dir/include/gdbm.h, found=yes)
-      if test "$found" = "yes"; then
-        TARGET_GDBM_INC="-I$dir/include"
-        break
-      fi
-    done
-  fi
-else
-  TARGET_GDBM_INC="-DDISABLE_GDBM"
-fi
-AC_SUBST(TARGET_GDBM_INC)
-
 ##########
 # Figure out what C libraries are required to compile programs
 # that use "readline()" library.

diff --git a/manifest b/manifest
index 5e0c6287e84d863c89fbd84e35a4c599bb350043..ae357ca530e1f453cc051383e72a926df6e72f0d 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,11 +1,11 @@
-C Everything\sis\sworking\son\sLinux.\s\sThis\sis\srelease\s2.0-Alpha-1.\s(CVS\s246)
-D 2001-09-15T00:57:28
+C Release\s2.0-alpha-1\s(CVS\s247)
+D 2001-09-15T00:58:00
 F COPYRIGHT 74a8a6531a42e124df07ab5599aad63870fa0bd4
-F Makefile.in 7ecb2370b5cb34d390af1fcb3118ea6d84a253ca
+F Makefile.in 6f4536369ce59b0ee7941f743c65c2c7f703ad2a
 F README 51f6a4e7408b34afa5bc1c0485f61b6a4efb6958
-F VERSION 05e17b646a817240c206186f94f8f4c70974d5dc
-F configure d2051345f49f7e48604423da26e086a745c86a47 x
-F configure.in e7465c88bbfb76882f97769c2dd90dbba8eca5db
+F VERSION 5148a9efa1b036cfd2fb64b3d15ff0455211a8e9
+F configure aad857a97ca28a584228869186eb4cd7dbebbb3a x
+F configure.in 0000c0d62beb47cae1d2d81a197c7fe6efd56a45
 F doc/lemon.html 3ddeef6e5dee69a2bb6f5d8e4975b58f2fd8e11c
 F doc/report1.txt 734cbae63b1310cc643fe5e9e3da1ab55a79b99e
 F notes/notes1.txt b7c0812b704a022e88c621146ae50955c923d464
@@ -67,7 +67,7 @@ F test/malloc.test 3daa97f6a9577d8f4c6e468b274333af19ce5861
 F test/pager.test 5b9d0958c85139087d6e53569c447af64bed252e
 F test/printf.test 4c71871e1a75a2dacb673945fc13ddb30168798f
 F test/quote.test 40a3164af8456933a81312803fa8cdb21b205c12
-F test/rowid.test b01e6dec09780c93f55db6cfe7ad097323954f23
+F test/rowid.test 2329d6c7cfb62293bfb219b33542f894d0d6917a
 F test/select1.test 223507655cdb4f9901d83fa7f5c5328e022c211f
 F test/select2.test d47c78fda07a088985b688dde42c96b46165a87f
 F test/select3.test a9234b8424b6c6d71de534f43b91ade9be68e9cc
@@ -83,8 +83,6 @@ F test/trans.test 1727a0ebf0f3fb6714fcdc016cb9655b55dddbaa
 F test/update.test 72c0c93310483b86dc904a992220c5b84c7ce100
 F test/vacuum.test 135b57e0947ed65e92cf7e1eab64bcefd8cf9519
 F test/where.test 755957829c493b1b7ad1ecb27d6c782131a6b3d5
-F tool/gdbmdump.c 529e67c78d920606ba196326ea55b57b75fcc82b
-F tool/gdbmstat.c 56a9033531e5f5a48413f6ec436d5fb0341632c1
 F tool/lemon.c e007bfdbc79a51a4cd7c8a5f81f517cebd121150
 F tool/lempar.c 276d8ab73e2ff99da5333c035ee81c78d829bb90
 F tool/memleak.awk a0a11dd84bf4582acc81c3c61271021ae49b3f15
@@ -107,7 +105,7 @@ F www/opcode.tcl cb3a1abf8b7b9be9f3a228d097d6bf8b742c2b6f
 F www/sqlite.tcl cb0d23d8f061a80543928755ec7775da6e4f362f
 F www/tclsqlite.tcl 06f81c401f79a04f2c5ebfb97e7c176225c0aef2
 F www/vdbe.tcl 0c8aaa529dd216ccbf7daaabd80985e413d5f9ad
-P 5e3724603e6f52bb74deb1c62e6e8f323d7b64b7
-R f702824af0e6fb733e46f0ad203329d6
+P 14474fa144fe7c5dc63e0990d6cc92d769e6013e
+R e56932550882bb08b5533a7aa309b70c
 U drh
-Z 7366e408d799dcad27172164daf780cc
+Z a235c7cc967e6bb6f207b8f3132939fd

diff --git a/manifest.uuid b/manifest.uuid
index 29687e51d541791e1056bb2c56cfeed645af6c46..5a2fee9d7bdeb235cae6b02b65b03bffd50b5e32 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-14474fa144fe7c5dc63e0990d6cc92d769e6013e
\ No newline at end of file
+264f23315e682909abb47912f48733f641772a4c
\ No newline at end of file

diff --git a/test/rowid.test b/test/rowid.test
index 14ba42bf75899ad89d3a2541e1e6800ff161790d..3c5df631ee9d62069a92efc3046d80ec299cc8c8 100644 (file)
--- a/test/rowid.test
+++ b/test/rowid.test
@@ -24,7 +24,7 @@
 # focus of this file is testing the magic ROWID column that is
 # found on all tables.
 #
-# $Id: rowid.test,v 1.2 2001/08/19 18:19:46 drh Exp $
+# $Id: rowid.test,v 1.3 2001/09/15 00:58:01 drh Exp $
 
 set testdir [file dirname $argv0]
 source $testdir/tester.tcl
@@ -265,3 +265,5 @@ do_test rowid-5.1 {
   execsql {DELETE FROM t1 WHERE _rowid_ IN (SELECT oid FROM t1 WHERE x>8)}
   execsql {SELECT max(x) FROM t1}
 } {8}
+
+finish_test

diff --git a/tool/gdbmdump.c b/tool/gdbmdump.c
deleted file mode 100644 (file)
index 4385355..0000000
--- a/tool/gdbmdump.c
+++ /dev/null
@@ -1,90 +0,0 @@
-/*
-** Copyright (c) 1999, 2000 D. Richard Hipp
-**
-** This program is free software; you can redistribute it and/or
-** modify it under the terms of the GNU General Public
-** License as published by the Free Software Foundation; either
-** version 2 of the License, or (at your option) any later version.
-**
-** This program is distributed in the hope that it will be useful,
-** but WITHOUT ANY WARRANTY; without even the implied warranty of
-** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-** General Public License for more details.
-** 
-** You should have received a copy of the GNU General Public
-** License along with this library; if not, write to the
-** Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-** Boston, MA  02111-1307, USA.
-**
-** Author contact information:
-**   drh@hwaci.com
-**   http://www.hwaci.com/drh/
-**
-*************************************************************************
-** A utility to dump the entire contents of a GDBM table in a 
-** readable format.
-*/
-#include <stdio.h>
-#include <ctype.h>
-#include <gdbm.h>
-#include <stdlib.h>
-
-static void print_data(char *zPrefix, datum p){
-  int i, j;
-
-  printf("%-5s: ", zPrefix);
-  for(i=0; i<p.dsize; i+=20){
-    for(j=i; j<p.dsize && j<i+20; j++){
-      printf("%02x", 0xff & p.dptr[j]);
-      if( (j&3)==3 ) printf(" ");
-    }
-    while( j<i+20 ){
-      printf("  ");
-      if( (j&3)==3 ) printf(" ");
-      j++;
-    }
-    printf(" ");
-    for(j=i; j<p.dsize && j<i+20; j++){
-      int c = p.dptr[j];
-      if( !isprint(c) ){ c = '.'; }
-      putchar(c);
-    }
-    printf("\n");
-    if( i+20<p.dsize ) printf("       ");
-  }
-}
-
-static int gdbm_dump(char *zFilename){
-  GDBM_FILE p;
-  datum data, key, next;
-
-  p = gdbm_open(zFilename, 0, GDBM_READER, 0, 0);
-  if( p==0 ){
-    fprintf(stderr,"can't open file \"%s\"\n", zFilename);
-    return 1;
-  }
-  key = gdbm_firstkey(p);
-  while( key.dptr ){
-    print_data("key",key);
-    data = gdbm_fetch(p, key);
-    if( data.dptr ){
-      print_data("data",data);
-      free( data.dptr );
-    }
-    next = gdbm_nextkey(p, key);
-    free( key.dptr );
-    key = next;
-    printf("\n");
-  }
-  gdbm_close(p);
-  return 0;
-}
-
-int main(int argc, char **argv){
-  int i;
-  int nErr = 0;
-  for(i=1; i<argc; i++){
-    nErr += gdbm_dump(argv[i]);
-  }
-  return nErr;
-}

diff --git a/tool/gdbmstat.c b/tool/gdbmstat.c
deleted file mode 100644 (file)
index 00b200e..0000000
--- a/tool/gdbmstat.c
+++ /dev/null
@@ -1,144 +0,0 @@
-/*
-** Copyright (c) 1999, 2000 D. Richard Hipp
-**
-** This program is free software; you can redistribute it and/or
-** modify it under the terms of the GNU General Public
-** License as published by the Free Software Foundation; either
-** version 2 of the License, or (at your option) any later version.
-**
-** This program is distributed in the hope that it will be useful,
-** but WITHOUT ANY WARRANTY; without even the implied warranty of
-** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-** General Public License for more details.
-** 
-** You should have received a copy of the GNU General Public
-** License along with this library; if not, write to the
-** Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-** Boston, MA  02111-1307, USA.
-**
-** Author contact information:
-**   drh@hwaci.com
-**   http://www.hwaci.com/drh/
-**
-*************************************************************************
-** A utility print statistics about the content of a GDBM database.
-*/
-#include <stdio.h>
-#include <ctype.h>
-#include <gdbm.h>
-#include <stdlib.h>
-
-static int bins[] = {
-  4, 8, 12, 16, 24,
-  32, 40, 48, 56, 64,
-  80, 96, 112, 128, 144, 160, 176, 192, 208, 224, 240, 256,
-  288, 320, 352, 384, 416, 448, 480, 512, 1024, 2048, 4096, 8192,
-  16384, 32768, 65536,
-};
-#define NBIN (sizeof(bins)/sizeof(bins[0])+1)
-
-static int gAllSize[NBIN];
-static int gCount;
-static int gTotal;
-static int gMax;
-static int gKey;
-static int gMaxKey;
-
-static int gdbm_stat(char *zFilename){
-  GDBM_FILE p;
-  datum data, key, next;
-  int nEntry = 0;
-  int keyTotal = 0;
-  int dataTotal = 0;
-  int allTotal = 0;
-  int lMax = 0;
-  int keySize[NBIN], dataSize[NBIN], allSize[NBIN];
-  int i, priorSize;
-
-  p = gdbm_open(zFilename, 0, GDBM_READER, 0, 0);
-  if( p==0 ){
-    fprintf(stderr,"can't open file \"%s\"\n", zFilename);
-    return 1;
-  }
-  for(i=0; i<NBIN; i++){
-    keySize[i] = 0;
-    dataSize[i] = 0;
-    allSize[i] = 0;
-  }
-  key = gdbm_firstkey(p);
-  while( key.dptr ){
-    int all;
-    nEntry++;
-    gCount++;
-    keyTotal += key.dsize;
-    for(i=0; i<NBIN-1 && key.dsize>bins[i]; i++){}
-    keySize[i]++;
-    gKey += key.dsize;
-    if( key.dsize>gMaxKey ) gMaxKey = key.dsize;
-    data = gdbm_fetch(p, key);
-    if( data.dptr==0 ) data.dsize = 0;
-    dataTotal += data.dsize;
-    for(i=0; i<NBIN-1 && data.dsize>bins[i]; i++){}
-    dataSize[i]++;
-    all = key.dsize + data.dsize;
-    allTotal += all;
-    gTotal += all;
-    if( all>gMax ) gMax = all;
-    if( all>lMax ) lMax = all;
-    for(i=0; i<NBIN-1 && all>bins[i]; i++){}
-    allSize[i]++;
-    gAllSize[i]++;
-    next = gdbm_nextkey(p, key);
-    free( key.dptr );
-    key = next;
-  }
-  gdbm_close(p);
-  printf("%s:\n", zFilename);
-  printf("  entries: %d\n", nEntry);
-  printf("  keysize: %d (%d per entry)\n", 
-       keyTotal, nEntry>0 ? (keyTotal+nEntry-1)/nEntry : 0);
-  printf("  datasize: %d (%d per entry)\n",
-       dataTotal, nEntry>0 ? (dataTotal+nEntry-1)/nEntry : 0);
-  printf("  size: %d (%d per entry)\n",
-       allTotal, nEntry>0 ? (allTotal+nEntry-1)/nEntry : 0);
-  priorSize = 0;
-  for(i=0; i<NBIN-1; i++){
-    if( keySize[i]==0 && dataSize[i]==0 ) continue;
-    printf("%5d..%-5d   %7d  %7d  %7d\n", priorSize, bins[i], keySize[i],
-      dataSize[i], allSize[i]);
-    priorSize = bins[i]+1;
-  }
-  if( keySize[NBIN-1]>0 || dataSize[NBIN-1]>0 ){
-    printf("%5d..%-5d   %7d  %7d  %7d\n", priorSize, lMax,
-       keySize[NBIN-1], dataSize[NBIN-1], allSize[NBIN-1]);
-  }
-  return 0;
-}
-
-int main(int argc, char **argv){
-  int i, ps, sum;
-  int nErr = 0;
-  for(i=1; i<argc; i++){
-    nErr += gdbm_stat(argv[i]);
-  }
-  printf("*****************************************************************\n");
-  printf("Entries:      %d\n", gCount);
-  printf("Size:         %d\n", gTotal);
-  printf("Avg Size:     %d\n", gCount>0 ? (gTotal + gCount - 1)/gCount : 0);
-  printf("Key Size:     %d\n", gKey);
-  printf("Avg Key Size: %d\n", gCount>0 ? (gKey + gCount - 1)/gCount : 0);
-  printf("Max Key Size: %d\n\n", gMaxKey);
-  ps = 0;
-  sum = 0;
-  for(i=0; i<NBIN-1; i++){
-    if( gAllSize[i]==0 ) continue;
-    sum += gAllSize[i];
-    printf("%5d..%-5d   %8d  %3d%%\n", 
-      ps, bins[i], gAllSize[i], sum*100/gCount);
-    ps = bins[i]+1;
-  }
-  if( gAllSize[NBIN-1]>0 ){
-    printf("%5d..%-5d   %8d  100%%\n", ps, gMax, gAllSize[NBIN-1]);
-  }
-  return nErr;
-}