Modify the configure script to avoid using the += operator. Not all shells support...

FossilOrigin-Name: f167b2745d491a1adb2b6c869b2169cd6fa53af8

diff --git a/configure b/configure
index 29b94457a4008ab42fd10241f304e9915d74faf7..90df20c34b8d85f772f0c887b32904fc6bdb4166 100755 (executable)
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.59 for sqlite 3.6.0.
+# Generated by GNU Autoconf 2.59 for sqlite 3.6.1.
 #
 # Copyright (C) 2003 Free Software Foundation, Inc.
 # This configure script is free software; the Free Software Foundation
@@ -416,13 +416,16 @@ SHELL=${CONFIG_SHELL-/bin/sh}
 # Identity of this package.
 PACKAGE_NAME='sqlite'
 PACKAGE_TARNAME='sqlite'
-PACKAGE_VERSION='3.6.0'
-PACKAGE_STRING='sqlite 3.6.0'
+PACKAGE_VERSION='3.6.1'
+PACKAGE_STRING='sqlite 3.6.1'
 PACKAGE_BUGREPORT=''
 
 # Factoring default headers for most tests.
 ac_includes_default="\
 #include <stdio.h>
+#if HAVE_SYS_TYPES_H
+# include <sys/types.h>
+#endif
 #if HAVE_SYS_STAT_H
 # include <sys/stat.h>
 #endif
@@ -430,6 +433,9 @@ ac_includes_default="\
 # include <stdlib.h>
 # include <stddef.h>
 #else
+# if HAVE_STDLIB_H
+#  include <stdlib.h>
+# endif
 #endif
 #if HAVE_STRING_H
 # if !STDC_HEADERS && HAVE_MEMORY_H
