From 5f32b68806203b93395482d1ead26377b19a375e Mon Sep 17 00:00:00 2001
From: Keith James <kdj@sanger.ac.uk>
Date: Wed, 7 Oct 2015 16:44:34 +0100
Subject: [PATCH] Fixed configure.ac because iRODS run-in-place has re-named
 rodsVersion.hpp back to rodsVersion.h.

Updated ChangeLog.
---
 ChangeLog    | 9 +++++++--
 configure.ac | 2 +-
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index d8c9cb31..7863ca45 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,8 @@
 
+	[0.16.0]
+
+	Bugfix: baton-metamod was missing its --unsafe CLI option.
+
 	Report data object resource and location for replicates when the
 	--replicate option is used.
 
@@ -12,10 +16,11 @@
 	Added reporting of a user's or group's zone to results obtained
 	when querying permissions.
 
+	Support for iRODS 4.0.x discontinued.
+
 	[0.14.0]
 
-	Fixed a bug that caused queries on ACLs across zones to return no
-	results.
+	Bugfix: fixed queries on ACLs across zones returning no results.
 
 	Added support for iRODS 4.1.x. Support for 4.0.x is temporarily
 	suspended until after the release of iRODS 4.1.0.
diff --git a/configure.ac b/configure.ac
index 2794a2e9..75468166 100644
--- a/configure.ac
+++ b/configure.ac
@@ -232,7 +232,7 @@ CPPFLAGS=${IRODS4_RIP_CPPFLAGS}
 AC_RUN_IFELSE(
   [AC_LANG_PROGRAM([
 #include <string.h>
-#include <rodsVersion.hpp>
+#include <rodsVersion.h>
 ], [
 #if defined (RODS_REL_VERSION)
   return strncmp("rods4.", RODS_REL_VERSION, 5);