Merge pull request #1614 from NCAR/ejh_prepare

changed version numbers for 2.5.0 release

Author: edwardhartnett

CMakeLists.txt

@@ -4,8 +4,8 @@ project (PIO C Fortran)
 
 # The project version number.
 set(VERSION_MAJOR   2   CACHE STRING "Project major version number.")
-set(VERSION_MINOR   4   CACHE STRING "Project minor version number.")
-set(VERSION_PATCH   4   CACHE STRING "Project patch version number.")
+set(VERSION_MINOR   5   CACHE STRING "Project minor version number.")
+set(VERSION_PATCH   0   CACHE STRING "Project patch version number.")
 mark_as_advanced(VERSION_MAJOR VERSION_MINOR VERSION_PATCH)
 
 # The size of the data buffer for write/read_darray().

configure.ac

@@ -1,21 +1,20 @@
 ## This is the autoconf file for the PIO library.
 ## Ed Hartnett 8/16/17
 
-
 # Initialize autoconf and automake.
-AC_INIT(pio, 2.4.4)
+AC_INIT(pio, 2.5.0)
 AC_CONFIG_SRCDIR(src/clib/pio_darray.c)
 AM_INIT_AUTOMAKE([foreign serial-tests])
 
 # The PIO version, again.
 AC_DEFINE([PIO_VERSION_MAJOR], [2], [PIO major version])
-AC_DEFINE([PIO_VERSION_MINOR], [4], [PIO minor version])
-AC_DEFINE([PIO_VERSION_PATCH], [4], [PIO patch version])
+AC_DEFINE([PIO_VERSION_MINOR], [5], [PIO minor version])
+AC_DEFINE([PIO_VERSION_PATCH], [0], [PIO patch version])
 
 # Once more for the documentation.
 AC_SUBST([VERSION_MAJOR], [2])
-AC_SUBST([VERSION_MINOR], [4])
-AC_SUBST([VERSION_PATCH], [4])
+AC_SUBST([VERSION_MINOR], [5])
+AC_SUBST([VERSION_PATCH], [0])
 
 # The m4 directory holds macros for autoconf.
 AC_CONFIG_MACRO_DIR([m4])

src/clib/Makefile.am

@@ -13,7 +13,7 @@ endif # BUILD_NCINT
 # These linker flags specify libtool version info.
 # See http://www.gnu.org/software/libtool/manual/libtool.html#Libtool-versioning
 # for information regarding incrementing `-version-info`.
-libpioc_la_LDFLAGS = -version-info 3:0:2
+libpioc_la_LDFLAGS = -version-info 4:0:3
 
 # The library header file will be installed in include dir.
 include_HEADERS = pio.h uthash.h

src/clib/pio_internal.h

@@ -16,6 +16,7 @@
 #include <bget.h>
 #include <limits.h>
 #include <math.h>
+#include <netcdf.h>
 #ifdef _NETCDF4
 #include <netcdf_par.h>
 #endif

src/ncint/ncintdispatch.c

@@ -7,9 +7,9 @@
 
 #include "config.h"
 #include <stdlib.h>
-#include "ncintdispatch.h"
 #include "pio.h"
 #include "pio_internal.h"
+#include "ncintdispatch.h"
 
 /* Prototypes from nc4internal.h. */
 int nc4_file_list_add(int ncid, const char *path, int mode,