Update the configure script to use AC_HELP_STRING. (CVS 3098)
FossilOrigin-Name: 92be79debf328b9b2aac6509ed1dd94528306d3b
diff --git a/configure b/configure
index 58fad10..5a39f1f 100755
--- a/configure
+++ b/configure
@@ -1025,13 +1025,16 @@
--enable-fast-install[=PKGS]
optimize for fast installation [default=yes]
--disable-libtool-lock avoid locking (might break parallel builds)
- --enable-threadsafe Support threadsafe operation
- --enable-cross-thread-connections Allow connection sharing across threads
- --enable-threads-override-locks Threads can override each others locks
- --enable-releasemode Support libtool link to release mode
- --enable-tempstore Use an in-ram database for temporary tables (never,no,yes,always)
- --disable-tcl do not build TCL extension
- --enable-debug enable debugging & verbose explain
+ --enable-threadsafe Support threadsafe operation
+ --enable-cross-thread-connections
+ Allow connection sharing across threads
+ --enable-threads-override-locks
+ Threads can override each others locks
+ --enable-releasemode Support libtool link to release mode
+ --enable-tempstore Use an in-ram database for temporary tables
+ (never,no,yes,always)
+ --disable-tcl do not build TCL extension
+ --enable-debug enable debugging & verbose explain
Optional Packages:
--with-PACKAGE[=ARG] use PACKAGE [ARG=yes]
@@ -1042,7 +1045,8 @@
--with-tags[=TAGS]
include additional configurations [automatic]
--with-hints=FILE Read configuration options from FILE
- --with-tcl=DIR directory containing tcl configuration (tclConfig.sh)
+ --with-tcl=DIR directory containing tcl configuration
+ (tclConfig.sh)
Some influential environment variables:
CC C compiler command
@@ -1498,7 +1502,7 @@
# The following RCS revision string applies to configure.in
-# $Revision: 1.37 $
+# $Revision: 1.38 $
#########
# Programs needed
@@ -3057,7 +3061,7 @@
;;
*-*-irix6*)
# Find out which ABI we are using.
- echo '#line 3060 "configure"' > conftest.$ac_ext
+ echo '#line 3064 "configure"' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
@@ -4520,7 +4524,7 @@
# Provide some information about the compiler.
-echo "$as_me:4523:" \
+echo "$as_me:4527:" \
"checking for Fortran 77 compiler version" >&5
ac_compiler=`set X $ac_compile; echo $2`
{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5
@@ -5554,11 +5558,11 @@
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:5557: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:5561: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:5561: \$? = $ac_status" >&5
+ echo "$as_me:5565: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings
@@ -5787,11 +5791,11 @@
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:5790: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:5794: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:5794: \$? = $ac_status" >&5
+ echo "$as_me:5798: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings
@@ -5847,11 +5851,11 @@
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:5850: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:5854: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:5854: \$? = $ac_status" >&5
+ echo "$as_me:5858: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -8031,7 +8035,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 8034 "configure"
+#line 8038 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -8129,7 +8133,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 8132 "configure"
+#line 8136 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -10308,11 +10312,11 @@
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:10311: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:10315: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:10315: \$? = $ac_status" >&5
+ echo "$as_me:10319: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings
@@ -10368,11 +10372,11 @@
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:10371: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:10375: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:10375: \$? = $ac_status" >&5
+ echo "$as_me:10379: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -11729,7 +11733,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 11732 "configure"
+#line 11736 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -11827,7 +11831,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 11830 "configure"
+#line 11834 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -12654,11 +12658,11 @@
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:12657: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:12661: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:12661: \$? = $ac_status" >&5
+ echo "$as_me:12665: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings
@@ -12714,11 +12718,11 @@
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:12717: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:12721: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:12721: \$? = $ac_status" >&5
+ echo "$as_me:12725: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -14748,11 +14752,11 @@
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:14751: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:14755: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:14755: \$? = $ac_status" >&5
+ echo "$as_me:14759: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings
@@ -14981,11 +14985,11 @@
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:14984: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:14988: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:14988: \$? = $ac_status" >&5
+ echo "$as_me:14992: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings
@@ -15041,11 +15045,11 @@
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:15044: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:15048: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:15048: \$? = $ac_status" >&5
+ echo "$as_me:15052: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -17225,7 +17229,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 17228 "configure"
+#line 17232 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -17323,7 +17327,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 17326 "configure"
+#line 17330 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
diff --git a/configure.ac b/configure.ac
index 27dfc9b..37b2966 100644
--- a/configure.ac
+++ b/configure.ac
@@ -116,7 +116,7 @@
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.23 $
+# $Revision: 1.24 $
#########
# Programs needed
@@ -153,7 +153,7 @@
# $system is the result of uname -s.
#
AC_ARG_WITH(hints,
- [ --with-hints=FILE Read configuration options from FILE],
+ AC_HELP_STRING([--with-hints=FILE],[Read configuration options from FILE]),
hints=$withval)
if test "$hints" = ""; then
host=`hostname | sed 's/\..*//'`
@@ -279,7 +279,7 @@
# Do we want to support multithreaded use of sqlite
#
AC_ARG_ENABLE(threadsafe,
-[ --enable-threadsafe Support threadsafe operation],,enable_threadsafe=no)
+AC_HELP_STRING([--enable-threadsafe],[Support threadsafe operation]),,enable_threadsafe=no)
AC_MSG_CHECKING([whether to support threadsafe operation])
if test "$enable_threadsafe" = "no"; then
THREADSAFE=0
@@ -306,7 +306,7 @@
# due to bugs in the threading implementations. This is thus off by default.
#
AC_ARG_ENABLE(cross-thread-connections,
-[ --enable-cross-thread-connections Allow connection sharing across threads],,enable_xthreadconnect=no)
+AC_HELP_STRING([--enable-cross-thread-connections],[Allow connection sharing across threads]),,enable_xthreadconnect=no)
AC_MSG_CHECKING([whether to allow connections to be shared across threads])
if test "$enable_xthreadconnect" = "no"; then
XTHREADCONNECT=''
@@ -324,7 +324,7 @@
# threads can safely override each others locks in all runtime situations.
#
AC_ARG_ENABLE(threads-override-locks,
-[ --enable-threads-override-locks Threads can override each others locks],,enable_threads_override_locks=no)
+AC_HELP_STRING([--enable-threads-override-locks],[Threads can override each others locks]),,enable_threads_override_locks=no)
AC_MSG_CHECKING([whether threads can override each others locks])
if test "$enable_threads_override_locks" = "no"; then
THREADSOVERRIDELOCKS='-1'
@@ -339,7 +339,7 @@
# Do we want to support release
#
AC_ARG_ENABLE(releasemode,
-[ --enable-releasemode Support libtool link to release mode],,enable_releasemode=no)
+AC_HELP_STRING([--enable-releasemode],[Support libtool link to release mode]),,enable_releasemode=no)
AC_MSG_CHECKING([whether to support shared library linked as release mode or not])
if test "$enable_releasemode" = "no"; then
ALLOWRELEASE=""
@@ -354,7 +354,7 @@
# Do we want temporary databases in memory
#
AC_ARG_ENABLE(tempstore,
-[ --enable-tempstore Use an in-ram database for temporary tables (never,no,yes,always)],,enable_tempstore=no)
+AC_HELP_STRING([--enable-tempstore],[Use an in-ram database for temporary tables (never,no,yes,always)]),,enable_tempstore=no)
AC_MSG_CHECKING([whether to use an in-ram database for temporary tables])
case "$enable_tempstore" in
never )
@@ -440,10 +440,10 @@
# Those macros could not be used directly since we have to make some
# minor changes to accomodate systems that do not have TCL installed.
#
-AC_ARG_ENABLE(tcl, [ --disable-tcl do not build TCL extension],
+AC_ARG_ENABLE(tcl, AC_HELP_STRING([--disable-tcl],[do not build TCL extension]),
[use_tcl=$enableval],[use_tcl=yes])
if test "${use_tcl}" = "yes" ; then
- AC_ARG_WITH(tcl, [ --with-tcl=DIR directory containing tcl configuration (tclConfig.sh)], with_tclconfig=${withval})
+ AC_ARG_WITH(tcl, AC_HELP_STRING([--with-tcl=DIR],[directory containing tcl configuration (tclConfig.sh)]), with_tclconfig=${withval})
AC_MSG_CHECKING([for Tcl configuration])
AC_CACHE_VAL(ac_cv_c_tclconfig,[
# First check to see if --with-tcl was specified.
@@ -641,7 +641,7 @@
#########
# check for debug enabled
-AC_ARG_ENABLE(debug, [ --enable-debug enable debugging & verbose explain],
+AC_ARG_ENABLE(debug, AC_HELP_STRING([--enable-debug],[enable debugging & verbose explain]),
[use_debug=$enableval],[use_debug=no])
if test "${use_debug}" = "yes" ; then
TARGET_DEBUG=""
diff --git a/manifest b/manifest
index b0dab45..461b7ab 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C test_async.c:\sWriter-thread\sshould\snot\srelinquish\smutex\swhen\swriting\sa\sfile\sfor\swhich\sonly\sone\sfile\shandle\sis\sopen\s(fixes\sbug\sintroduced\sin\s(3093)).\s(CVS\s3097)
-D 2006-02-14T14:46:42
+C Update\sthe\sconfigure\sscript\sto\suse\sAC_HELP_STRING.\s(CVS\s3098)
+D 2006-02-15T02:00:26
F Makefile.in 5d8dff443383918b700e495de42ec65bc1c8865b
F Makefile.linux-gcc 74ba0eadf88748a9ce3fd03d2a3ede2e6715baec
F README 9c4e2d6706bdcc3efdd773ce752a8cdab4f90028
@@ -12,8 +12,8 @@
F art/SQLiteLogo3.tiff b9e6bf022ae939bc986cddb8ab99583ca1b02cb3
F config.guess 2103e94b15dc57112d7b9ee152c6fac5288895b4
F config.sub 9bf686ec001ae7bc53f5b3563c90c62d4c6d48be
-F configure 16f3446471ac3c6d2a0b72ba1e9e6e391fefb76b x
-F configure.ac 030dca81015979b579ab7c056dec166ecff600d5
+F configure b5ef6973ab768007d745e58084711fe3ec7de9d8 x
+F configure.ac 752078e892cee32b1ec4c845fa21d43e8c2ed102
F contrib/sqlitecon.tcl 210a913ad63f9f991070821e599d600bd913e0ad
F doc/lemon.html f0f682f50210928c07e562621c3b7e8ab912a538
F doc/report1.txt a031aaf37b185e4fa540223cb516d3bccec7eeac
@@ -353,7 +353,7 @@
F www/vdbe.tcl 87a31ace769f20d3627a64fa1fade7fed47b90d0
F www/version3.tcl a99cf5f6d8bd4d5537584a2b342f0fb9fa601d8b
F www/whentouse.tcl 97e2b5cd296f7d8057e11f44427dea8a4c2db513
-P 2f2a8a69cb380dc30b85a792c369020fec3c79a5
-R 65c6be40c02ae56ad5b63d5b72efbfaf
-U danielk1977
-Z 15534709d725337aa40290e56295a82a
+P f0c45b7eab219ee812dbd2eb5e1c39fdf52a0ff2
+R 958af96d13ce0faac0c95d0bf444bc77
+U drh
+Z 67033d760f4f258dce43de518e3a9ae5
diff --git a/manifest.uuid b/manifest.uuid
index e51a7bd..e184dd4 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-f0c45b7eab219ee812dbd2eb5e1c39fdf52a0ff2
\ No newline at end of file
+92be79debf328b9b2aac6509ed1dd94528306d3b
\ No newline at end of file