merged branche cdi-150

.gitattributes

@@ -237,9 +237,11 @@ tables/echam5 -text
 tables/echam6 -text
 tables/ecmwf -text
 tables/gen_tableheaderfile -text
+tables/grib_api/grib2/4.5.78.150.table -text
+tables/grib_api/grib2/section.4.def -text
+tables/grib_api/grib2/template.3.101.def -text
 tables/mpiom1 -text
 tables/remo -text
-tables/template.3.101.def -text
 tables/wmo_001 -text
 tests/Makefile.am -text
 tests/Makefile.in -text

ChangeLog

+2011-12-19 Luis Kornblueh  <Luis.Kornblueh@zmaw.de>
+
+	* added suppport for GRIB2 level type 150
+
 2011-12-13 Uwe Schulzweida  <Uwe.Schulzweida@zmaw.de>
 
 	* verify_coordinate_vars: bug fix in check for units = "1" [report: Katharina Six]

Makefile.in

@@ -181,6 +181,7 @@ JASPER_LIBS = @JASPER_LIBS@
 LD = @LD@
 LDFLAGS = @LDFLAGS@
 LIBOBJS = @LIBOBJS@
+LIBPNG_LIBS = @LIBPNG_LIBS@
 LIBS = @LIBS@
 LIBTOOL = @LIBTOOL@
 LIPO = @LIPO@
@@ -198,6 +199,7 @@ NM = @NM@
 NMEDIT = @NMEDIT@
 OBJDUMP = @OBJDUMP@
 OBJEXT = @OBJEXT@
+OPENJPEG_LIBS = @OPENJPEG_LIBS@
 OTOOL = @OTOOL@
 OTOOL64 = @OTOOL64@
 PACKAGE = @PACKAGE@
@@ -272,6 +274,7 @@ localstatedir = @localstatedir@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
+openjpeg_LIBS = @openjpeg_LIBS@
 pdfdir = @pdfdir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@

app/Makefile.in

@@ -159,6 +159,7 @@ JASPER_LIBS = @JASPER_LIBS@
 LD = @LD@
 LDFLAGS = @LDFLAGS@
 LIBOBJS = @LIBOBJS@
+LIBPNG_LIBS = @LIBPNG_LIBS@
 LIBS = @LIBS@
 LIBTOOL = @LIBTOOL@
 LIPO = @LIPO@
@@ -176,6 +177,7 @@ NM = @NM@
 NMEDIT = @NMEDIT@
 OBJDUMP = @OBJDUMP@
 OBJEXT = @OBJEXT@
+OPENJPEG_LIBS = @OPENJPEG_LIBS@
 OTOOL = @OTOOL@
 OTOOL64 = @OTOOL64@
 PACKAGE = @PACKAGE@
@@ -250,6 +252,7 @@ localstatedir = @localstatedir@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
+openjpeg_LIBS = @openjpeg_LIBS@
 pdfdir = @pdfdir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@

config/default

@@ -23,6 +23,21 @@ case "${HOSTNAME}" in
                     --with-szlib=$HOME/local \
 	            CC=gcc CFLAGS="-g -pipe -D_REENTRANT -Wall -W -Wfloat-equal -pedantic -O2 -Df2cFortran"
 	;;
+    cinglung*|feilung*)
+	./configure --prefix=$HOME/local \
+                    --enable-shared \
+                    --enable-maintainer-mode \
+                    --enable-swig \
+                    --enable-python \
+                    --with-jasper=/opt/local \
+                    --with-openjpeg=/opt/local \
+                    --with-libpng=/opt/local \
+                    --with-grib_api=/opt/local \
+                    --with-netcdf=/opt/local \
+                    --with-hdf5=/opt/local \
+                    --with-szlib=/opt/local \
+	            CC=gcc CFLAGS="-g -pipe -D_REENTRANT -Wall -W -Wfloat-equal -pedantic -O2 -DpgiFortran"
+	;;
     hama*)
 	./configure --prefix=$HOME/local \
                     --enable-maintainer-mode \

configure

@@ -647,6 +647,9 @@ ENABLE_CGRIBEX
 ENABLE_GRIB
 GRIB_API_LIBS
 GRIB_API_INCLUDE
