Only look for config.h if the autoconf-based build is being used, and don't inline...

FossilOrigin-Name: 7df9ef2c8216133d50bf4737482f51193e8579b0

diff --git a/Makefile.in b/Makefile.in
index f7bfb20c7e489ed17185607ebe1463dbbfbe910c..007b9f81401981fad6d4fed3644106f8978258d9 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -28,6 +28,11 @@ BCC = @BUILD_CC@ @BUILD_CFLAGS@
 #
 TCC = @CC@ @CPPFLAGS@ @CFLAGS@ -I. -I${TOP}/src
 
+# Define this for the autoconf-based build, so that the code knows it can
+# include the generated config.h
+# 
+TCC += -D_HAVE_SQLITE_CONFIG_H
+
 # Define -DNDEBUG to compile without debugging (i.e., for production usage)
 # Omitting the define will cause extra debugging code to be inserted and
 # includes extra comments when "EXPLAIN stmt" is used.

diff --git a/config.h b/config.h
deleted file mode 100644 (file)
index 34aefae..0000000
--- a/config.h
+++ /dev/null
@@ -1,21 +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.
-**
-*************************************************************************
-** Default configuration header in case the 'configure' script is not used
-**
-** @(#) $Id: config.h,v 1.1 2008/03/20 02:25:35 mlcreech Exp $
-*/
-#ifndef _CONFIG_H_
-#define _CONFIG_H_
-
-/* We do nothing here, since no assumptions are made by default */
-
-#endif

diff --git a/main.mk b/main.mk
index 4dc86a4894e6056e8dab3571a862dbb498bf5582..6505f3885240fdcd38495cf79a4d4fa32622de9e 100644 (file)
--- a/main.mk
+++ b/main.mk
@@ -93,7 +93,6 @@ SRC = \
   $(TOP)/src/build.c \
   $(TOP)/src/callback.c \
   $(TOP)/src/complete.c \
-  $(TOP)/config.h \
   $(TOP)/src/date.c \
   $(TOP)/src/delete.c \
   $(TOP)/src/expr.c \
@@ -259,8 +258,7 @@ HDR = \
    $(TOP)/src/sqliteInt.h  \
    $(TOP)/src/sqliteLimit.h \
    $(TOP)/src/vdbe.h \
-   $(TOP)/src/vdbeInt.h \
-   $(TOP)/config.h
+   $(TOP)/src/vdbeInt.h
 
 # Header files used by extensions
 #

diff --git a/manifest b/manifest
index 02a021ec5d61328dc4c0cb9c58f2cbd4efa3b068..1652b0f9793444980dcc09db63261c5573984fa9 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,7 +1,7 @@
-C Fix\smost\sremaining\stestsuite\sfailures\son\sOS/2\sby\sswitching\sto\sexclusive\slocks\sthat\swe\smeant\sto\suse\sfrom\sthe\sstart.\s(CVS\s5092)
-D 2008-05-06T22:22:11
+C Only\slook\sfor\sconfig.h\sif\sthe\sautoconf-based\sbuild\sis\sbeing\sused,\sand\sdon't\sinline\sit\sinto\sthe\samalgamation.\s(CVS\s5093)
+D 2008-05-07T02:42:01
 F Makefile.arm-wince-mingw32ce-gcc ac5f7b2cef0cd850d6f755ba6ee4ab961b1fadf7
-F Makefile.in 25b3282a4ac39388632c2fb0e044ff494d490952
+F Makefile.in 8b9b8263852f0217157f9042b8e3dae7427ec739
 F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654
 F README b974cdc3f9f12b87e851b04e75996d720ebf81ac
 F VERSION 9a4746fe2ac3dcfb6b571babe2cad3fcd3f72330
@@ -15,7 +15,6 @@ F art/SQLite_big.gif 2b8e4603b91ba2a2c7062a82ff570d945034bb30
 F art/nocopy.gif 716aa07d4bb7250d4e75756073bf8ef9f56bec8f
 F art/powered_by_sqlite.gif 7fbcd7d3675391fd3d21672c14c05f5999eb60d1
 F config.guess 226d9a188c6196f3033ffc651cbc9dcee1a42977
-F config.h 5e461e321e0a56f1762da44eece1fe971ebdba3e
 F config.h.in 7940ca68451e949b9b4c83814a7c719721eea6e1
 F config.sub 9ebe4c3b3dab6431ece34f16828b594fb420da55
 F configure e1ecb9e25edbd0ab2b46adb9905e2ed69c9fb8f9 x
@@ -66,7 +65,7 @@ F ext/icu/README.txt 3b130aa66e7a681136f6add198b076a2f90d1e33
 F ext/icu/icu.c 12e763d288d23b5a49de37caa30737b971a2f1e2
 F install-sh 9d4de14ab9fb0facae2f48780b874848cbf2f895
 F ltmain.sh 09fe5815427dc7d0abb188bbcdf0e34896577210
-F main.mk bab1f708404c928af4769336aa97931062cfe987
+F main.mk 6a916bb5c17cf2a753346b32cc0869ffdc1ed4b3
 F mkdll.sh 712e74f3efe08a6ba12b2945d018a29a89d7fe3b
 F mkextu.sh 416f9b7089d80e5590a29692c9d9280a10dbad9f
 F mkextw.sh 1a866b53637dab137191341cc875575a5ca110fb
@@ -133,7 +132,7 @@ F src/select.c da43ce3080112aa77863e9c570c1df19a892acb8
 F src/shell.c 668ad976716982eb658019eda489b6f55131dbe7
 F src/sqlite.h.in abb785d2afcf45bb9344fe6edc1c7b428e1b719f
 F src/sqlite3ext.h faacd0e6a81aabee0861c6d7883c9172e74ef5b3
-F src/sqliteInt.h 6dbffa746c569b992e76051565d3531a07a54669
+F src/sqliteInt.h 01d7bcebc1154c583e08533e5a734e79a2bf06f8
 F src/sqliteLimit.h f435e728c6b620ef7312814d660a81f9356eb5c8
 F src/table.c 46ccf9b7892a86f57420ae7bac69ecd5e72d26b5
 F src/tclsqlite.c c57e740e30bd6dda678796eed62c7f0e64689834
@@ -560,7 +559,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 feb1cf30c5e560cbdd06522affb0b4eb4c9b6e6e
+F tool/mksqlite3c.tcl f8f8233344494ad8a193056fe346f8f616951b78
 F tool/mksqlite3internalh.tcl 47737a925fb02fce43e2c0a14b3cc17574a4d44a
 F tool/omittest.tcl 7d1fdf469e2f4d175f70c36e469db64a1626fabb
 F tool/opcodeDoc.awk b3a2a3d5d3075b8bd90b7afe24283efdd586659c
@@ -633,7 +632,7 @@ F www/tclsqlite.tcl 8be95ee6dba05eabcd27a9d91331c803f2ce2130
 F www/vdbe.tcl 87a31ace769f20d3627a64fa1fade7fed47b90d0
 F www/version3.tcl 890248cf7b70e60c383b0e84d77d5132b3ead42b
 F www/whentouse.tcl fc46eae081251c3c181bd79c5faef8195d7991a5
-P 76028b5e5d220e1d44667b2fef8bdfc580c913b0
-R d3bede297c62f53ed2377cca5b29be9d
-U pweilbacher
-Z 7de62f2956fd3ed219d59e579f766331
+P 5f682c9a68853f33aac6a2ad3f91b1cdf17dcd73
+R 56f0bae805d3584ec0aedf8c53cd40ab
+U mlcreech
+Z cac51a6fbca9efd2b50128065f8e0a6a

diff --git a/manifest.uuid b/manifest.uuid
index 9531ca6669a6834eba877763be7842aa9ec07286..190dcae6d8fb7e42fa73453e31a3c56cf3602bb1 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-5f682c9a68853f33aac6a2ad3f91b1cdf17dcd73
\ No newline at end of file
+7df9ef2c8216133d50bf4737482f51193e8579b0
\ No newline at end of file

diff --git a/src/sqliteInt.h b/src/sqliteInt.h
index 607e2094dea091aa5f7c134022c2f25f23e06fba..f40986da5b31ca4e6ec3f0531998f31b46075ccd 100644 (file)
--- a/src/sqliteInt.h
+++ b/src/sqliteInt.h
@@ -11,16 +11,19 @@
 *************************************************************************
 ** Internal interface definitions for SQLite.
 **
-** @(#) $Id: sqliteInt.h,v 1.701 2008/05/01 17:03:49 drh Exp $
+** @(#) $Id: sqliteInt.h,v 1.702 2008/05/07 02:42:03 mlcreech Exp $
 */
 #ifndef _SQLITEINT_H_
 #define _SQLITEINT_H_
 
 /*
-** Include the configuration header output by 'configure' if it was run
-** (otherwise we get an empty default).
+** Include the configuration header output by 'configure' if we're using the
+** autoconf-based build
 */
+#ifdef _HAVE_SQLITE_CONFIG_H
 #include "config.h"
+#endif
+
 #include "sqliteLimit.h"
 
 /* Disable nuisance warnings on Borland compilers */

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