Minor changes to do with the Tcl tea extension package autoconf system.

FossilOrigin-Name: f10a6111262ce6ee6984c64fa0e0023642eca27d

diff --git a/autoconf/tea/Makefile.in b/autoconf/tea/Makefile.in
index 08b1a44182583706cfa0d618ce4b73d667566636..a8708974b0f478a15aff8d44d25b6c0aaf6fa11e 100644 (file)
--- a/autoconf/tea/Makefile.in
+++ b/autoconf/tea/Makefile.in
@@ -73,6 +73,7 @@ exec_prefix   = @exec_prefix@
 
 bindir         = @bindir@
 libdir         = @libdir@
+datarootdir    = @datarootdir@
 datadir                = @datadir@
 mandir         = @mandir@
 includedir     = @includedir@

diff --git a/autoconf/tea/configure.in b/autoconf/tea/configure.in
index ec9c565c6feb82c36ff0b64dbed43cd1b5d5c761..8df0af61958f4769732b15a153b44de6e52a4944 100644 (file)
--- a/autoconf/tea/configure.in
+++ b/autoconf/tea/configure.in
@@ -166,8 +166,10 @@ AC_DEFINE(USE_TCL_STUBS, 1, [Use Tcl stubs])
 #--------------------------------------------------------------------
 # Redefine fdatasync as fsync on systems that lack fdatasync
 #--------------------------------------------------------------------
-
-AC_CHECK_FUNC(fdatasync, , AC_DEFINE(fdatasync, fsync))
+#
+#AC_CHECK_FUNC(fdatasync, , AC_DEFINE(fdatasync, fsync))
+# Check for library functions that SQLite can optionally use.
+AC_CHECK_FUNCS([fdatasync usleep fullfsync localtime_r gmtime_r])
 
 AC_FUNC_STRERROR_R
 