+LIBPNG_LIBS
+OPENJPEG_LIBS
+openjpeg_LIBS
 JASPER_LIBS
 NETCDF_LIBS
 NETCDF_INCLUDE
@@ -816,6 +819,8 @@ with_szlib
 with_hdf5
 with_netcdf
 with_jasper
+with_openjpeg
+with_libpng
 with_grib_api
 enable_grib
 enable_cgribex
@@ -1520,6 +1525,13 @@ Optional Packages:
   --with-jasper=<directory>
                           Specify location of JASPER library. You must specify
                           its location if GRIB_API was built with JASPER.
+  --with-openjpeg=<directory>
+                          Specify location of openjpeg library. You must
+                          specify its location if GRIB_API was built with
+                          openjpeg.
+  --with-libpng=<directory>
+                          Specify location of LIBPNG library. You must specify
+                          its location if GRIB_API was built with LIBPNG.
   --with-grib_api=<yes|no|directory>
                           library for grib2 compression; if a directory is
                           given, it will be used as a value for
@@ -25632,6 +25644,340 @@ $as_echo "suppressed" >&6; }
 fi
+#  ----------------------------------------------------------------------
+#  Link application with openjpeg library (needed for GRIB2 compression)
+OPENJPEG_LIBS=''
+
+# Check whether --with-openjpeg was given.
+if test "${with_openjpeg+set}" = set; then :
+  withval=$with_openjpeg; case "$with_openjpeg" in #(
+  no) :
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for openjpeg library" >&5
+$as_echo_n "checking for openjpeg library... " >&6; }
+                           { $as_echo "$as_me:${as_lineno-$LINENO}: result: suppressed" >&5
+$as_echo "suppressed" >&6; } ;; #(
+  yes) :
+    for ac_header in openjpeg.h
+do :
+  ac_fn_c_check_header_mongrel "$LINENO" "openjpeg.h" "ac_cv_header_openjpeg_h" "$ac_includes_default"
+if test "x$ac_cv_header_openjpeg_h" = xyes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_OPENJPEG_H 1
+_ACEOF
+
+fi
+
+done
+
+                            { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing opj_image_create" >&5
+$as_echo_n "checking for library containing opj_image_create... " >&6; }
+if ${ac_cv_search_opj_image_create+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_func_search_save_LIBS=$LIBS
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char opj_image_create ();
+int
+main ()
+{
+return opj_image_create ();
+  ;
+  return 0;
+}
+_ACEOF
+for ac_lib in '' openjpeg; do
+  if test -z "$ac_lib"; then
+    ac_res="none required"
+  else
+    ac_res=-l$ac_lib
+    LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
+  fi
+  if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_search_opj_image_create=$ac_res
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext
+  if ${ac_cv_search_opj_image_create+:} false; then :
+  break
+fi
+done
+if ${ac_cv_search_opj_image_create+:} false; then :
+
+else
+  ac_cv_search_opj_image_create=no
+fi
+rm conftest.$ac_ext
+LIBS=$ac_func_search_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_opj_image_create" >&5
+$as_echo "$ac_cv_search_opj_image_create" >&6; }
+ac_res=$ac_cv_search_opj_image_create
+if test "$ac_res" != no; then :
+  test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
+
+$as_echo "#define HAVE_LIBOPENJPEG 1" >>confdefs.h
+
+else
+  as_fn_error $? "Could not link to openjpeg library! Required for GRIB_API" "$LINENO" 5
+fi
+
+                            openjpeg_LIBS=" -lopenjpeg"
+ ;; #(
+  *) :
+    OPENJPEG_ROOT=$with_openjpeg
+                          if test -d "$OPENJPEG_ROOT"; then :
+  LDFLAGS="$LDFLAGS -L$OPENJPEG_ROOT/lib"
+                                 CPPFLAGS="$CPPFLAGS -I$OPENJPEG_ROOT/include"
+                                 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing opj_image_create" >&5
+$as_echo_n "checking for library containing opj_image_create... " >&6; }
+if ${ac_cv_search_opj_image_create+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_func_search_save_LIBS=$LIBS
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char opj_image_create ();
+int
+main ()
+{
+return opj_image_create ();
+  ;
+  return 0;
+}
+_ACEOF
+for ac_lib in '' openjpeg; do
+  if test -z "$ac_lib"; then
+    ac_res="none required"
+  else
+    ac_res=-l$ac_lib
+    LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
+  fi
+  if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_search_opj_image_create=$ac_res
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext
+  if ${ac_cv_search_opj_image_create+:} false; then :
+  break
+fi
+done
+if ${ac_cv_search_opj_image_create+:} false; then :
+
+else
+  ac_cv_search_opj_image_create=no
+fi
+rm conftest.$ac_ext
+LIBS=$ac_func_search_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_opj_image_create" >&5
+$as_echo "$ac_cv_search_opj_image_create" >&6; }
+ac_res=$ac_cv_search_opj_image_create
+if test "$ac_res" != no; then :
+  test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
+
+$as_echo "#define HAVE_LIBOPENJPEG 1" >>confdefs.h
+
+else
+  as_fn_error $? "Could not link to openjpeg library! Required for GRIB_API" "$LINENO" 5
+fi
+
+                                 OPENJPEG_LIBS=" -L$OPENJPEG_ROOT/lib -lopenjpeg"
+else
+  as_fn_error $? "$OPENJPEG_ROOT is not a directory! openjpeg suppressed" "$LINENO" 5
+fi ;; #(
+  *) :
+     ;;
+esac
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for the openjpeg library" >&5
+$as_echo_n "checking for the openjpeg library... " >&6; }
+             { $as_echo "$as_me:${as_lineno-$LINENO}: result: suppressed" >&5
+$as_echo "suppressed" >&6; }
+fi
+
+
+#  ----------------------------------------------------------------------
+#  Link application with LIBPNG library (needed for GRIB2 compression)
+LIBPNG_LIBS=''
+
+# Check whether --with-libpng was given.
+if test "${with_libpng+set}" = set; then :
+  withval=$with_libpng; case "$with_libpng" in #(
+  no) :
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libpng library" >&5
+$as_echo_n "checking for libpng library... " >&6; }
+                           { $as_echo "$as_me:${as_lineno-$LINENO}: result: suppressed" >&5
+$as_echo "suppressed" >&6; } ;; #(
+  yes) :
+    for ac_header in libpng14/png.h
+do :
+  ac_fn_c_check_header_mongrel "$LINENO" "libpng14/png.h" "ac_cv_header_libpng14_png_h" "$ac_includes_default"
+if test "x$ac_cv_header_libpng14_png_h" = xyes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_LIBPNG14_PNG_H 1
+_ACEOF
+
+fi
+
+done
+
+                            { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing png_warning" >&5
+$as_echo_n "checking for library containing png_warning... " >&6; }
+if ${ac_cv_search_png_warning+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_func_search_save_LIBS=$LIBS
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char png_warning ();
+int
+main ()
+{
+return png_warning ();
+  ;
+  return 0;
+}
+_ACEOF
+for ac_lib in '' png14; do
+  if test -z "$ac_lib"; then
+    ac_res="none required"
+  else
+    ac_res=-l$ac_lib
+    LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
+  fi
+  if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_search_png_warning=$ac_res
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext
+  if ${ac_cv_search_png_warning+:} false; then :
+  break
+fi
+done
+if ${ac_cv_search_png_warning+:} false; then :
+
+else
+  ac_cv_search_png_warning=no
+fi
+rm conftest.$ac_ext
+LIBS=$ac_func_search_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_png_warning" >&5
+$as_echo "$ac_cv_search_png_warning" >&6; }
+ac_res=$ac_cv_search_png_warning
+if test "$ac_res" != no; then :
+  test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
+
+$as_echo "#define HAVE_LIBLIBPNG 1" >>confdefs.h
+
+else
+  as_fn_error $? "Could not link to libpng library! Required for GRIB_API" "$LINENO" 5
+fi
+
+                            LIBPNG_LIBS=" -lpng14"
+ ;; #(
+  *) :
+    LIBPNG_ROOT=$with_libpng
+                          if test -d "$LIBPNG_ROOT"; then :
+  LDFLAGS="$LDFLAGS -L$LIBPNG_ROOT/lib"
+                                 CPPFLAGS="$CPPFLAGS -I$LIBPNG_ROOT/include"
+                                 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing png_warning" >&5
+$as_echo_n "checking for library containing png_warning... " >&6; }
+if ${ac_cv_search_png_warning+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_func_search_save_LIBS=$LIBS
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char png_warning ();
+int
+main ()
+{
+return png_warning ();
+  ;
+  return 0;
+}
+_ACEOF
+for ac_lib in '' png14; do
+  if test -z "$ac_lib"; then
+    ac_res="none required"
+  else
+    ac_res=-l$ac_lib
+    LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
+  fi
+  if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_search_png_warning=$ac_res
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext
+  if ${ac_cv_search_png_warning+:} false; then :
+  break
+fi
+done
+if ${ac_cv_search_png_warning+:} false; then :
+
+else
+  ac_cv_search_png_warning=no
+fi
+rm conftest.$ac_ext
+LIBS=$ac_func_search_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_png_warning" >&5
+$as_echo "$ac_cv_search_png_warning" >&6; }
+ac_res=$ac_cv_search_png_warning
+if test "$ac_res" != no; then :
+  test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
+
+$as_echo "#define HAVE_LIBLIBPNG 1" >>confdefs.h
+
+else
+  as_fn_error $? "Could not link to libpng library! Required for GRIB_API" "$LINENO" 5
+fi
+
+                                 LIBPNG_LIBS=" -L$LIBPNG_ROOT/lib -lpng14"
+else
+  as_fn_error $? "$LIBPNG_ROOT is not a directory! LIBPNG suppressed" "$LINENO" 5
+fi ;; #(
+  *) :
+     ;;
+esac
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for the LIBPNG library" >&5
+$as_echo_n "checking for the LIBPNG library... " >&6; }
+             { $as_echo "$as_me:${as_lineno-$LINENO}: result: suppressed" >&5
+$as_echo "suppressed" >&6; }
+fi
+
+
 #  ----------------------------------------------------------------------
 #  Compile application with GRIB_API library (for GRIB2 support)
 GRIB_API_INCLUDE=''

