Update ChangeLog and bump version for v1.15.1 release.

Signed-off-by: Joachim Nilsson <troglobit@gmail.com>

ChangeLog.md

@@ -3,6 +3,19 @@ Change Log
 
 All notable changes to the project are documented in this file.
 
+[1.15.1][] - 2015-11-16
+-----------------------
+
+Bug fixes only.
+
+### Changes
+- Update README with origin of this version of editline
+
+##¤ Fixes
+- Fix build system, don't force automake v1.11, require at least v1.11
+- Fix build problem with examples using `--enable-termcap`
+
+
 [1.15.0][] - 2015-09-10
 -----------------------
 
@@ -124,6 +137,7 @@ Adaptations to Debian editline package.
 
 
 [UNRELEASED]:    https://github.com/troglobit/finit/compare/1.15.0...HEAD
+[1.15.0]:        https://github.com/troglobit/finit/compare/1.15.0...1.15.1
 [1.15.0]:        https://github.com/troglobit/finit/compare/1.14.2...1.15.0
 [1.14.2]:        https://github.com/troglobit/finit/compare/1.14.1...1.14.2
 [1.14.1]:        https://github.com/troglobit/finit/compare/1.14.0...1.14.1

README.md

@@ -137,12 +137,20 @@ The `$DESTDIR` environment variable is honored at install.  See
 Origin & References
 --------------------
 
-This [line editing][] library was created by Simmule Turner and Rich Salz
-in in 1992.  It is distributed under a “C News-like” license, similar to
-the [BSD license][].  For details, see the file [LICENSE][].
+This [line editing][] library was created by Simmule Turner and
+[Rich Salz][upstream] in in 1992.  It is distributed under a “C
+News-like” license, similar to the [BSD license][].  Rich's latest
+version is however under the Apache license.  For details on the
+licensing terms of this version of the software, see [LICENSE][].
 
-This version of the editline library is forked from the [Minix 3][] source
-tree.  Patches and bug fixes from the following forks, all based on the
+This version of the editline library was forked from the [Minix 3][]
+source tree and is *not* related to the similarily named NetBSD version
+that [Jess Thrysøe][jess] disitributes to the world outside BSD.  The
+libraries have much in common, but the latter is heavily refactored and
+also relies on ncurses, whereas this library only uses termios from the
+standard C library.
+
+Patches and bug fixes from the following forks, all based on the
 original comp.sources.unix posting, have been merged:
 
 * Debian [libeditline][]
@@ -166,7 +174,9 @@ Outstanding issues are listed in the [TODO.md][] file.
 [TODO.md]:         https://github.com/troglobit/editline/blob/master/TODO.md
 [ChangeLog.md]:    https://github.com/troglobit/editline/blob/master/ChangeLog.md
 [FSF readline]:    http://www.gnu.org/software/readline/
-[Minix 3]:         http://www.minix3.org/
+[upstream]:        https://github.com/richsalz/editline/
+[Minix 3]:         http://www.cise.ufl.edu/~cop4600/cgi-bin/lxr/http/source.cgi/lib/editline/
+[jess]:            http://thrysoee.dk/editline/
 [BSD license]:     http://en.wikipedia.org/wiki/BSD_licenses
 [libeditline]:     http://packages.qa.debian.org/e/editline.html
 [Heimdal]:         http://www.h5l.org

autogen.sh

@@ -1,7 +1,3 @@
 #!/bin/sh
 
-# Use v1.11 for backwards compat with Ubuntu 12.04 LTS
-export ACLOCAL=aclocal-1.11
-export AUTOMAKE=automake-1.11
-
 autoreconf -W portability -visfm

configure.ac

@@ -13,8 +13,8 @@
 # implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
 AC_PREREQ(2.61)
-AC_INIT(editline, 1.15.0, https://github.com/troglobit/editline/issues)
-AM_INIT_AUTOMAKE([no-dist-gzip dist-xz])
+AC_INIT(editline, 1.15.1, https://github.com/troglobit/editline/issues)
+AM_INIT_AUTOMAKE([1.11 no-dist-gzip dist-xz])
 AM_SILENT_RULES([yes])
 
 AC_CONFIG_MACRO_DIR([m4])
@@ -83,6 +83,7 @@ AC_ARG_ENABLE(termcap,
    [AS_HELP_STRING([--enable-termcap], [Use termcap library to query terminal size.])],
    AC_DEFINE([CONFIG_USE_TERMCAP], 1, [Define to use the termcap library for terminal size.]))
 
+AM_CONDITIONAL([USE_LIBTERMCAP], [test "$enable_termcap" != no])
 AM_CFLAGS="-std=gnu99 $inline_cflags -W -Wall -Wundef -Wunused -Wstrict-prototypes -Werror-implicit-function-declaration $nopointersign_cflags -Wshadow -Wcast-qual"
 AC_SUBST(AM_CFLAGS)
 

examples/Makefile.am

@@ -1,6 +1,11 @@
 AUTOMAKE_OPTIONS = foreign
 
 noinst_PROGRAMS  = testit cli
-LDADD            = $(top_builddir)/src/libeditline.la $(TERMLIBS)
+LDADD            = $(top_builddir)/src/libeditline.la
 AM_CFLAGS        = -I$(top_srcdir)/src -I$(top_srcdir)/include
 AM_LDFLAGS       = -static
+
+if USE_LIBTERMCAP
+LDADD           += -ltermcap
+endif
+