added calendar.h

.gitattributes

@@ -527,6 +527,7 @@ src/after_vertint.c -text
 src/after_vertint.h -text
 src/afterburner.h -text
 src/afterburnerlib.c -text
+src/calendar.h -text
 src/cdo.c -text
 src/cdo.h -text
 src/cdo_getopt.c -text

Makefile.in

-# Makefile.in generated by automake 1.14.1 from Makefile.am.
+# Makefile.in generated by automake 1.14 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994-2013 Free Software Foundation, Inc.
@@ -674,10 +674,9 @@ distcheck: dist
 	  && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \
 	  && am__cwd=`pwd` \
 	  && $(am__cd) $(distdir)/_build \
-	  && ../configure \
+	  && ../configure --srcdir=.. --prefix="$$dc_install_base" \
 	    $(AM_DISTCHECK_CONFIGURE_FLAGS) \
 	    $(DISTCHECK_CONFIGURE_FLAGS) \
-	    --srcdir=.. --prefix="$$dc_install_base" \
 	  && $(MAKE) $(AM_MAKEFLAGS) \
 	  && $(MAKE) $(AM_MAKEFLAGS) dvi \
 	  && $(MAKE) $(AM_MAKEFLAGS) check \

aclocal.m4

-# generated automatically by aclocal 1.14.1 -*- Autoconf -*-
+# generated automatically by aclocal 1.14 -*- Autoconf -*-
 
 # Copyright (C) 1996-2013 Free Software Foundation, Inc.
 
@@ -14,8 +14,8 @@
 m4_ifndef([AC_CONFIG_MACRO_DIRS], [m4_defun([_AM_CONFIG_MACRO_DIRS], [])m4_defun([AC_CONFIG_MACRO_DIRS], [_AM_CONFIG_MACRO_DIRS($@)])])
 m4_ifndef([AC_AUTOCONF_VERSION],
   [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
-m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.69],,
-[m4_warning([this file was generated for autoconf 2.69.
+m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.68],,
+[m4_warning([this file was generated for autoconf 2.68.
 You have another version of autoconf.  It may work, but is not guaranteed to.
 If you have problems, you may need to regenerate the build system entirely.
 To do so, use the procedure documented by the package, typically 'autoreconf'.])])
@@ -35,7 +35,7 @@ AC_DEFUN([AM_AUTOMAKE_VERSION],
 [am__api_version='1.14'
 dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
 dnl require some minimum version.  Point them to the right macro.
-m4_if([$1], [1.14.1], [],
+m4_if([$1], [1.14], [],
       [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
 ])
 
@@ -51,7 +51,7 @@ m4_define([_AM_AUTOCONF_VERSION], [])
 # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
 # This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
 AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-[AM_AUTOMAKE_VERSION([1.14.1])dnl
+[AM_AUTOMAKE_VERSION([1.14])dnl
 m4_ifndef([AC_AUTOCONF_VERSION],
   [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
 _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])

contrib/Makefile.in

-# Makefile.in generated by automake 1.14.1 from Makefile.am.
+# Makefile.in generated by automake 1.14 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994-2013 Free Software Foundation, Inc.

src/Makefile.am

@@ -19,6 +19,7 @@ libcdo_la_SOURCES =            \
                afterburnerlib.c\
                afterburner.h   \
                vct_l191.h      \
+               calendar.h      \
                constants.h     \
                constants.c     \
                color.c         \

src/Makefile.in

-# Makefile.in generated by automake 1.14.1 from Makefile.am.
+# Makefile.in generated by automake 1.14 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994-2013 Free Software Foundation, Inc.
@@ -563,16 +563,16 @@ libcdo_la_SOURCES = cdo_int.h compare.h cdo_pthread.c cdo_vlist.c \
 	cdo_getopt.c cdo_getopt.h cdo_task.c cdo_task.h cdo_history.c \
 	after_sptrans.c after_fctrans.c after_dvtrans.c \
 	after_vertint.c after_vertint.h after_namelist.c \
-	afterburnerlib.c afterburner.h vct_l191.h constants.h \
-	constants.c color.c color.h commandline.c const.h counter.h \
-	datetime.c datetime.h dmemory.h ecacore.c ecacore.h ecautil.c \
-	ecautil.h error.h etopo.h temp.h mask.h exception.c expr.c \
-	expr.h expr_lex.c expr_yacc.c expr_yacc.h features.c field.c \
-	field.h field2.c fieldc.c fieldmem.c fieldmer.c fieldzon.c \
-	functs.h gradsdeslib.c gradsdeslib.h grid.c grid.h grid_area.c \
-	grid_gme.c grid_lcc.c grid_rot.c gridreference.c griddes.c \
-	griddes.h griddes_h5.c griddes_nc.c hetaeta.c hetaeta.h \
-	institution.c interpol.c interpol.h job.c juldate.c \
+	afterburnerlib.c afterburner.h vct_l191.h calendar.h \
+	constants.h constants.c color.c color.h commandline.c const.h \
+	counter.h datetime.c datetime.h dmemory.h ecacore.c ecacore.h \
+	ecautil.c ecautil.h error.h etopo.h temp.h mask.h exception.c \
+	expr.c expr.h expr_lex.c expr_yacc.c expr_yacc.h features.c \
+	field.c field.h field2.c fieldc.c fieldmem.c fieldmer.c \
+	fieldzon.c functs.h gradsdeslib.c gradsdeslib.h grid.c grid.h \
+	grid_area.c grid_gme.c grid_lcc.c grid_rot.c gridreference.c \
+	griddes.c griddes.h griddes_h5.c griddes_nc.c hetaeta.c \
+	hetaeta.h institution.c interpol.c interpol.h job.c juldate.c \
 	grid_search.c grid_search.h kvlist.c kvlist.h list.c list.h \
 	merge_sort2.c merge_sort2.h modules.c modules.h namelist.c \
 	namelist.h normal.c nth_element.c nth_element.h \

src/calendar.h

+#ifndef _CALENDAR_H
+#define _CALENDAR_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+void encode_caldaysec(int calendar, int year, int month, int day, int hour, int minute, int second,
+		      int *julday, int *secofday);
+void decode_caldaysec(int calendar, int julday, int secofday,
+		      int *year, int *month, int *day, int *hour, int *minute, int *second);
+
+int calendar_dpy(int calendar);
+int days_per_year(int calendar, int year);
+int days_per_month(int calendar, int year, int month);
+
+#if defined (__cplusplus)
+}
+#endif
+
+#endif  /* _CALENDAR_H */
+/*
+ * Local Variables:
+ * c-file-style: "Java"
+ * c-basic-offset: 2
+ * indent-tabs-mode: nil
+ * show-trailing-whitespace: t
+ * require-trailing-newline: t
+ * End:
+ */

src/config.h.in

@@ -255,11 +255,6 @@
 /* Version number of package */
 #undef VERSION
 
-/* Enable large inode numbers on Mac OS X 10.5.  */
-#ifndef _DARWIN_USE_64_BIT_INODE
-# define _DARWIN_USE_64_BIT_INODE 1
-#endif
-
 /* Number of bits in a file offset, on hosts where this is settable. */
 #undef _FILE_OFFSET_BITS
 

test/Makefile.in

-# Makefile.in generated by automake 1.14.1 from Makefile.am.
+# Makefile.in generated by automake 1.14 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994-2013 Free Software Foundation, Inc.

test/data/Makefile.in

-# Makefile.in generated by automake 1.14.1 from Makefile.am.
+# Makefile.in generated by automake 1.14 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994-2013 Free Software Foundation, Inc.