From: mlcreech <mlcreech@noemail.net>
Date: Tue, 11 Mar 2008 18:03:30 +0000 (+0000)
Subject: If tclsh is not found, don't default to building the amalgamation (CVS 4853)
X-Git-Tag: version-3.6.10~1324
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=f3868117f94dffb8b70203325380cab71abe451f;p=thirdparty%2Fsqlite.git

If tclsh is not found, don't default to building the amalgamation (CVS 4853)

FossilOrigin-Name: cbc0167556bd0abd16eb24d1c840ecbc530fd854
---

diff --git a/configure b/configure
index 1e9103ad47..ca0889c52c 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.61 for sqlite 3.5.6.
+# Generated by GNU Autoconf 2.61 for sqlite 3.5.7.
 #
 # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
 # 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
@@ -726,8 +726,8 @@ SHELL=${CONFIG_SHELL-/bin/sh}
 # Identity of this package.
 PACKAGE_NAME='sqlite'
 PACKAGE_TARNAME='sqlite'
-PACKAGE_VERSION='3.5.6'
-PACKAGE_STRING='sqlite 3.5.6'
+PACKAGE_VERSION='3.5.7'
+PACKAGE_STRING='sqlite 3.5.7'
 PACKAGE_BUGREPORT=''
 
 # Factoring default headers for most tests.
