Add the --enable-editline option to various autoconf scripts.

FossilOrigin-Name: 866f0277781dedf0db287ec5902a138406a172e3

diff --git a/Makefile.in b/Makefile.in
index c6b090ba43c7f77ee5eb97d93da0ec24aaab4496..fe4dc197b94cddba80458e13cc72e2a27ca5ffcb 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -54,6 +54,7 @@ LIBTCL = @TCL_LIB_SPEC@
 # Compiler options needed for programs that use the readline() library.
 #
 READLINE_FLAGS = -DHAVE_READLINE=@TARGET_HAVE_READLINE@ @TARGET_READLINE_INC@
+READLINE_FLAGS += -DHAVE_EDITLINE=@TARGET_HAVE_EDITLINE@
 
 # The library that programs using readline() must link against.
 #

diff --git a/autoconf/configure.ac b/autoconf/configure.ac
index 888b924e40a404a1dee61477ea782835d4d88348..7812927557f9b75956bf934c6f0048afa46ee398 100644 (file)
--- a/autoconf/configure.ac
+++ b/autoconf/configure.ac
@@ -18,7 +18,6 @@ AC_SYS_LARGEFILE
 
 # Check for required programs.
 AC_PROG_CC
-AC_PROG_RANLIB
 AC_PROG_LIBTOOL
 AC_PROG_MKDIR_P
 
@@ -30,12 +29,27 @@ AC_CONFIG_FILES([Makefile sqlite3.pc])
 AC_SUBST(BUILD_CFLAGS)
 
 #-----------------------------------------------------------------------
+#   --enable-editline
 #   --enable-readline
 #
+AC_ARG_ENABLE(editline, [AS_HELP_STRING(
+  [--enable-editline], 
+  [use BSD libedit])], 
+  [], [enable_editline=yes])
 AC_ARG_ENABLE(readline, [AS_HELP_STRING(
   [--enable-readline], 
-  [use readline in shell tool (yes, no) [default=yes]])], 
-  [], [enable_readline=yes])
+  [use readline])], 
+  [], [enable_readline=no])
+if test x"$enable_editline" != xno ; then
+  sLIBS=$LIBS
+  LIBS=""
+  AC_SEARCH_LIBS([readline],[edit],[enable_readline=no],[enable_editline=no])
+  READLINE_LIBS=$LIBS
+  if test x"$LIBS" != "x"; then
+     AC_DEFINE([HAVE_EDITLINE],1,Define to use BSD editline)
+  fi
+  LIBS=$sLIBS
+fi
 if test x"$enable_readline" != xno ; then
   sLIBS=$LIBS
   LIBS=""

diff --git a/configure b/configure
index 65591fa0c8e3d22f358ddb731abc12bd8baaafae..7f329c530e58852ca23f237c49959bc8060514d6 100755 (executable)
--- a/configure
+++ b/configure
@@ -774,6 +774,7 @@ USE_GCOV
 OPT_FEATURE_FLAGS
 USE_AMALGAMATION
 TARGET_DEBUG
+TARGET_HAVE_EDITLINE
 TARGET_HAVE_READLINE
 TARGET_READLINE_INC
 TARGET_READLINE_LIBS
@@ -895,6 +896,7 @@ enable_releasemode
 enable_tempstore
 enable_tcl
 with_tcl
+enable_editline
 enable_readline
 with_readline_lib
 with_readline_inc
@@ -1542,7 +1544,8 @@ Optional Features:
   --enable-tempstore      Use an in-ram database for temporary tables
                           (never,no,yes,always)
   --disable-tcl           do not build TCL extension
-  --disable-readline      disable readline support [default=detect]
+  --enable-editline       enable BSD editline support
+  --disable-readline      disable readline support
   --enable-debug          enable debugging & verbose explain
   --disable-amalgamation  Disable the amalgamation and instead build all files
                           separately