examples/Makefile.in

@@ -188,6 +188,7 @@ JASPER_LIBS = @JASPER_LIBS@
 LD = @LD@
 LDFLAGS = @LDFLAGS@
 LIBOBJS = @LIBOBJS@
+LIBPNG_LIBS = @LIBPNG_LIBS@
 LIBS = @LIBS@
 LIBTOOL = @LIBTOOL@
 LIPO = @LIPO@
@@ -205,6 +206,7 @@ NM = @NM@
 NMEDIT = @NMEDIT@
 OBJDUMP = @OBJDUMP@
 OBJEXT = @OBJEXT@
+OPENJPEG_LIBS = @OPENJPEG_LIBS@
 OTOOL = @OTOOL@
 OTOOL64 = @OTOOL64@
 PACKAGE = @PACKAGE@
@@ -279,6 +281,7 @@ localstatedir = @localstatedir@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
+openjpeg_LIBS = @openjpeg_LIBS@
 pdfdir = @pdfdir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@

interfaces/Makefile.in

@@ -176,6 +176,7 @@ JASPER_LIBS = @JASPER_LIBS@
 LD = @LD@
 LDFLAGS = @LDFLAGS@
 LIBOBJS = @LIBOBJS@
+LIBPNG_LIBS = @LIBPNG_LIBS@
 LIBS = @LIBS@
 LIBTOOL = @LIBTOOL@
 LIPO = @LIPO@
