From 0b47d340209e89f3aa1cd80567dbeebb88840dc8 Mon Sep 17 00:00:00 2001 From: drh Date: Tue, 27 Nov 2007 14:50:06 +0000 Subject: [PATCH] Bug fix in the configure script. Ticket #2799. The configure script is a real mess and needs to be completely rewritten. (CVS 4564) FossilOrigin-Name: 9d15f0330d685e62fbf4a1a1ad18dfecdc511bf8 --- configure | 4 ++-- configure.ac | 4 ++-- manifest | 14 +++++++------- manifest.uuid | 2 +- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/configure b/configure index 3c11f987ca..b7ec403231 100755 --- a/configure +++ b/configure @@ -1505,7 +1505,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu # The following RCS revision string applies to configure.in -# $Revision: 1.44 $ +# $Revision: 1.45 $ ######### # Programs needed @@ -18434,7 +18434,7 @@ if test "$enable_releasemode" = "no"; then echo "$as_me:$LINENO: result: no" >&5 echo "${ECHO_T}no" >&6 else - ALLOWRELEASE="-release `cat VERSION`" + ALLOWRELEASE="-release `cat $srcdir/VERSION`" echo "$as_me:$LINENO: result: yes" >&5 echo "${ECHO_T}yes" >&6 fi diff --git a/configure.ac b/configure.ac index 311459af0e..1bb2169cb8 100644 --- a/configure.ac +++ b/configure.ac @@ -92,7 +92,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.30 $ +# $Revision: 1.31 $ ######### # Programs needed @@ -244,7 +244,7 @@ if test "$enable_releasemode" = "no"; then ALLOWRELEASE="" AC_MSG_RESULT([no]) else - ALLOWRELEASE="-release `cat VERSION`" + ALLOWRELEASE="-release `cat $srcdir/VERSION`" AC_MSG_RESULT([yes]) fi AC_SUBST(ALLOWRELEASE) diff --git a/manifest b/manifest index 38cc2a5a0b..edab542e56 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Update\sthe\sversion\snumber\sto\s3.5.3.\s\sFix\ssome\sminor\stesting\sproblems.\s(CVS\s4563) -D 2007-11-27T14:46:42 +C Bug\sfix\sin\sthe\sconfigure\sscript.\s\sTicket\s#2799.\nThe\sconfigure\sscript\sis\sa\sreal\smess\sand\nneeds\sto\sbe\scompletely\srewritten.\s(CVS\s4564) +D 2007-11-27T14:50:07 F Makefile.arm-wince-mingw32ce-gcc ac5f7b2cef0cd850d6f755ba6ee4ab961b1fadf7 F Makefile.in 35396fd58890420b29edcf27b6c0e2d054862a6b 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 802235968fa597ed6579498b2d2e7a78b5d3988b x -F configure.ac ec7fd46700b722ae06bfc083e5d5e49fd6e7f12c +F configure 489e662ca1d1b03e526898d737064f7d0a7f3b4e x +F configure.ac a4462127fedc9127cc103e9d358839404942c84c F contrib/sqlitecon.tcl 210a913ad63f9f991070821e599d600bd913e0ad F doc/lemon.html f0f682f50210928c07e562621c3b7e8ab912a538 F doc/report1.txt a031aaf37b185e4fa540223cb516d3bccec7eeac @@ -592,7 +592,7 @@ F www/tclsqlite.tcl 8be95ee6dba05eabcd27a9d91331c803f2ce2130 F www/vdbe.tcl 87a31ace769f20d3627a64fa1fade7fed47b90d0 F www/version3.tcl 890248cf7b70e60c383b0e84d77d5132b3ead42b F www/whentouse.tcl fc46eae081251c3c181bd79c5faef8195d7991a5 -P 485add38a1ef224732575f9998f06466dcc9742d -R bc8519e0c868849ae7eb268dfbffad1f +P f4c8f2d1918f24514f02cae9172c77f6957d32c1 +R bbaa02b7395da923c226aeaf46587efc U drh -Z bbeab01aa041143e8c0d94dcc39a5010 +Z 56eefc0d674544da0d9f5e22b963fd17 diff --git a/manifest.uuid b/manifest.uuid index 4c240e0c01..fa2d780af5 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -f4c8f2d1918f24514f02cae9172c77f6957d32c1 \ No newline at end of file +9d15f0330d685e62fbf4a1a1ad18dfecdc511bf8 \ No newline at end of file -- 2.47.3