Clean up recent autoconf-related additions, add config.h to the amalgamation (CVS...

FossilOrigin-Name: 8044623062e9aa43593c46e3e5d5bc7361ea7418

diff --git a/Makefile.in b/Makefile.in
index 7ca467a9fe4a9e929a19e4545cb714106d05b43f..97b4b30745e5a0ef02268e2cf284e4aa237399ba 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -26,7 +26,7 @@ BCC = @BUILD_CC@ @BUILD_CFLAGS@
 # will run on the target platform.  (BCC and TCC are usually the
 # same unless your are cross-compiling.)
 #
-TCC = @CC@ @CPPFLAGS@ @CFLAGS@ -I. -I${TOP}/src -DSQLITE_STANDARD_BUILD=1
+TCC = @CC@ @CPPFLAGS@ @CFLAGS@ -I. -I${TOP}/src
 
 # Define -DNDEBUG to compile without debugging (i.e., for production usage)
 # Omitting the define will cause extra debugging code to be inserted and
@@ -158,7 +158,6 @@ SRC = \
   $(TOP)/src/btree.h \
   $(TOP)/src/build.c \
   $(TOP)/src/callback.c \
-  $(TOP)/src/common.h \
   $(TOP)/src/complete.c \
   $(TOP)/src/config.h \
   $(TOP)/src/date.c \
@@ -321,7 +320,6 @@ HDR = \
    $(TOP)/src/sqliteInt.h  \
    $(TOP)/src/vdbe.h \
    parse.h \
-   $(TOP)/src/common.h \
    $(TOP)/src/config.h
 
 # Header files used by extensions

diff --git a/main.mk b/main.mk
index d8fa78955932feb5ae5864826bb92c38d65d8e99..eb9d00aa84081124021d05de384bf6c3d920b802 100644 (file)
--- a/main.mk
+++ b/main.mk
@@ -92,7 +92,6 @@ SRC = \
   $(TOP)/src/btreeInt.h \
   $(TOP)/src/build.c \
   $(TOP)/src/callback.c \
-  $(TOP)/src/common.h \
   $(TOP)/src/complete.c \
   $(TOP)/src/config.h \
   $(TOP)/src/date.c \
@@ -259,7 +258,6 @@ HDR = \
    $(TOP)/src/sqliteLimit.h \
    $(TOP)/src/vdbe.h \
    $(TOP)/src/vdbeInt.h \
-   $(TOP)/src/common.h \
    $(TOP)/src/config.h
 
 # Header files used by extensions

diff --git a/manifest b/manifest
index ba25d60147eda18512eea3f1389f6a44a038ff87..60f3bf0a67d71c5c5afd6d7bc61ea816dbf51bc5 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,7 +1,7 @@
-C Handle\snon-autoconf\sbuild\scorrectly\swith\snew\schanges\s(CVS\s4832)
-D 2008-03-06T09:58:50
+C Clean\sup\srecent\sautoconf-related\sadditions,\sadd\sconfig.h\sto\sthe\samalgamation\s(CVS\s4833)
+D 2008-03-06T16:28:58
 F Makefile.arm-wince-mingw32ce-gcc ac5f7b2cef0cd850d6f755ba6ee4ab961b1fadf7
-F Makefile.in dbb064b7fca107aff4a722a3ee801af26dcda270
+F Makefile.in 724ca16b1b62dd123344b2945b906f9e6d922ff8
 F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654
 F README b974cdc3f9f12b87e851b04e75996d720ebf81ac
 F VERSION 2e206fc9458bf10a8c3ba2d13bf521a04ef441c6
@@ -64,7 +64,7 @@ F ext/icu/README.txt 3b130aa66e7a681136f6add198b076a2f90d1e33
 F ext/icu/icu.c 12e763d288d23b5a49de37caa30737b971a2f1e2
 F install-sh 9d4de14ab9fb0facae2f48780b874848cbf2f895
 F ltmain.sh 56abb507100ed2d4261f6dd1653dec3cf4066387
-F main.mk b0efbefa019837607cdb16b63fdac6ff581dd957
+F main.mk c9f2b9c47ed145008976f5fcfd74ff3e34f31678
 F mkdll.sh 712e74f3efe08a6ba12b2945d018a29a89d7fe3b
 F mkextu.sh 416f9b7089d80e5590a29692c9d9280a10dbad9f
 F mkextw.sh 1a866b53637dab137191341cc875575a5ca110fb
@@ -89,10 +89,9 @@ F src/btree.h 19dcf5ad23c17b98855da548e9a8e3eb4429d5eb
 F src/btreeInt.h d7d2f4d9d7f2e72c455326d48b2b478b842a81f6
 F src/build.c fa70bc0fb02e4d08202dd6a752ab5f5df5676e50
 F src/callback.c 77b302b0d41468dcda78c70e706e5b84577f0fa0
-F src/common.h 8240a944830058663fd5825482a5d813b206fcb1
 F src/complete.c 4cf68fd75d60257524cbe74f87351b9848399131
 F src/config.h b60286b542f5284d529b659adcb9c9d25eecab20
-F src/config.h.in 276f8e51e2daf0a19136c28678ec93542ac0ebe7
+F src/config.h.in 46fc486f4c162bc9b3f641a6cfdeaa6bd1c011aa
 F src/date.c 187cad26eaaecd7bcdccd49d5a70c5aa3010bc74
 F src/delete.c fa13c296262e89c32d28949f15be275e52d7f524
 F src/experimental.c 1b2d1a6cd62ecc39610e97670332ca073c50792b
@@ -142,7 +141,7 @@ F src/server.c 087b92a39d883e3fa113cae259d64e4c7438bc96
 F src/shell.c 22297fffa6f00a6c6d44020fa13b1184a1bb372d
 F src/sqlite.h.in b8158aa606f0b39426d63132ae0530d91c021abb
 F src/sqlite3ext.h 50c70a894ffe8e6ada5948c89b91db0a80a6b2a7
-F src/sqliteInt.h 3b4240e95002593b3ac6b87fd023c3de6b079df6
+F src/sqliteInt.h 6b9ee2df064c05b53c33eadc2e15bb2b23d60c89
 F src/sqliteLimit.h ee4430f88f69bf63527967bb35ca52af7b0ccb1e
 F src/table.c 2c48c575dd59b3a6c5c306bc55f51a9402cf429a
 F src/tclsqlite.c d95e0e74c7167b2807f9f4f73bf45f7c58096297
@@ -554,7 +553,7 @@ F tool/memleak2.awk 9cc20c8e8f3c675efac71ea0721ee6874a1566e8
 F tool/memleak3.tcl 7707006ee908cffff210c98158788d85bb3fcdbf
 F tool/mkkeywordhash.c ef93810fc41fb3d3dbacf9a33a29be88ea99ffa9
 F tool/mkopts.tcl 66ac10d240cc6e86abd37dc908d50382f84ff46e x
-F tool/mksqlite3c.tcl 81561092633403228c3fdbf04a995ef08fdd9a8c
+F tool/mksqlite3c.tcl 7184e0648b361230ec8bf87f5c1a5ad7e1e214e9
 F tool/mksqlite3internalh.tcl 47737a925fb02fce43e2c0a14b3cc17574a4d44a
 F tool/omittest.tcl 7d1fdf469e2f4d175f70c36e469db64a1626fabb
 F tool/opcodeDoc.awk b3a2a3d5d3075b8bd90b7afe24283efdd586659c
@@ -624,7 +623,7 @@ F www/tclsqlite.tcl 8be95ee6dba05eabcd27a9d91331c803f2ce2130
 F www/vdbe.tcl 87a31ace769f20d3627a64fa1fade7fed47b90d0
 F www/version3.tcl 890248cf7b70e60c383b0e84d77d5132b3ead42b
 F www/whentouse.tcl fc46eae081251c3c181bd79c5faef8195d7991a5
-P a8424e06064ee356db8231820737a7d5ba722873
-R 0021bc64720ffa75da297f69f183d54b
+P e2a9f5f1054f077e4773dd3d2c8f2ce5be118a01
+R 40dd63e8c23d267ba43a975ab562cefb
 U mlcreech
-Z fd997a43b8675ba941a31b1ef9bdb27a
+Z 77eff1d0b0188f0cd2e341dd1c104736

diff --git a/manifest.uuid b/manifest.uuid
index 45b7942900bf05baa67ea109c0732b39d2bf2d4b..1a183c9d524f27e9acc5921d35da3b0ffeb9265e 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-e2a9f5f1054f077e4773dd3d2c8f2ce5be118a01
\ No newline at end of file
+8044623062e9aa43593c46e3e5d5bc7361ea7418
\ No newline at end of file

diff --git a/src/common.h b/src/common.h
deleted file mode 100644 (file)
index 22e4ea3..0000000
--- a/src/common.h
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
-** 2008 March 6
-**
-** The author disclaims copyright to this source code.  In place of
-** a legal notice, here is a blessing:
-**
-**    May you do good and not evil.
-**    May you find forgiveness for yourself and forgive others.
-**    May you share freely, never taking more than you give.
-**
-*************************************************************************
-** Common includes/defines based on output of configure script
-**
-** @(#) $Id: common.h,v 1.2 2008/03/06 09:58:50 mlcreech Exp $
-*/
-#ifndef _COMMON_H_
-#define _COMMON_H_
-
-/*
-** Include the configuration header output by 'configure' if it was run
-** (otherwise we get an empty default).
-*/
-#include "config.h"
-
-/* Needed for various definitions... */
-#define _GNU_SOURCE
-
-/*
-** Include standard header files as necessary
-*/
-#ifdef HAVE_SYS_TYPES_H
-#include <sys/types.h>
-#endif
-#ifdef HAVE_STDLIB_H
-#include <stdlib.h>
-#endif
-#ifdef HAVE_STDINT_H
-#include <stdint.h>
-#endif
-#ifdef HAVE_INTTYPES_H
-#include <inttypes.h>
-#endif
-
-/*
-** If possible, use the C99 intptr_t type to define an integral type of
-** equivalent size to a pointer.  (Technically it's >= sizeof(void *), but
-** practically it's == sizeof(void *)).  We fall back to an int if this type
-** isn't defined.
-*/
-#ifdef HAVE_INTPTR_T
-  typedef intptr_t sqlite3_intptr_t;
-# define __sqlite3_intptr_defined
-#endif
-
-#endif

diff --git a/src/config.h.in b/src/config.h.in
index ff1d0c223e1ce4c59a12dbe6c133675322f1e3f4..d2dd341438876d1fda5cda0daba21ab8b26bdcf3 100644 (file)
--- a/src/config.h.in
+++ b/src/config.h.in
@@ -11,7 +11,7 @@
 *************************************************************************
 ** Configuration header template to be filled in by 'configure' script
 **
-** @(#) $Id: config.h.in,v 1.1 2008/03/06 07:36:18 mlcreech Exp $
+** @(#) $Id: config.h.in,v 1.2 2008/03/06 16:28:58 mlcreech Exp $
 */
 #ifndef _CONFIG_H_
 #define _CONFIG_H_
@@ -46,6 +46,15 @@
 /* Define as 1 if you have the uintptr_t type */
 #undef HAVE_UINTPTR_T
 
+/* Define as 1 if you have the sys/types.h header */
+#undef HAVE_SYS_TYPES_H
+
+/* Define as 1 if you have the stdlib.h header */
+#undef HAVE_STDLIB_H
+
+/* Define as 1 if you have the stdint.h header */
+#undef HAVE_STDINT_H
+
 /* Define as 1 if you have the inttypes.h header */
 #undef HAVE_INTTYPES_H
 

diff --git a/src/sqliteInt.h b/src/sqliteInt.h
index 5876f9962f330a51fcc5dd15a87cdb87b0622885..a4c2e1b123552cb6c9c8db8015bf17a6142be6a5 100644 (file)
--- a/src/sqliteInt.h
+++ b/src/sqliteInt.h
@@ -11,24 +11,49 @@
 *************************************************************************
 ** Internal interface definitions for SQLite.
 **
-** @(#) $Id: sqliteInt.h,v 1.669 2008/03/06 09:58:50 mlcreech Exp $
+** @(#) $Id: sqliteInt.h,v 1.670 2008/03/06 16:28:58 mlcreech Exp $
 */
 #ifndef _SQLITEINT_H_
 #define _SQLITEINT_H_
 
 /*
-** Do not try to include this file when building the amalgamation outside of
-** the SQLite source tree.
+** Include the configuration header output by 'configure' if it was run
+** (otherwise we get an empty default).
 */
-#ifdef SQLITE_STANDARD_BUILD
-# include "common.h"
+#include "config.h"
+
+/* Needed for various definitions... */
+#define _GNU_SOURCE
+
+/*
+** Include standard header files as necessary
+*/
+#ifdef HAVE_SYS_TYPES_H
+#include <sys/types.h>
+#endif
+#ifdef HAVE_STDLIB_H
+#include <stdlib.h>
+#endif
+#ifdef HAVE_STDINT_H
+#include <stdint.h>
+#endif
+#ifdef HAVE_INTTYPES_H
+#include <inttypes.h>
 #endif
 
-#ifndef __sqlite3_intptr_defined
-  /* Fallbacks if doing a standalone build... */
+/*
+** If possible, use the C99 intptr_t type to define an integral type of
+** equivalent size to a pointer.  (Technically it's >= sizeof(void *), but
+** practically it's == sizeof(void *)).  We fall back to an int if this type
+** isn't defined.
+*/
+#ifdef HAVE_INTPTR_T
+  typedef intptr_t sqlite3_intptr_t;
+#else
   typedef int sqlite3_intptr_t;
 #endif
 
+
 /*
 ** The macro unlikely() is a hint that surrounds a boolean
 ** expression that is usually false.  Macro likely() surrounds

diff --git a/tool/mksqlite3c.tcl b/tool/mksqlite3c.tcl
index 314c011f51ac464f9e1d4f7c116804bacb7b8f3a..df7a03103a5d17debc78584d1ff73139eebacd6f 100644 (file)
--- a/tool/mksqlite3c.tcl
+++ b/tool/mksqlite3c.tcl
@@ -88,6 +88,7 @@ if {$addstatic} {
 foreach hdr {
    btree.h
    btreeInt.h
+   config.h
    fts3.h
    fts3_hash.h
    fts3_tokenizer.h