@@ -193,6 +194,7 @@ NM = @NM@
 NMEDIT = @NMEDIT@
 OBJDUMP = @OBJDUMP@
 OBJEXT = @OBJEXT@
+OPENJPEG_LIBS = @OPENJPEG_LIBS@
 OTOOL = @OTOOL@
 OTOOL64 = @OTOOL64@
 PACKAGE = @PACKAGE@
@@ -267,6 +269,7 @@ localstatedir = @localstatedir@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
+openjpeg_LIBS = @openjpeg_LIBS@
 pdfdir = @pdfdir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@

m4/acx_options.m4

@@ -220,6 +220,58 @@ AC_ARG_WITH([jasper],
              AC_MSG_RESULT([suppressed])])
 AC_SUBST([JASPER_LIBS])
 #  ----------------------------------------------------------------------
+#  Link application with openjpeg library (needed for GRIB2 compression)
+OPENJPEG_LIBS=''
+AC_ARG_WITH([openjpeg],
+            [AS_HELP_STRING([--with-openjpeg=<directory>],
+                            [Specify location of openjpeg library. You must specify its location if GRIB_API was built with openjpeg.])],
+            [AS_CASE(["$with_openjpeg"],
+                     [no],[AC_MSG_CHECKING([for openjpeg library])
+                           AC_MSG_RESULT([suppressed])],
+                     [yes],[AC_CHECK_HEADERS([openjpeg.h])
+                            AC_SEARCH_LIBS([opj_image_create],[openjpeg],[AC_DEFINE([HAVE_LIBOPENJPEG],[1],[Define to 1 for JPEG compression for GRIB2])],
+                                           [AC_MSG_ERROR([Could not link to openjpeg library! Required for GRIB_API])])
+                            AC_SUBST([openjpeg_LIBS],[" -lopenjpeg"])],
+                     [*],[OPENJPEG_ROOT=$with_openjpeg
+                          AS_IF([test -d "$OPENJPEG_ROOT"],
+                                [LDFLAGS="$LDFLAGS -L$OPENJPEG_ROOT/lib"
+                                 CPPFLAGS="$CPPFLAGS -I$OPENJPEG_ROOT/include"
+                                 AC_SEARCH_LIBS([opj_image_create],
+                                                [openjpeg],
+                                                [AC_DEFINE([HAVE_LIBOPENJPEG],[1],[Define to 1 for JPEG compression for GRIB2])],
+                                                [AC_MSG_ERROR([Could not link to openjpeg library! Required for GRIB_API])])
+                                 OPENJPEG_LIBS=" -L$OPENJPEG_ROOT/lib -lopenjpeg"],
+                                [AC_MSG_ERROR([$OPENJPEG_ROOT is not a directory! openjpeg suppressed])])])],
+            [AC_MSG_CHECKING([for the openjpeg library])
+             AC_MSG_RESULT([suppressed])])
+AC_SUBST([OPENJPEG_LIBS])
+#  ----------------------------------------------------------------------
+#  Link application with LIBPNG library (needed for GRIB2 compression)
+LIBPNG_LIBS=''
+AC_ARG_WITH([libpng],
+            [AS_HELP_STRING([--with-libpng=<directory>],
+                            [Specify location of LIBPNG library. You must specify its location if GRIB_API was built with LIBPNG.])],
+            [AS_CASE(["$with_libpng"],
+                     [no],[AC_MSG_CHECKING([for libpng library])
+                           AC_MSG_RESULT([suppressed])],
+                     [yes],[AC_CHECK_HEADERS([libpng14/png.h])
+                            AC_SEARCH_LIBS([png_warning],[png14],[AC_DEFINE([HAVE_LIBLIBPNG],[1],[Define to 1 for PNG compression for GRIB2])],
+                                           [AC_MSG_ERROR([Could not link to libpng library! Required for GRIB_API])])
+                            AC_SUBST([LIBPNG_LIBS],[" -lpng14"])],
+                     [*],[LIBPNG_ROOT=$with_libpng
+                          AS_IF([test -d "$LIBPNG_ROOT"],
+                                [LDFLAGS="$LDFLAGS -L$LIBPNG_ROOT/lib"
+                                 CPPFLAGS="$CPPFLAGS -I$LIBPNG_ROOT/include"
+                                 AC_SEARCH_LIBS([png_warning],
+                                                [png14],
+                                                [AC_DEFINE([HAVE_LIBLIBPNG],[1],[Define to 1 for PNG compression for GRIB2])],
+                                                [AC_MSG_ERROR([Could not link to libpng library! Required for GRIB_API])])
+                                 LIBPNG_LIBS=" -L$LIBPNG_ROOT/lib -lpng14"],
+                                [AC_MSG_ERROR([$LIBPNG_ROOT is not a directory! LIBPNG suppressed])])])],
+            [AC_MSG_CHECKING([for the LIBPNG library])
+             AC_MSG_RESULT([suppressed])])
+AC_SUBST([LIBPNG_LIBS])
+#  ----------------------------------------------------------------------
 #  Compile application with GRIB_API library (for GRIB2 support)
 GRIB_API_INCLUDE=''
 GRIB_API_LIBS=''