@@ -3920,13 +3923,13 @@ if ${lt_cv_nm_interface+:} false; then :
 else
   lt_cv_nm_interface="BSD nm"
   echo "int some_variable = 0;" > conftest.$ac_ext
-  (eval echo "\"\$as_me:3923: $ac_compile\"" >&5)
+  (eval echo "\"\$as_me:3926: $ac_compile\"" >&5)
   (eval "$ac_compile" 2>conftest.err)
   cat conftest.err >&5
-  (eval echo "\"\$as_me:3926: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
+  (eval echo "\"\$as_me:3929: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
   (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
   cat conftest.err >&5
-  (eval echo "\"\$as_me:3929: output\"" >&5)
+  (eval echo "\"\$as_me:3932: output\"" >&5)
   cat conftest.out >&5
   if $GREP 'External.*some_variable' conftest.out > /dev/null; then
     lt_cv_nm_interface="MS dumpbin"
@@ -5132,7 +5135,7 @@ ia64-*-hpux*)
   ;;
 *-*-irix6*)
   # Find out which ABI we are using.
-  echo '#line 5135 "configure"' > conftest.$ac_ext
+  echo '#line 5138 "configure"' > conftest.$ac_ext
   if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
@@ -6657,11 +6660,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:6660: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:6663: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:6664: \$? = $ac_status" >&5
+   echo "$as_me:6667: \$? = $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 other than the usual output.
@@ -6996,11 +6999,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:6999: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:7002: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:7003: \$? = $ac_status" >&5
+   echo "$as_me:7006: \$? = $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 other than the usual output.
@@ -7101,11 +7104,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:7104: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:7107: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:7108: \$? = $ac_status" >&5
+   echo "$as_me:7111: \$? = $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
@@ -7156,11 +7159,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:7159: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:7162: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:7163: \$? = $ac_status" >&5
+   echo "$as_me:7166: \$? = $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
@@ -9536,7 +9539,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 9539 "configure"
+#line 9542 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -9632,7 +9635,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 9635 "configure"
+#line 9638 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -10832,6 +10835,14 @@ fi
 TARGET_READLINE_LIBS=""
 TARGET_READLINE_INC=""
 TARGET_HAVE_READLINE=0
+TARGET_HAVE_EDITLINE=0
+# Check whether --enable-editline was given.
+if test "${enable_editline+set}" = set; then :
+  enableval=$enable_editline; with_editline=$enableval
+else
+  with_editline=auto
+fi
+
 # Check whether --enable-readline was given.
 if test "${enable_readline+set}" = set; then :
   enableval=$enable_readline; with_readline=$enableval
@@ -10840,6 +10851,71 @@ else
 fi
 
 
+if test x"$with_editline" != xno; then
+        sLIBS=$LIBS
+        LIBS=""
+       TARGET_HAVE_EDITLINE=1
+       { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing readline" >&5
+$as_echo_n "checking for library containing readline... " >&6; }
+if ${ac_cv_search_readline+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_func_search_save_LIBS=$LIBS
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char readline ();
+int
+main ()
+{
+return readline ();
+  ;
+  return 0;
+}
+_ACEOF
+for ac_lib in '' edit; do
+  if test -z "$ac_lib"; then
+    ac_res="none required"
+  else
+    ac_res=-l$ac_lib
+    LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
+  fi
+  if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_search_readline=$ac_res
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext
+  if ${ac_cv_search_readline+:} false; then :
+  break
+fi
+done
+if ${ac_cv_search_readline+:} false; then :
+
+else
+  ac_cv_search_readline=no
+fi
+rm conftest.$ac_ext
+LIBS=$ac_func_search_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_readline" >&5
+$as_echo "$ac_cv_search_readline" >&6; }
+ac_res=$ac_cv_search_readline
+if test "$ac_res" != no; then :
+  test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
+  with_readline=no
+else
+  TARGET_HAVE_EDITLINE=0
+fi
+
+        TARGET_READLINE_LIBS=$LIBS
+        LIBS=$sLIBS
+fi
 if test x"$with_readline" != xno; then
        found="yes"
 
@@ -11028,6 +11104,7 @@ fi
 
 
 
+
 ##########
 # Figure out what C libraries are required to compile programs
 # that use "fdatasync()" function.

diff --git a/configure.ac b/configure.ac
index 11ab81d3428b55fcf00e84ee8c7051c083106eca..0b94d33930be1051a8446a67c06f3122ade0bbf4 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -460,11 +460,24 @@ AC_SUBST(HAVE_TCL)
 TARGET_READLINE_LIBS=""
 TARGET_READLINE_INC=""
 TARGET_HAVE_READLINE=0
+TARGET_HAVE_EDITLINE=0
+AC_ARG_ENABLE([editline],
+       [AC_HELP_STRING([--enable-editline],[enable BSD editline support])],
+       [with_editline=$enableval],
+       [with_editline=auto])
 AC_ARG_ENABLE([readline],
-       [AC_HELP_STRING([--disable-readline],[disable readline support [default=detect]])],
+       [AC_HELP_STRING([--disable-readline],[disable readline support])],
        [with_readline=$enableval],
        [with_readline=auto])
 
+if test x"$with_editline" != xno; then
+        sLIBS=$LIBS
+        LIBS=""
+       TARGET_HAVE_EDITLINE=1
+       AC_SEARCH_LIBS(readline,edit,[with_readline=no],[TARGET_HAVE_EDITLINE=0])
+        TARGET_READLINE_LIBS=$LIBS
+        LIBS=$sLIBS
+fi
 if test x"$with_readline" != xno; then
        found="yes"
 
@@ -519,6 +532,7 @@ fi
 AC_SUBST(TARGET_READLINE_LIBS)
 AC_SUBST(TARGET_READLINE_INC)
 AC_SUBST(TARGET_HAVE_READLINE)
+AC_SUBST(TARGET_HAVE_EDITLINE)
 
 ##########
 # Figure out what C libraries are required to compile programs

diff --git a/manifest b/manifest
index d4263de73a6697a64d79274b30b492497414bdcd..befa28989a91c9dd574ea2c5f239324b8853b834 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,6 +1,6 @@
-C Fix\suses\sof\sctype\sfunctions\s(ex:\sisspace())\son\ssigned\scharacters\sin\stest\nprograms\sand\sin\ssome\sobscure\sextensions.\s\sNo\schanges\sto\sthe\score.
-D 2015-10-29T13:48:15.235
-F Makefile.in 2ea961bc09e441874eb3d1bf7398e04feb24f3ee
+C Add\sthe\s--enable-editline\soption\sto\svarious\sautoconf\sscripts.
+D 2015-10-30T14:25:57.043
+F Makefile.in 4469ed8b02a9934fea9503d791165367d19db2f7
 F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
 F Makefile.msc 702d3e98f3afc6587a78481257f3c4c900efc3a4
 F README.md 8ecc12493ff9f820cdea6520a9016001cb2e59b7
@@ -15,7 +15,7 @@ F autoconf/README 14458f1046c118efa721aadec5f227e876d3cd38
 F autoconf/README.first 6c4f34fe115ff55d4e8dbfa3cecf04a0188292f7
 F autoconf/config.guess 94cc57e2a3fdb9c235b362ace86d77e89d188cad x
 F autoconf/config.sub 1efb390a8fb4bfafd74783a15a8fb5311c84300e x
-F autoconf/configure.ac a1fe4eee429fd9d3170be41941514a2b7120ba4e
+F autoconf/configure.ac bec3caf78cf1bdbaad903dcd5c6029292eda3d2d
 F autoconf/depcomp 0b26f101e3bc9fd1ff0be1da9fb4a82371142f92 x
 F autoconf/install-sh 06ee6336e63bb845c8439d777c32eb2eccc4fbf1 x
 F autoconf/ltmain.sh 7a658a24028f02331c1d2446562758083c5eadd1
@@ -35,8 +35,8 @@ F autoconf/tea/win/rules.vc c511f222b80064096b705dbeb97060ee1d6b6d63
 F config.guess 226d9a188c6196f3033ffc651cbc9dcee1a42977
 F config.h.in 42b71ad3fe21c9e88fa59e8458ca1a6bc72eb0c0
 F config.sub 9ebe4c3b3dab6431ece34f16828b594fb420da55
-F configure 762a66c6eb9331f8af21f5d00b610bd61eaf8e14 x
-F configure.ac f36bd4fb8c53eed8374c5a5ef319807c08c23fa9
+F configure 1d10fa35c71b5e830631bff0b8f94da164e0bc19 x
+F configure.ac fcfc67b323d32daaa3e46cf7782d9465ed423a6d
 F contrib/sqlitecon.tcl 210a913ad63f9f991070821e599d600bd913e0ad
 F doc/lemon.html 334dbf6621b8fb8790297ec1abf3cfa4621709d1
 F doc/pager-invariants.txt 27fed9a70ddad2088750c4a2b493b63853da2710
@@ -1353,7 +1353,7 @@ F tool/lemon.c 799e73e19a33b8dd7767a7fa34618ed2a9c2397d
 F tool/lempar.c 3617143ddb9b176c3605defe6a9c798793280120
 F tool/loadfts.c c3c64e4d5e90e8ba41159232c2189dba4be7b862
 F tool/logest.c eef612f8adf4d0993dafed0416064cf50d5d33c6
-F tool/mkautoconfamal.sh d1a2da0e15b2ed33d60af35c7e9d483f13a8eb9f
+F tool/mkautoconfamal.sh 4bdf61548a143e5977bd86ab93d68b694d10c8fa
 F tool/mkkeywordhash.c dfff09dbbfaf950e89af294f48f902181b144670
 F tool/mkopcodec.tcl edde8adc42621b5e598127f8cdc6d52cfe21f52b
 F tool/mkopcodeh.tcl e04177031532b7aa9379ded50e820231ac4abd6e
@@ -1395,7 +1395,7 @@ F tool/vdbe_profile.tcl 246d0da094856d72d2c12efec03250d71639d19f
 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
 F tool/warnings.sh 48bd54594752d5be3337f12c72f28d2080cb630b
 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
-P 2964ce25864e8aec86272af741caf49c23c86590
-R 108548c0deac3f928b4d6bf600bf3b5a
+P 34eb6911afee09e779318b79baf953f616200128
+R dbb213b8cdbb03dc8a86ed2fb8ef6538
 U drh
-Z 9e7ef25aa5af86f6161b757cd0b4f721
+Z 7c44c6fe415d9f529c3f15d0974f7632

diff --git a/manifest.uuid b/manifest.uuid
index bb3991b9015287755b6bc3cbb298e32b3e5a0c8d..a30f7468e3fe2073f78e10208b1787a93c230264 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-34eb6911afee09e779318b79baf953f616200128
\ No newline at end of file
+866f0277781dedf0db287ec5902a138406a172e3
\ No newline at end of file

diff --git a/tool/mkautoconfamal.sh b/tool/mkautoconfamal.sh
index 0c2668c8b7ea4fc2b90d837f583a5d9917bfec8f..d78d68181657df9239919eda0d1aa9d43795b8a6 100644 (file)
--- a/tool/mkautoconfamal.sh
+++ b/tool/mkautoconfamal.sh
@@ -56,7 +56,7 @@ mv $TMPSPACE/tmp $TMPSPACE/configure.ac
 cd $TMPSPACE
 aclocal
 autoconf
-automake
+automake --add-missing
 
 mkdir -p tea/generic
 echo "#ifdef USE_SYSTEM_SQLITE"      > tea/generic/tclsqlite3.c