@@ -920,7 +926,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.6.0 to adapt to many kinds of systems.
+\`configure' configures sqlite 3.6.1 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -981,7 +987,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of sqlite 3.6.0:";;
+     short | recursive ) echo "Configuration of sqlite 3.6.1:";;
    esac
   cat <<\_ACEOF
 
@@ -1131,7 +1137,7 @@ fi
 test -n "$ac_init_help" && exit 0
 if $ac_init_version; then
   cat <<\_ACEOF
-sqlite configure 3.6.0
+sqlite configure 3.6.1
 generated by GNU Autoconf 2.59
 
 Copyright (C) 2003 Free Software Foundation, Inc.
@@ -1145,7 +1151,7 @@ cat >&5 <<_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.6.0, which was
+It was created by sqlite $as_me 3.6.1, which was
 generated by GNU Autoconf 2.59.  Invocation command line was
 
   $ $0 $@
@@ -1483,7 +1489,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 
 # The following RCS revision string applies to configure.in
-# $Revision: 1.63 $
+# $Revision: 1.64 $
 
 #########
 # Programs needed
@@ -7372,6 +7378,19 @@ test "$ld_shlibs" = no && can_build_shared=no
 with_gnu_ld=$with_gnu_ld
 
 
+
+
+
+
+
+
+
+
+
+
+
+
+
 #
 # Do we need to explicitly link libc?
 #
@@ -7436,6 +7455,161 @@ echo "${ECHO_T}$archive_cmds_need_lc" >&6
 esac
 
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
   echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5
 echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6
 
@@ -9957,7 +10131,70 @@ _ACEOF
 
 
 fi
+echo "$as_me:$LINENO: checking for intptr_t" >&5
+echo $ECHO_N "checking for intptr_t... $ECHO_C" >&6
+if test "${ac_cv_type_intptr_t+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+$ac_includes_default
+int
+main ()
+{
+if ((intptr_t *) 0)
+  return 0;
+if (sizeof (intptr_t))
+  return 0;
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+        { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_cv_type_intptr_t=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_cv_type_intptr_t=no
+fi
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+echo "$as_me:$LINENO: result: $ac_cv_type_intptr_t" >&5
+echo "${ECHO_T}$ac_cv_type_intptr_t" >&6
+if test $ac_cv_type_intptr_t = yes; then
+
+cat >>confdefs.h <<_ACEOF
+#define HAVE_INTPTR_T 1
+_ACEOF
+
 
+fi
 echo "$as_me:$LINENO: checking for uint8_t" >&5
 echo $ECHO_N "checking for uint8_t... $ECHO_C" >&6
 if test "${ac_cv_type_uint8_t+set}" = set; then
@@ -10214,8 +10451,70 @@ _ACEOF
 
 
 fi
-
+echo "$as_me:$LINENO: checking for uintptr_t" >&5
+echo $ECHO_N "checking for uintptr_t... $ECHO_C" >&6
+if test "${ac_cv_type_uintptr_t+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+$ac_includes_default
+int
+main ()
+{
+if ((uintptr_t *) 0)
+  return 0;
+if (sizeof (uintptr_t))
+  return 0;
+  ;
+  return 0;
+}
+_ACEOF
 rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+        { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_cv_type_uintptr_t=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_cv_type_uintptr_t=no
+fi
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+echo "$as_me:$LINENO: result: $ac_cv_type_uintptr_t" >&5
+echo "${ECHO_T}$ac_cv_type_uintptr_t" >&6
+if test $ac_cv_type_uintptr_t = yes; then
+
+cat >>confdefs.h <<_ACEOF
+#define HAVE_UINTPTR_T 1
+_ACEOF
+
+
+fi
 
 
 #########
@@ -10381,6 +10680,7 @@ done
 
 
 
+
 for ac_func in usleep fdatasync localtime_r gmtime_r localtime_s
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
@@ -11770,24 +12070,24 @@ else
   OPT_FEATURE_FLAGS="-DSQLITE_OMIT_LOAD_EXTENSION=1"
 fi
 
-
 #########
 # attempt to duplicate any OMITS into the $(OPT_FEATURE_FLAGS) parameter
 for option in $CFLAGS $CPPFLAGS
 do
   case $option in
-    -DSQLITE_OMIT*) OPT_FEATURE_FLAGS+=" $option";;
+    -DSQLITE_OMIT*) OPT_FEATURE_FLAGS="$OPT_FEATURE_FLAGS $option";;
   esac
 done
 
 
+
 # attempt to remove any OMITS from the $(CFLAGS) parameter
 ac_temp_CFLAGS=""
 for option in $CFLAGS
 do
   case $option in
     -DSQLITE_OMIT*) ;;
-    *) ac_temp_CFLAGS+=" $option";;
+    *) ac_temp_CFLAGS="$ac_temp_CFLAGS $option";;
   esac
 done
 CFLAGS=$ac_temp_CFLAGS
@@ -11799,18 +12099,19 @@ for option in $CPPFLAGS
 do
   case $option in
     -DSQLITE_OMIT*) ;;
-    *) ac_temp_CPPFLAGS+=" $option";;
+    *) ac_temp_CPPFLAGS="$ac_temp_CPPFLAGS $option";;
   esac
 done
 CPPFLAGS=$ac_temp_CPPFLAGS
 
+
 # attempt to remove any OMITS from the $(BUILD_CFLAGS) parameter
 ac_temp_BUILD_CFLAGS=""
 for option in $BUILD_CFLAGS
 do
   case $option in
     -DSQLITE_OMIT*) ;;
-    *) ac_temp_BUILD_CFLAGS+=" $option";;
+    *) ac_temp_BUILD_CFLAGS="$ac_temp_BUILD_CFLAGS $option";;
   esac
 done
 BUILD_CFLAGS=$ac_temp_BUILD_CFLAGS
@@ -11832,6 +12133,7 @@ else
 fi
 
 
+
 #########
 # Output the config header
           ac_config_headers="$ac_config_headers config.h"
@@ -12204,7 +12506,7 @@ _ASBOX
 } >&5
 cat >&5 <<_CSEOF
 
-This file was extended by sqlite $as_me 3.6.0, which was
+This file was extended by sqlite $as_me 3.6.1, which was
 generated by GNU Autoconf 2.59.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -12267,7 +12569,7 @@ _ACEOF
 
 cat >>$CONFIG_STATUS <<_ACEOF
 ac_cs_version="\\
-sqlite config.status 3.6.0
+sqlite config.status 3.6.1
 configured by $0, generated by GNU Autoconf 2.59,
   with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
 

diff --git a/configure.ac b/configure.ac
index 8f18106aa2aab8d9b4cdfc5057449ea8ddd25e96..3af75679c3913a88eade3532a8ddcf59eed4005c 100644 (file)
--- 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.47 $
+# $Revision: 1.48 $
 
 #########
 # Programs needed
@@ -619,7 +619,7 @@ fi
 for option in $CFLAGS $CPPFLAGS
 do
   case $option in
-    -DSQLITE_OMIT*) OPT_FEATURE_FLAGS+=" $option";;
+    -DSQLITE_OMIT*) OPT_FEATURE_FLAGS="$OPT_FEATURE_FLAGS $option";;
   esac
 done
 AC_SUBST(OPT_FEATURE_FLAGS)
@@ -631,7 +631,7 @@ for option in $CFLAGS
 do
   case $option in
     -DSQLITE_OMIT*) ;;
-    *) ac_temp_CFLAGS+=" $option";;
+    *) ac_temp_CFLAGS="$ac_temp_CFLAGS $option";;
   esac
 done
 CFLAGS=$ac_temp_CFLAGS
@@ -643,7 +643,7 @@ for option in $CPPFLAGS
 do
   case $option in
     -DSQLITE_OMIT*) ;;
-    *) ac_temp_CPPFLAGS+=" $option";;
+    *) ac_temp_CPPFLAGS="$ac_temp_CPPFLAGS $option";;
   esac
 done
 CPPFLAGS=$ac_temp_CPPFLAGS
@@ -655,7 +655,7 @@ for option in $BUILD_CFLAGS
 do
   case $option in
     -DSQLITE_OMIT*) ;;
-    *) ac_temp_BUILD_CFLAGS+=" $option";;
+    *) ac_temp_BUILD_CFLAGS="$ac_temp_BUILD_CFLAGS $option";;
   esac
 done
 BUILD_CFLAGS=$ac_temp_BUILD_CFLAGS

diff --git a/manifest b/manifest
index 069763b25fc1fd9ab6b5f9b026291a4a4438c76b..4e04ab2a69f0626cb4d5608514a5982bd1866ddf 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Enhanced\smarkings\sfor\sexperimental\sand\sdeprecated\sinterfaces.\s(CVS\s5534)
-D 2008-08-04T13:44:57
+C Modify\sthe\sconfigure\sscript\sto\savoid\susing\sthe\s+=\soperator.\sNot\sall\sshells\ssupport\sit.\s(CVS\s5535)
+D 2008-08-04T14:50:05
 F Makefile.arm-wince-mingw32ce-gcc fcd5e9cd67fe88836360bb4f9ef4cb7f8e2fb5a0
 F Makefile.in 2713ea64947be3b35f35d9a3158bb8299c90b019
 F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654
@@ -17,8 +17,8 @@ F art/powered_by_sqlite.gif 7fbcd7d3675391fd3d21672c14c05f5999eb60d1
 F config.guess 226d9a188c6196f3033ffc651cbc9dcee1a42977
 F config.h.in 3fda160d9a0ebbd6c22c0391354fa0036474680f
 F config.sub 9ebe4c3b3dab6431ece34f16828b594fb420da55
-F configure 0435f73795c7a1ced456d46df784fd44fea794ee x
-F configure.ac eebaa620c2c9a7c3be0fedfbca8c2e8dd673e586
+F configure a013a40a9215b92fb9267603823f95d007ab5b00 x
+F configure.ac 3ce485247a4facc8df9cf03038c2014ed9d0ccda
 F contrib/sqlitecon.tcl 210a913ad63f9f991070821e599d600bd913e0ad
 F doc/lemon.html f0f682f50210928c07e562621c3b7e8ab912a538
 F doc/report1.txt a031aaf37b185e4fa540223cb516d3bccec7eeac
@@ -617,7 +617,7 @@ F tool/speedtest16.c c8a9c793df96db7e4933f0852abb7a03d48f2e81
 F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff
 F tool/speedtest8.c 1dbced29de5f59ba2ebf877edcadf171540374d1
 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
-P e42ff97ba7d9fcda699a63fc8bc609d559498180
-R b4ac1f1ebf69466100db4f153d1ab00e
-U drh
-Z 86e2d87ac133b0980ed1fb699e144ca0
+P 7e6ec5d53d9e002848fa437ec21bf009798a9a3b
+R 4d3a854b4d64fe4c3d561b28ac8712bc
+U danielk1977
+Z 38ad1e873bd8c9c39f5e63fd276f0978

diff --git a/manifest.uuid b/manifest.uuid
index e1f55631efc1c08426aabf1a8091d0634615753b..8778d68f0828145a2cd33f449c5b98545632042a 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-7e6ec5d53d9e002848fa437ec21bf009798a9a3b
\ No newline at end of file
+f167b2745d491a1adb2b6c869b2169cd6fa53af8
\ No newline at end of file