src/Makefile.in

@@ -184,6 +184,7 @@ JASPER_LIBS = @JASPER_LIBS@
 LD = @LD@
 LDFLAGS = @LDFLAGS@
 LIBOBJS = @LIBOBJS@
+LIBPNG_LIBS = @LIBPNG_LIBS@
 LIBS = @LIBS@
 LIBTOOL = @LIBTOOL@
 LIPO = @LIPO@
@@ -201,6 +202,7 @@ NM = @NM@
 NMEDIT = @NMEDIT@
 OBJDUMP = @OBJDUMP@
 OBJEXT = @OBJEXT@
+OPENJPEG_LIBS = @OPENJPEG_LIBS@
 OTOOL = @OTOOL@
 OTOOL64 = @OTOOL64@
 PACKAGE = @PACKAGE@
@@ -275,6 +277,7 @@ localstatedir = @localstatedir@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
+openjpeg_LIBS = @openjpeg_LIBS@
 pdfdir = @pdfdir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@

src/cdi.h

@@ -639,6 +639,8 @@ int     gridInqPosition(int gridID);
 void    gridDefPosition(int gridID, int position);
 int     gridInqReference(int gridID, char *reference);
 void    gridDefReference(int gridID, const char *reference);
+char   *gridInqUUID(int gridID, char *uuid);
+void    gridDefUUID(int gridID, const char *uuid);
 
 
 /* Lambert Conformal Conic grid (GRIB version) */
