<pre style='margin:0'>
Takeshi Enomoto (tenomoto) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/f9ec249826f89a03ef951dbb09bd0c11cdf34463">https://github.com/macports/macports-ports/commit/f9ec249826f89a03ef951dbb09bd0c11cdf34463</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new f9ec249 grads: update to 2.2.1
</span>f9ec249 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit f9ec249826f89a03ef951dbb09bd0c11cdf34463
</span>Author: Takeshi Enomoto <takeshi@macports.org>
AuthorDate: Thu May 10 11:29:33 2018 +0900
<span style='display:block; white-space:pre;color:#404040;'> grads: update to 2.2.1
</span>---
science/grads/Portfile | 15 +--
science/grads/files/patch-configure.diff | 188 ++++++++++---------------------
2 files changed, 69 insertions(+), 134 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/grads/Portfile b/science/grads/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 8cb0702..69c4701 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/grads/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/grads/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -3,8 +3,7 @@
</span> PortSystem 1.0
name grads
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 2.2.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 2.2.1
</span> set branch [join [lrange [split ${version} .] 0 1] .]
platforms darwin
maintainers {takeshi @tenomoto}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -17,11 +16,13 @@ set gradssrc ${name}-${version}-src${extract.suffix}
</span> set gradsdata data2${extract.suffix}
distfiles ${gradssrc}:src ${gradsdata}:data
checksums ${gradssrc} \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 7aaad3c846e63f4b36abd1fe73fd91c1bcb11728 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 1cb8cdb29da218bca5d4e2931eb2bc0c2e8a290b29540132ac1f2ad088857689 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 498232b716b1bbda674976f38b421dd284d68900 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 695e2066d7d131720d598bac0beb61ac3ae5578240a5437401dc0ffbbe516206 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 5976570 \
</span> ${gradsdata} \
rmd160 98637dd79e49335e0d986429549fbce2b81afc7a \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 55419fe15478d8213031bb1bfa7adec96984379373ec751cbe37d4bb22f6ce18
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 55419fe15478d8213031bb1bfa7adec96984379373ec751cbe37d4bb22f6ce18 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 1779887
</span> set url http://cola.gmu.edu/grads/
homepage ${url}
long_description \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -70,10 +71,10 @@ test.target check
</span>
post-destroot {
xinstall -d -m 755 ${destroot}${prefix}/share/${name}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- eval xinstall -m 644 [glob -directory ${worksrcpath}/data *.dat *res] \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -m 644 {*}[glob -directory ${worksrcpath}/data *.dat *res] \
</span> ${destroot}${prefix}/share/${name}
xinstall -d -m 755 ${destroot}${prefix}/share/${name}/tables
<span style='display:block; white-space:pre;background:#ffe0e0;'>- eval xinstall -m 644 [glob -directory ${worksrcpath}/data/tables *] \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -m 644 {*}[glob -directory ${worksrcpath}/data/tables *] \
</span> ${destroot}${prefix}/share/${name}/tables
xinstall -m 644 ${filespath}/udpt ${destroot}${prefix}/share/${name}
reinplace "s|PREFIX|${prefix}|" ${destroot}${prefix}/share/${name}/udpt
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/grads/files/patch-configure.diff b/science/grads/files/patch-configure.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 0845401..e967b7d 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/grads/files/patch-configure.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/grads/files/patch-configure.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,67 +1,15 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- configure.orig 2017-08-09 21:30:02.000000000 +0900
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ configure 2017-10-23 11:12:30.000000000 +0900
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -17163,11 +17163,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if test "x$ac_cv_lib_readline_tgetent" = xyes; then :
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- use_readline=yes
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- ga_lib_prefix='$(supp_lib_dir)/lib'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- ga_lib_suffix='.a'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- for ga_lib_name in readline ; do
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- readline_libs="$readline_libs ${ga_lib_prefix}${ga_lib_name}${ga_lib_suffix}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- done
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ readline_libs=-lreadline
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ga_lib_prefix='-l'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -17216,11 +17212,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if test "x$ac_cv_lib_ncurses_tgetent" = xyes; then :
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- use_readline=yes
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- ga_lib_prefix='$(supp_lib_dir)/lib'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- ga_lib_suffix='.a'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- for ga_lib_name in readline ncurses ; do
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- readline_libs="$readline_libs ${ga_lib_prefix}${ga_lib_name}${ga_lib_suffix}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- done
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ readline_libs=-lreadline
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ga_lib_prefix='-l'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -17337,11 +17329,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- have_geotiff=yes
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- have_tiff=yes
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- ga_lib_prefix='$(supp_lib_dir)/lib'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- ga_lib_suffix='.a'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- for ga_lib_name in tiff geotiff ; do
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- geotiff_libs="$geotiff_libs ${ga_lib_prefix}${ga_lib_name}${ga_lib_suffix}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- done
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ geotiff_libs="-lgeotiff -ltiff"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ga_lib_prefix='-l'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -17427,11 +17415,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if test "x$ac_cv_lib_shp_main" = xyes; then :
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- have_shp=yes
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- ga_lib_prefix='$(supp_lib_dir)/lib'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- ga_lib_suffix='.a'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- for ga_lib_name in shp ; do
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- shp_libs="$shp_libs ${ga_lib_prefix}${ga_lib_name}${ga_lib_suffix}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- done
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ shp_libs=-lshp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ga_lib_prefix='-l'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -17454,7 +17438,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- LIBS=$ga_saved_libs
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- configure.orig 2018-04-25 06:22:23.000000000 +0900
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ configure 2018-05-10 11:23:43.000000000 +0900
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -18088,7 +18088,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if test "Z$ga_supplib_dir" != "Z" ; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ echo looking in $ga_supplib_dir for additional dependent libs
</span>
- # png15
+ # png
echo
echo png
echo ---
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -17471,13 +17455,13 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -18105,13 +18105,13 @@
</span> LDFLAGS="-L${ga_supplib_dir}/lib "
LIBS="$LIBS "
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -79,7 +27,7 @@
</span> cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -17491,17 +17475,17 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -18125,17 +18125,17 @@
</span> }
_ACEOF
if ac_fn_c_try_link "$LINENO"; then :
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -102,89 +50,75 @@
</span> have_png=yes
fi
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -17887,15 +17871,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -19016,10 +19016,10 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $as_echo "$ac_cv_lib_grib2c_main" >&6; }
</span> if test "x$ac_cv_lib_grib2c_main" = xyes; then :
use_grib2=yes
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- ga_lib_prefix='$(supp_lib_dir)/lib'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- ga_lib_suffix='.a'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- for ga_lib_name in grib2c jasper png15 z ; do
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- grib2_libs="$grib2_libs ${ga_lib_prefix}${ga_lib_name}${ga_lib_suffix}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- done
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ grib2_libs="-lgrib2c -ljasper -lpng -lz"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-# GA_SET_LIB_VAR([grib2_libs], [grib2c jasper png15 z])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# GA_SET_LIB_VAR([grib2_libs], [grib2c jasper png z])
</span>
ga_lib_prefix='-l'
- for ga_lib_name in grib2c jasper png15 z ; do
+ for ga_lib_name in grib2c jasper png z ; do
<span style='display:block; white-space:pre;background:#ffe0e0;'>- grib2_dynlibs="$grib2_dynlibs ${ga_lib_prefix}${ga_lib_name}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- done
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -18172,11 +18152,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ grib2_libs="$grib2_libs ${ga_lib_prefix}${ga_lib_name}"
</span> done
<span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -19077,13 +19077,13 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $as_echo "$ac_cv_lib_grib2c_main" >&6; }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if test "x$ac_cv_lib_grib2c_main" = xyes; then :
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-- ga_lib_prefix='$(supp_lib_dir)/lib'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- ga_lib_suffix='.a'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- for ga_lib_name in cairo Xrender fontconfig freetype pixman-1 png15 xml2 z ; do
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- cairo_libs="$cairo_libs ${ga_lib_prefix}${ga_lib_name}${ga_lib_suffix}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- done
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ cairo_libs=-lcairo
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ga_lib_prefix='-l'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -18436,11 +18412,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- use_hdf5=yes
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- have_hdf5=yes
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- ga_lib_prefix='$(supp_lib_dir)/lib'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- ga_lib_suffix='.a'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- for ga_lib_name in hdf5 z ; do
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- hdf5_libs="$hdf5_libs ${ga_lib_prefix}${ga_lib_name}${ga_lib_suffix}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- done
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ hdf5_libs=-lhdf5
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ga_lib_prefix='-l'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -18555,6 +18527,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- for ga_lib_name in mfhdf df jpeg z udunits ; do
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- hdf_libs="$hdf_libs ${ga_lib_prefix}${ga_lib_name}${ga_lib_suffix}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- done
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ hdf_libs="-lmfhdf -ldf -ludunits"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ga_lib_prefix='-l'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -18637,11 +18610,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if test ! -f "$NC_CONFIG" || test ! -x "$NC_CONFIG"; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- use_nc4="no"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- ga_lib_prefix='$(supp_lib_dir)/lib'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- ga_lib_suffix='.a'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- for ga_lib_name in udunits netcdf ; do
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- nc_libs="$nc_libs ${ga_lib_prefix}${ga_lib_name}${ga_lib_suffix}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- done
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ nc_libs=-lnetcdf
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -lpng15" >&5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-$as_echo_n "checking for main in -lpng15... " >&6; }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-if ${ac_cv_lib_png15_main+:} false; then :
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -lpng" >&5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++$as_echo_n "checking for main in -lpng... " >&6; }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++if ${ac_cv_lib_png_main+:} false; then :
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $as_echo_n "(cached) " >&6
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ac_check_lib_save_LIBS=$LIBS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-LIBS="-lpng15 $LIBS"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++LIBS="-lpng $LIBS"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* end confdefs.h. */
</span>
<span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -19097,17 +19097,17 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ _ACEOF
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if ac_fn_c_try_link "$LINENO"; then :
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- ac_cv_lib_png15_main=yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ac_cv_lib_png_main=yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- ac_cv_lib_png15_main=no
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ac_cv_lib_png_main=no
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ fi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rm -f core conftest.err conftest.$ac_objext \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ conftest$ac_exeext conftest.$ac_ext
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ LIBS=$ac_check_lib_save_LIBS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ fi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_png15_main" >&5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-$as_echo "$ac_cv_lib_png15_main" >&6; }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-if test "x$ac_cv_lib_png15_main" = xyes; then :
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_png_main" >&5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++$as_echo "$ac_cv_lib_png_main" >&6; }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++if test "x$ac_cv_lib_png_main" = xyes; then :
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- ga_lib_prefix='-l'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -18656,11 +18625,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if test "$nchdf5" = "yes" -a "$use_dap" = "yes" -a "$have_curl" = "yes" ; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- use_nc4="yes"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for compress in -lz" >&5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $as_echo_n "checking for compress in -lz... " >&6; }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -19212,7 +19212,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if test "x$ac_cv_lib_jasper_main" = xyes; then :
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-- ga_lib_prefix='$(supp_lib_dir)/lib'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- ga_lib_suffix='.a'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- for ga_lib_name in udunits netcdf hdf5_hl hdf5 curl z ; do
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- nc_libs="$nc_libs ${ga_lib_prefix}${ga_lib_name}${ga_lib_suffix}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- done
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ nc_libs=-lnetcdf
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ga_check_grib2="yes"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- G2_LIBS="-lgrib2c -ljasper -lpng15 -lz"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ G2_LIBS="-lgrib2c -ljasper -lpng -lz"
</span>
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ fi
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- ga_lib_prefix='-l'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -18799,6 +18764,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- for ga_lib_name in gadap dapclient dap curl xml2 z ; do
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- gadap_libs="$gadap_libs ${ga_lib_prefix}${ga_lib_name}${ga_lib_suffix}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -19451,7 +19451,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ cairo_inc="$cairo_inc ${ga_include_prefix}/${ga_include_name}"
</span> done
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+ gadap_libs=-lgadap
</span>
<span style='display:block; white-space:pre;background:#e0ffe0;'>+-# GA_SET_LIB_VAR(cairo_libs, [cairo Xrender fontconfig freetype pixman-1 png15 xml2 z])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# GA_SET_LIB_VAR(cairo_libs, [cairo Xrender fontconfig freetype pixman-1 png xml2 z])
</span>
ga_lib_prefix='-l'
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ for ga_lib_name in cairo ; do
</span></pre><pre style='margin:0'>
</pre>