From 4e3965851c3a2315abd50ee91f46e22bceeb44a0 Mon Sep 17 00:00:00 2001
From: ph10 <ph10@2f5784b3-3f2a-0410-8824-cb99058d5e15>
Date: Tue, 20 Mar 2018 10:56:03 +0000
Subject: [PATCH] Final file tidies for 8.42.

git-svn-id: svn://vcs.exim.org/pcre/code/trunk@1732 2f5784b3-3f2a-0410-8824-cb99058d5e15
---
 ChangeLog    | 11 ++++++-----
 NEWS         |  4 ++--
 configure.ac |  8 ++++----
 3 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 627a384..7b53195 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -4,8 +4,9 @@ ChangeLog for PCRE
 Note that the PCRE 8.xx series (PCRE1) is now in a bugfix-only state. All
 development is happening in the PCRE2 10.xx series.
 
-Version 8.42 20-February-2018
------------------------------
+
+Version 8.42 20-March-2018
+--------------------------
 
 1.  Fixed a MIPS issue in the JIT compiler reported by Joshua Kinard.
 
@@ -49,11 +50,11 @@ containing multi-code-unit characters caused bad behaviour and possibly a
 crash. This issue was fixed for other kinds of repeat in release 8.37 by change
 38, but repeating character classes were overlooked.
 
-6. A small fix to pcregrep to avoid compiler warnings for -Wformat-overflow=2.
+11. A small fix to pcregrep to avoid compiler warnings for -Wformat-overflow=2.
 
-7. Added --enable-jit=auto support to configure.ac.
+12. Added --enable-jit=auto support to configure.ac.
 
-8. Fix misleading error message in configure.ac.
+13. Fix misleading error message in configure.ac.
 
 
 Version 8.41 05-July-2017
diff --git a/NEWS b/NEWS
index fb66619..09b4ad3 100644
--- a/NEWS
+++ b/NEWS
@@ -1,8 +1,8 @@
 News about PCRE releases
 ------------------------
 
-Release 8.42 20-February-2018
------------------------------
+Release 8.42 20-March-2018
+--------------------------
 
 This is a bug-fix release.
 
diff --git a/configure.ac b/configure.ac
index f2c8233..dcdef6a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -10,8 +10,8 @@ dnl be defined as -RC2, for example. For real releases, it should be empty.
 
 m4_define(pcre_major, [8])
 m4_define(pcre_minor, [42])
-m4_define(pcre_prerelease, [-RC1])
-m4_define(pcre_date, [2018-02-20])
+m4_define(pcre_prerelease, [])
+m4_define(pcre_date, [2018-03-20])
 
 # NOTE: The CMakeLists.txt file searches for the above variables in the first
 # 50 lines of this file. Please update that if the variables above are moved.
@@ -156,7 +156,7 @@ AC_ARG_ENABLE(jit,
               , enable_jit=no)
 
 # This code enables JIT if the hardware supports it.
-              
+
 if test "$enable_jit" = "auto"; then
   AC_LANG(C)
   AC_COMPILE_IFELSE([AC_LANG_SOURCE([[
@@ -481,7 +481,7 @@ pcre_have_type_traits="0"
 pcre_have_bits_type_traits="0"
 
 if test "x$enable_cpp" = "xyes" -a -z "$CXX"; then
-   AC_MSG_ERROR([Invalid C++ compiler or C++ compiler flags]) 
+   AC_MSG_ERROR([Invalid C++ compiler or C++ compiler flags])
 fi
 
 if test "x$enable_cpp" = "xyes" -a -n "$CXX"