diff --git a/autoconf/tea/tclconfig/tcl.m4 b/autoconf/tea/tclconfig/tcl.m4
index 66214e78a2848c911c10596d8445b36131e4f226..4b4bd1e888964cc55c78a97591f40538cd5b21ec 100644 (file)
--- a/autoconf/tea/tclconfig/tcl.m4
+++ b/autoconf/tea/tclconfig/tcl.m4
@@ -1641,6 +1641,7 @@ AC_DEFUN([TEA_CONFIG_CFLAGS], [
            SHLIB_CFLAGS="-fPIC"
            SHLIB_LD="${CC} -shared"
            TCL_SHLIB_LD_EXTRAS="-Wl,-soname=\$[@]"
+           TK_SHLIB_LD_EXTRAS="-Wl,-soname,\$[@]"
            SHLIB_SUFFIX=".so"
            LDFLAGS=""
            AS_IF([test $doRpath = yes], [
@@ -1651,11 +1652,15 @@ AC_DEFUN([TEA_CONFIG_CFLAGS], [
                LIBS=`echo $LIBS | sed s/-pthread//`
                CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
                LDFLAGS="$LDFLAGS $PTHREAD_LIBS"])
-           # Version numbers are dot-stripped by system policy.
-           TCL_TRIM_DOTS=`echo ${PACKAGE_VERSION} | tr -d .`
-           UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.a'
-           SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so.1'
-           TCL_LIB_VERSIONS_OK=nodots
+           case $system in
+           FreeBSD-3.*)
+               # Version numbers are dot-stripped by system policy.
+               TCL_TRIM_DOTS=`echo ${VERSION} | tr -d .`
+               UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.a'
+               SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.so'
+               TCL_LIB_VERSIONS_OK=nodots
+               ;;
+           esac
            ;;
        Darwin-*)
            CFLAGS_OPTIMIZE="-Os"
@@ -1826,8 +1831,8 @@ AC_DEFUN([TEA_CONFIG_CFLAGS], [
                SHLIB_CFLAGS="-fPIC -melf"
                LDFLAGS="$LDFLAGS -melf -Wl,-Bexport"
            ], [
-              SHLIB_CFLAGS="-Kpic -belf"
-              LDFLAGS="$LDFLAGS -belf -Wl,-Bexport"
+               SHLIB_CFLAGS="-Kpic -belf"
+               LDFLAGS="$LDFLAGS -belf -Wl,-Bexport"
            ])
            SHLIB_LD="ld -G"
            SHLIB_LD_LIBS=""
@@ -4158,8 +4163,6 @@ AC_DEFUN([TEA_PATH_CELIB], [
        fi
     fi
 ])
-
-
 # Local Variables:
 # mode: autoconf
 # End:

diff --git a/manifest b/manifest
index 6b5562f42e671d58d51c88bb94379011fca130e5..963d7945931460e65249e2bee15efb55296617af 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Refactor\sthe\snames\sof\sstate\sobjects\sin\sthe\scommand-line\sshell\simplementation..
-D 2014-08-18T13:45:42.156
+C Minor\schanges\sto\sdo\swith\sthe\sTcl\stea\sextension\spackage\sautoconf\ssystem.
+D 2014-08-19T09:15:41.141
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in 5eb79e334a5de69c87740edd56af6527dd219308
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -23,15 +23,15 @@ F autoconf/depcomp 0b26f101e3bc9fd1ff0be1da9fb4a82371142f92 x
 F autoconf/install-sh 06ee6336e63bb845c8439d777c32eb2eccc4fbf1 x
 F autoconf/ltmain.sh 7a658a24028f02331c1d2446562758083c5eadd1
 F autoconf/missing d7c9981a81af13370d4ed152b24c0a82b7028585 x
-F autoconf/tea/Makefile.in 5c3b0bdfb66c20d55ebff59d1718864461570ca9
+F autoconf/tea/Makefile.in d55bcc63832caf0309c2ff80358756116618cfca
 F autoconf/tea/README 3e9a3c060f29a44344ab50aec506f4db903fb873
 F autoconf/tea/aclocal.m4 52c47aac44ce0ddb1f918b6993e8beb8eee88f43
-F autoconf/tea/configure.in e0466b881b53f31f5a4a69e7a91ad130902fb359
+F autoconf/tea/configure.in 93d43c79e936fb16556e22498177d7e8571efa04
 F autoconf/tea/doc/sqlite3.n e1fe45d4f5286ee3d0ccc877aca2a0def488e9bb
 F autoconf/tea/license.terms 13bd403c9610fd2b76ece0ab50c4c5eda933d523
 F autoconf/tea/pkgIndex.tcl.in 3ef61715cf1c7bdcff56947ffadb26bc991ca39d
 F autoconf/tea/tclconfig/install-sh bdd5e293591621ae60d9824d86a4b1c5f22c3d00
-F autoconf/tea/tclconfig/tcl.m4 f035b86539a5ab30689e997a11ae9e7fd2e65570
+F autoconf/tea/tclconfig/tcl.m4 66ddf0a5d5e4b1d29bff472c0985fd7fa89d0fb5
 F autoconf/tea/win/makefile.vc f89d0184d0eee5f7e356ea407964dcd139939928
 F autoconf/tea/win/nmakehlp.c 2070e086f39866b353a482d3a14dedaf26196506
 F autoconf/tea/win/rules.vc c511f222b80064096b705dbeb97060ee1d6b6d63
@@ -231,7 +231,7 @@ F src/sqliteInt.h 641f8fbb65ca2084c8df95b525f6f82c7a1e91ae
 F src/sqliteLimit.h 164b0e6749d31e0daa1a4589a169d31c0dec7b3d
 F src/status.c 7ac05a5c7017d0b9f0b4bcd701228b784f987158
 F src/table.c 2cd62736f845d82200acfa1287e33feb3c15d62e
-F src/tclsqlite.c e87c99e28a145943666b51b212dacae35fcea0bd
+F src/tclsqlite.c 7d100e2e7aad614bb3d7026a41a0e3827dbaaebc
 F src/test1.c 14409a611e9c27c6c522c610bbff5561f05c1558
 F src/test2.c 98049e51a17dc62606a99a9eb95ee477f9996712
 F src/test3.c 1c0e5d6f080b8e33c1ce8b3078e7013fdbcd560c
@@ -1148,7 +1148,7 @@ F tool/getlock.c f4c39b651370156cae979501a7b156bdba50e7ce
 F tool/lemon.c 3ff0fec22f92dfb54e62eeb48772eddffdbeb0d6
 F tool/lempar.c 01ca97f87610d1dac6d8cd96ab109ab1130e76dc
 F tool/logest.c eef612f8adf4d0993dafed0416064cf50d5d33c6
-F tool/mkautoconfamal.sh f8d8dbf7d62f409ebed5134998bf5b51d7266383
+F tool/mkautoconfamal.sh 5dc5010e2e748a9e1bba67baca5956a2c2deda7b
 F tool/mkkeywordhash.c dfff09dbbfaf950e89af294f48f902181b144670
 F tool/mkopts.tcl 66ac10d240cc6e86abd37dc908d50382f84ff46e
 F tool/mkpragmatab.tcl 78a77b2c554d534c6f2dc903130186ed15715460
@@ -1186,7 +1186,7 @@ F tool/vdbe_profile.tcl 67746953071a9f8f2f668b73fe899074e2c6d8c1
 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
 F tool/warnings.sh 0abfd78ceb09b7f7c27c688c8e3fe93268a13b32
 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
-P 28a379fcd43389ad3249eff51a621d0bb7c81640
-R ef518fe403795d3b06bbe754ecf5c125
-U drh
-Z e00f86954fa90c49bf5a476ef91fbb0c
+P 11a70e1ae7f05d06e4e09c9d20db0444b8881584
+R aa6c5df3344dab5b287c6351a237958f
+U dan
+Z b3667514ef51eabff2a360098e935ae4

diff --git a/manifest.uuid b/manifest.uuid
index e975bd8d972263fa29042d0890ce80c4a57c42eb..a39201275aa79c873e8c4abe14ffb0c9281b46e9 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-11a70e1ae7f05d06e4e09c9d20db0444b8881584
\ No newline at end of file
+f10a6111262ce6ee6984c64fa0e0023642eca27d
\ No newline at end of file

diff --git a/src/tclsqlite.c b/src/tclsqlite.c
index 9b977e54aeac38c12de13c3a57bcaa7ed1eee8cd..2b98b6aab4b8b5fe6171a93981cbb4c3fbaf0dca 100644 (file)
--- a/src/tclsqlite.c
+++ b/src/tclsqlite.c
@@ -2381,7 +2381,7 @@ static int DbObjCmd(void *cd, Tcl_Interp *interp, int objc,Tcl_Obj *const*objv){
 
     if( rc==TCL_OK ){
       rc = createIncrblobChannel(
-          interp, pDb, zDb, zTable, zColumn, iRow, isReadonly
+          interp, pDb, zDb, zTable, zColumn, (sqlite3_int64)iRow, isReadonly
       );
     }
 #endif

diff --git a/tool/mkautoconfamal.sh b/tool/mkautoconfamal.sh
index c13f7c999ada50bbc6c1c797baa8adeb4da128b4..4829277234b0de11ec024d6876dea49369c6ecb0 100644 (file)
--- a/tool/mkautoconfamal.sh
+++ b/tool/mkautoconfamal.sh
@@ -62,7 +62,7 @@ mkdir -p tea/generic
 echo "#ifdef USE_SYSTEM_SQLITE"      > tea/generic/tclsqlite3.c 
 echo "# include <sqlite3.h>"        >> tea/generic/tclsqlite3.c
 echo "#else"                        >> tea/generic/tclsqlite3.c
-echo "#include \"../../sqlite3.c\"" >> tea/generic/tclsqlite3.c
+echo "#include \"sqlite3.c\""       >> tea/generic/tclsqlite3.c
 echo "#endif"                       >> tea/generic/tclsqlite3.c
 cat  $TOP/src/tclsqlite.c           >> tea/generic/tclsqlite3.c