@@ -719,6 +721,18 @@ void    zaxisDefLevel(int zaxisID, int levelID, double levels);
 /*      zaxisInqLevel: Get one level of a Z-axis */
 double  zaxisInqLevel(int zaxisID, int levelID);
 
+/*      zaxisDefReference: Define the reference of a generalized Z-axis */
+void    zaxisDefReference(int zaxisID, int refID);
+
+/*      zaxisDefUUID: Define the uuid of a generalized Z-axis */
+void    zaxisDefUUID(int zaxisID, const char *uuid);
+
+/*      zaxisInqUUID: Get the reference of a generalized Z-axis */
+char   *zaxisInqUUID(int zaxisID, char *uuid);
+
+/*      zaxisInqReference: Get the reference of a generalized Z-axis */
+int     zaxisInqReference(int zaxisID);
+
 /*      zaxisDefName: Define the name of a Z-axis */
 void    zaxisDefName(int zaxisID, const char *name);
 

src/config.h.in

@@ -45,6 +45,9 @@
 /* Define to 1 for JPEG compression for GRIB2 */
 #undef HAVE_LIBJASPER
 
+/* Define to 1 for PNG compression for GRIB2 */
+#undef HAVE_LIBLIBPNG
+
 /* Define to 1 if you have the `m' library (-lm). */
 #undef HAVE_LIBM
 
@@ -57,6 +60,12 @@
 /* Define to 1 for NETCDF support */
 #undef HAVE_LIBNETCDF
 
+/* Define to 1 for JPEG compression for GRIB2 */
+#undef HAVE_LIBOPENJPEG
+
+/* Define to 1 if you have the <libpng14/png.h> header file. */
+#undef HAVE_LIBPNG14_PNG_H
+
 /* Define to 1 if you have the `pthread' library (-lpthread). */
 #undef HAVE_LIBPTHREAD
 
@@ -90,6 +99,9 @@
 /* Define to 1 if you have the <netcdf.h> header file. */
 #undef HAVE_NETCDF_H
 
+/* Define to 1 if you have the <openjpeg.h> header file. */
+#undef HAVE_OPENJPEG_H
+