From: dan Date: Wed, 20 Jan 2016 15:19:56 +0000 (+0000) Subject: Fix a problem in autoconf/configure.ac causing --enable-readline to fail if libedit... X-Git-Tag: version-3.11.0~115 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=30908c97ac15d7413d4de3d74f77feff9a10abf6;p=thirdparty%2Fsqlite.git Fix a problem in autoconf/configure.ac causing --enable-readline to fail if libedit was not present. FossilOrigin-Name: e8adeb64d4e463772feb58dbd6f00715b92e735c --- diff --git a/autoconf/configure.ac b/autoconf/configure.ac index deba91ae1d..fcca148aea 100644 --- a/autoconf/configure.ac +++ b/autoconf/configure.ac @@ -49,6 +49,8 @@ if test x"$enable_editline" != xno ; then READLINE_LIBS=$LIBS if test x"$LIBS" != "x"; then AC_DEFINE([HAVE_EDITLINE],1,Define to use BSD editline) + else + unset ac_cv_search_readline fi LIBS=$sLIBS fi diff --git a/manifest b/manifest index d21c7850c5..705d2ce2ea 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Case\sfolding\sin\sthe\sLIKE\soperator\sshould\slook\sat\sall\sbits\sof\sthe\scharacter,\nnot\sjust\sthe\slower\s8\sbits.\s\sFix\sfor\sticket\s[80369eddd5c94].\s\sThis\sis\sa\nback-out\sof\scheck-in\s[0a99a8c4facf]\swith\sa\stestcase\sadded. -D 2016-01-20T14:22:41.167 +C Fix\sa\sproblem\sin\sautoconf/configure.ac\scausing\s--enable-readline\sto\sfail\sif\slibedit\swas\snot\spresent. +D 2016-01-20T15:19:56.944 F Makefile.in a476545d0c8626224d0bacac85c6e2967474af81 F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434 F Makefile.msc 01e855f958932d0d3ed62ec675fc63e2cef61fcb @@ -13,7 +13,7 @@ F autoconf/INSTALL 83e4a25da9fd053c7b3665eaaaf7919707915903 F autoconf/Makefile.am 089e5ecdb5761e64ea1013ded02feb4d8b29927d F autoconf/README 14458f1046c118efa721aadec5f227e876d3cd38 F autoconf/README.first 6c4f34fe115ff55d4e8dbfa3cecf04a0188292f7 -F autoconf/configure.ac 2f41055b10873cfe443a08185343e38c47e2f9f0 +F autoconf/configure.ac 7b1ea0dcaf49fafba262ce4b0ee8cb3281b555d1 F autoconf/tea/Makefile.in b438a7020446c8a8156e8d97c8914a04833da6fd F autoconf/tea/README 3e9a3c060f29a44344ab50aec506f4db903fb873 F autoconf/tea/aclocal.m4 52c47aac44ce0ddb1f918b6993e8beb8eee88f43 @@ -1419,8 +1419,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 18d61c8e40ed1466b6a3a2f53bf0eeb09687c20e -Q -0a99a8c4facf65ec67d8d86108c9a3f723f7cbd6 -R a12b99ab1200f8dc9c9bb177fd701c6e -U drh -Z 48772c507adcfea733ff1f22cebdbc4d +P 204432ee72fda8e82d244c4aa18de7ec4811b8e1 +R 88c735abd00a694aa5831ac3200d7df4 +U dan +Z 23cee0c6751a379626b5009d557e2a86 diff --git a/manifest.uuid b/manifest.uuid index f32ef30853..48f168413c 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -204432ee72fda8e82d244c4aa18de7ec4811b8e1 \ No newline at end of file +e8adeb64d4e463772feb58dbd6f00715b92e735c \ No newline at end of file