@@ -1393,7 +1393,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures sqlite 3.5.6 to adapt to many kinds of systems.
+\`configure' configures sqlite 3.5.7 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1458,7 +1458,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of sqlite 3.5.6:";;
+     short | recursive ) echo "Configuration of sqlite 3.5.7:";;
    esac
   cat <<\_ACEOF
 
@@ -1577,7 +1577,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-sqlite configure 3.5.6
+sqlite configure 3.5.7
 generated by GNU Autoconf 2.61
 
 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1591,7 +1591,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by sqlite $as_me 3.5.6, which was
+It was created by sqlite $as_me 3.5.7, which was
 generated by GNU Autoconf 2.61.  Invocation command line was
 
   $ $0 $@
@@ -1946,7 +1946,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 
 # The following RCS revision string applies to configure.in
-# $Revision: 1.53 $
+# $Revision: 1.54 $
 
 #########
 # Programs needed
@@ -19634,6 +19634,11 @@ fi
 done
 
 
+#########
+# By default, we use the amalgamation (this may be changed below...)
+#
+USE_AMALGAMATION=1
+
 #########
 # See whether we can run specific tclsh versions known to work well;
 # if not, then we fall back to plain tclsh.
@@ -19680,8 +19685,15 @@ fi
 
   test -n "$TCLSH_CMD" && break
 done
-test -n "$TCLSH_CMD" || TCLSH_CMD="tclsh"
+test -n "$TCLSH_CMD" || TCLSH_CMD="none"
 
+if test "$TCLSH_CMD" = "none"; then
+  # If we can't find a local tclsh, then building the amalgamation will fail.
+  # We act as though --disable-amalgamation has been used.
+  echo "Warning: can't find tclsh - defaulting to non-amalgamation build."
+  USE_AMALGAMATION=0
+  TCLSH_CMD="tclsh"
+fi
 
 
 
@@ -20788,9 +20800,7 @@ else
   use_amalgamation=yes
 fi
 
-if test "${use_amalgamation}" = "yes" ; then
-  USE_AMALGAMATION=1
-else
+if test "${use_amalgamation}" != "yes" ; then
   USE_AMALGAMATION=0
 fi
 
@@ -21219,7 +21229,7 @@ exec 6>&1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by sqlite $as_me 3.5.6, which was
+This file was extended by sqlite $as_me 3.5.7, which was
 generated by GNU Autoconf 2.61.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -21268,7 +21278,7 @@ Report bugs to <bug-autoconf@gnu.org>."
 _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF
 ac_cs_version="\\
-sqlite config.status 3.5.6
+sqlite config.status 3.5.7
 configured by $0, generated by GNU Autoconf 2.61,
   with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
 
diff --git a/configure.ac b/configure.ac
index d6abc1a817..6fb3c0e2c9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -92,7 +92,7 @@ AC_INIT(sqlite, m4_esyscmd([cat VERSION | tr -d '\n']))
 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.39 $
+# $Revision: 1.40 $
 
 #########
 # Programs needed
@@ -115,12 +115,24 @@ AC_CHECK_HEADERS([sys/types.h stdlib.h stdint.h inttypes.h])
 #
 AC_CHECK_FUNCS([usleep fdatasync localtime_r gmtime_r])
 
+#########
+# By default, we use the amalgamation (this may be changed below...)
+#
+USE_AMALGAMATION=1
+
 #########
 # See whether we can run specific tclsh versions known to work well;
 # if not, then we fall back to plain tclsh.
 # TODO: try other versions before falling back?
 # 
-AC_CHECK_PROGS(TCLSH_CMD, [tclsh8.4 tclsh], tclsh)
+AC_CHECK_PROGS(TCLSH_CMD, [tclsh8.4 tclsh], none)
+if test "$TCLSH_CMD" = "none"; then
+  # If we can't find a local tclsh, then building the amalgamation will fail.
+  # We act as though --disable-amalgamation has been used.
+  echo "Warning: can't find tclsh - defaulting to non-amalgamation build."
+  USE_AMALGAMATION=0
+  TCLSH_CMD="tclsh"
+fi
 AC_SUBST(TCLSH_CMD)
 
 
@@ -583,9 +595,7 @@ AC_SUBST(TARGET_DEBUG)
 AC_ARG_ENABLE(amalgamation, AC_HELP_STRING([--disable-amalgamation],
       [Disable the amalgamation and instead build all files separately (currently needed to build the test fixture)]),
       [use_amalgamation=$enableval],[use_amalgamation=yes])
-if test "${use_amalgamation}" = "yes" ; then
-  USE_AMALGAMATION=1
-else
+if test "${use_amalgamation}" != "yes" ; then
   USE_AMALGAMATION=0
 fi
 AC_SUBST(USE_AMALGAMATION)
diff --git a/manifest b/manifest
index 029afa0820..ba8021edf9 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Increase\sthe\sversion\snumber\sto\s3.5.7\sin\santicipation\sof\sthe\snext\srelease.\s(CVS\s4852)
-D 2008-03-11T15:41:14
+C If\stclsh\sis\snot\sfound,\sdon't\sdefault\sto\sbuilding\sthe\samalgamation\s(CVS\s4853)
+D 2008-03-11T18:03:31
 F Makefile.arm-wince-mingw32ce-gcc ac5f7b2cef0cd850d6f755ba6ee4ab961b1fadf7
 F Makefile.in 3e2eb2b4a4148aff92bbc6d8496d0696c36bf0b6
 F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654
@@ -16,8 +16,8 @@ F art/nocopy.gif 716aa07d4bb7250d4e75756073bf8ef9f56bec8f
 F art/powered_by_sqlite.gif 7fbcd7d3675391fd3d21672c14c05f5999eb60d1
 F config.guess dba2d1300ec8f8cd00c6fb44b9edde21c14e960c
 F config.sub 9a842e7c332ed65cef3f2c20354e06dc998b2796
-F configure ac36a81e1cc848904411e18c33ce33d30a85baa2 x
-F configure.ac 1011a165d6a4a81a309320f83c6df6b9aa4ae45c
+F configure 69ee9f4ee66e801e05ff5460e6c262721ece5e0d x
+F configure.ac 7fbcc49117d98dbdf6902812baf1f9eab1efe0ec
 F contrib/sqlitecon.tcl 210a913ad63f9f991070821e599d600bd913e0ad
 F doc/lemon.html f0f682f50210928c07e562621c3b7e8ab912a538
 F doc/report1.txt a031aaf37b185e4fa540223cb516d3bccec7eeac
@@ -623,7 +623,7 @@ F www/tclsqlite.tcl 8be95ee6dba05eabcd27a9d91331c803f2ce2130
 F www/vdbe.tcl 87a31ace769f20d3627a64fa1fade7fed47b90d0
 F www/version3.tcl 890248cf7b70e60c383b0e84d77d5132b3ead42b
 F www/whentouse.tcl fc46eae081251c3c181bd79c5faef8195d7991a5
-P 2668000fc8e23a98fb3e104474032d6c70eeee38
-R 69c35c0f0038b9294652eca92d4b8118
-U drh
-Z 5dd3c2314110de8cfe763dd3277b58e9
+P c85e97e4f0f02219b567e1ab2d4602c5680e7331
+R 42b36528a0cb8e883f6272aeb9d7392d
+U mlcreech
+Z 3d1016d08e7c01fa0b2f470b327e4eb8
diff --git a/manifest.uuid b/manifest.uuid
index 02411caedc..100182fd09 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-c85e97e4f0f02219b567e1ab2d4602c5680e7331
\ No newline at end of file
+cbc0167556bd0abd16eb24d1c840ecbc530fd854
\ No newline at end of file