From 54479316c77f578f3f3774717f61d264d7ac816b Mon Sep 17 00:00:00 2001
From: Thomas Klausner <wiz@NetBSD.org>
Date: Tue, 8 Sep 2015 11:45:10 +0200
Subject: [PATCH] automake: adapt for changes in 2.1.4.

---
 .gitignore          |  1 +
 c/input/Makefile.am | 11 ++++++-----
 configure.ac        |  2 +-
 3 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/.gitignore b/.gitignore
index 337e7187f..2e9a02a79 100644
--- a/.gitignore
+++ b/.gitignore
@@ -57,6 +57,7 @@ test_join_bucket_keeper
 test_lrec
 test_mlrutil
 test_parse_trie
+test_peek_file_reader
 test_string_builder
 test_byte_readers
 c/dsls/lemon_prepared
diff --git a/c/input/Makefile.am b/c/input/Makefile.am
index 8057634a4..80a91c41b 100644
--- a/c/input/Makefile.am
+++ b/c/input/Makefile.am
@@ -7,13 +7,12 @@ libinput_la_SOURCES=	\
 			file_reader_stdio.c \
 			file_reader_stdio.h \
 			lrec_reader.h \
-			lrec_reader_csvex.c \
+			lrec_reader_csv.c \
 			lrec_reader_in_memory.c \
 			lrec_reader_mmap_csvlite.c \
 			lrec_reader_mmap_dkvp.c \
 			lrec_reader_mmap_nidx.c \
 			lrec_reader_mmap_xtab.c \
-			lrec_reader_stdio_csv.c \
 			lrec_reader_stdio_csvlite.c \
 			lrec_reader_stdio_dkvp.c \
 			lrec_reader_stdio_nidx.c \
@@ -21,8 +20,7 @@ libinput_la_SOURCES=	\
 			lrec_readers.c \
 			lrec_readers.h \
 			mmap_byte_reader.c \
-			old_peek_file_reader.c \
-			old_peek_file_reader.h \
+			peek_file_reader.c \
 			peek_file_reader.h \
 			stdio_byte_reader.c \
 			string_byte_reader.c
@@ -31,10 +29,13 @@ libinput_la_CPPFLAGS=	-I${srcdir}/../
 libinput_la_CFLAGS=	-std=gnu99
 
 TESTS=			$(check_PROGRAMS)
-check_PROGRAMS=		test_byte_readers
+check_PROGRAMS=		test_byte_readers test_peek_file_reader
 
 test_byte_readers_LDADD=		libinput.la \
 					../lib/libmlr.la
 test_byte_readers_CPPFLAGS=	-D__TEST_BYTE_READERS_MAIN__ ${AM_CPPFLAGS}
 
+test_peek_file_reader_LDADD=		libinput.la
+test_peek_file_reader_CPPFLAGS=	-D__TEST_PEEK_FILE_READER_MAIN__ ${AM_CPPFLAGS}
+
 AM_CPPFLAGS=	-I${srcdir}/../
diff --git a/configure.ac b/configure.ac
index 1f51eed37..9eb781e45 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,6 +1,6 @@
 AC_PREREQ([2.60])
 # Manually increment on updates to https://github.com/johnkerl/miller/releases
-AC_INIT([mlr],[2.1.3])
+AC_INIT([mlr],[2.1.4])
 AC_CONFIG_SRCDIR([c/mlrmain.c])
 AC_CONFIG_HEADERS([config.h])
 AC_CONFIG_AUX_DIR([autotools])