<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/1857f83024e18001af0002806450d2162716c3cd">https://github.com/macports/macports-ports/commit/1857f83024e18001af0002806450d2162716c3cd</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 1857f83024e18001af0002806450d2162716c3cd
</span>Author: Takeshi Enomoto <takeshi@macports.org>
AuthorDate: Mon Oct 23 12:00:21 2017 +0900
<span style='display:block; white-space:pre;color:#404040;'> grads: update to 2.2.0
</span>---
science/grads/Portfile | 24 +-
science/grads/files/patch-configure.diff | 415 ++++++++-----------------------
science/grads/files/udpt | 7 +
3 files changed, 121 insertions(+), 325 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 2fa14da..fa292c0 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.0.2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 14
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 2.2.0
</span> set branch [join [lrange [split ${version} .] 0 1] .]
platforms darwin
maintainers takeshi
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -17,13 +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 1e15249ad8f77314b3b430038b8fc5f6594e6319 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 7bc777292836b104ff6f9c1793f80e8de48c7adf6e24711edffe023bd09becdd \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 7aaad3c846e63f4b36abd1fe73fd91c1bcb11728 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 1cb8cdb29da218bca5d4e2931eb2bc0c2e8a290b29540132ac1f2ad088857689 \
</span> ${gradsdata} \
rmd160 98637dd79e49335e0d986429549fbce2b81afc7a \
sha256 55419fe15478d8213031bb1bfa7adec96984379373ec751cbe37d4bb22f6ce18
<span style='display:block; white-space:pre;background:#ffe0e0;'>-set url http://www.iges.org/grads/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-homepage ${url}/grads.html
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set url http://cola.gmu.edu/grads/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+homepage ${url}
</span> long_description \
The Grid Analysis and Display System (GrADS) is an interactive \
desktop tool that is used for easy access, manipulation, and \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -44,6 +43,7 @@ depends_lib port:readline \
</span> port:curl \
port:libgeotiff \
port:shapelib \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:cairo \
</span> port:xorg-libXmu
depends_build port:pkgconfig
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -52,15 +52,16 @@ patchfiles patch-configure.diff
</span> configure.env-append SUPPLIBS="${prefix}"
configure.args --without-gui \
--with-readline \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- --with-printim \
</span> --with-grib2 \
--with-sdf \
--with-gadap \
--with-shp \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ --with-cairo=${prefix} \
</span> --with-geotiff=${prefix} \
--with-hdf4=${prefix} \
--with-hdf5=${prefix} \
--with-netcdf=${prefix} \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ --libdir=${prefix}/lib/${name} \
</span> --with-x
test.run yes
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -73,6 +74,8 @@ post-destroot {
</span> xinstall -d -m 755 ${destroot}${prefix}/share/${name}/tables
eval xinstall -m 644 [glob -directory ${worksrcpath}/data/tables *] \
${destroot}${prefix}/share/${name}/tables
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -m 644 ${filespath}/udpt ${destroot}${prefix}/share/${name}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s|PREFIX|${prefix}|" ${destroot}${prefix}/share/${name}/udpt
</span> }
platform darwin 8 {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -81,8 +84,5 @@ platform darwin 8 {
</span> }
livecheck.type regex
<span style='display:block; white-space:pre;background:#ffe0e0;'>-livecheck.url ${url}/downloads.html
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#livecheck.regex {The Latest Version of GrADS </span><br>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# <span class="red">GrADS version ([0-9]+\.[0-9]+\.[0-9]+)}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#livecheck.regex {GrADS version ([0-9]+\.[0-9]+\.[0-9]+)}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-livecheck.regex {^\s+<span class="red">GrADS version (\d+\.\d+\.\d+)}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+livecheck.url ${url}/downloads.php
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+livecheck.regex {GrADS version (\d+\.\d+\.\d+) is the latest}
</span><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 1144747..0845401 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,401 +1,190 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- configure.orig 2012-04-04 11:18:20.000000000 +0900
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ configure 2012-04-04 11:20:45.000000000 +0900
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -3232,7 +3232,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- *darwin*)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- is_darwin="yes"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- LDFLAGS="$LDFLAGS -lSystemStubs"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ LDFLAGS="$LDFLAGS"
</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;'>- cray-*-*)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -8821,18 +8821,8 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if test $ac_cv_lib_readline_tgetent = yes; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- configure.orig 2017-08-09 21:30:02.000000000 +0900
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ configure 2017-10-23 11:12:30.000000000 +0900
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -17163,11 +17163,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if test "x$ac_cv_lib_readline_tgetent" = xyes; then :
</span> use_readline=yes
<span style='display:block; white-space:pre;background:#ffe0e0;'>-- ga_include_prefix='-I$(supp_include_dir)'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- for ga_include_name in "" ; do
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- readline_inc="$readline_inc ${ga_include_prefix}/${ga_include_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;'>--
</span> - ga_lib_prefix='$(supp_lib_dir)/lib'
- ga_lib_suffix='.a'
- for ga_lib_name in readline ; do
- readline_libs="$readline_libs ${ga_lib_prefix}${ga_lib_name}${ga_lib_suffix}"
- done
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+ readline_inc=""
</span> + readline_libs=-lreadline
<span style='display:block; white-space:pre;background:#ffe0e0;'>- else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -8903,18 +8893,8 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if test $ac_cv_lib_ncurses_tgetent = yes; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ga_lib_prefix='-l'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -17216,11 +17212,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if test "x$ac_cv_lib_ncurses_tgetent" = xyes; then :
</span> use_readline=yes
<span style='display:block; white-space:pre;background:#ffe0e0;'>-- ga_include_prefix='-I$(supp_include_dir)'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- for ga_include_name in "" ; do
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- readline_inc="$readline_inc ${ga_include_prefix}/${ga_include_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;'>--
</span> - ga_lib_prefix='$(supp_lib_dir)/lib'
- ga_lib_suffix='.a'
- for ga_lib_name in readline ncurses ; do
- readline_libs="$readline_libs ${ga_lib_prefix}${ga_lib_name}${ga_lib_suffix}"
- done
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+ readline_inc=""
</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;'>- else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -8985,18 +8965,8 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if test $ac_cv_lib_termcap_tgetent = yes; 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_include_prefix='-I$(supp_include_dir)'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- for ga_include_name in "" ; do
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- readline_inc="$readline_inc ${ga_include_prefix}/${ga_include_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;'>--
</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_inc=""
</span> + readline_libs=-lreadline
<span style='display:block; white-space:pre;background:#ffe0e0;'>- readline_libadd=" -ltermcap"
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -9978,18 +9948,8 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if test $ac_cv_lib_geotiff_main = yes; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- use_geotiff=yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ga_lib_prefix='-l'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -17337,11 +17329,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ have_geotiff=yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ have_tiff=yes
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-- ga_include_prefix='-I$(supp_include_dir)'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- for ga_include_name in tiff geotiff ; do
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- geotiff_inc="$geotiff_inc ${ga_include_prefix}/${ga_include_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;'>--
</span> - ga_lib_prefix='$(supp_lib_dir)/lib'
- ga_lib_suffix='.a'
- for ga_lib_name in tiff geotiff ; do
- geotiff_libs="$geotiff_libs ${ga_lib_prefix}${ga_lib_name}${ga_lib_suffix}"
- done
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+ geotiff_inc=""
</span> + geotiff_libs="-lgeotiff -ltiff"
<span style='display:block; white-space:pre;background:#ffe0e0;'>- fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -10911,18 +10871,8 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if test $ac_cv_lib_shp_main = yes; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- use_shp=yes
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- ga_include_prefix='-I$(supp_include_dir)'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- for ga_include_name in shapelib shp ; do
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- shp_inc="$shp_inc ${ga_include_prefix}/${ga_include_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;'>--
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ga_lib_prefix='-l'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -17427,11 +17415,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if test "x$ac_cv_lib_shp_main" = xyes; then :
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ have_shp=yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> - ga_lib_prefix='$(supp_lib_dir)/lib'
- ga_lib_suffix='.a'
- for ga_lib_name in shp ; do
- shp_libs="$shp_libs ${ga_lib_prefix}${ga_lib_name}${ga_lib_suffix}"
- done
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+ shp_inc=""
</span> + shp_libs=-lshp
<span style='display:block; white-space:pre;background:#ffe0e0;'>- fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -11217,7 +11167,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ga_saved_libs=$LIBS
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CPPFLAGS=""
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ga_lib_prefix='-l'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -17454,7 +17438,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ LIBS=$ga_saved_libs
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-- for ga_inc_name in libpng12 ; do
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ for ga_inc_name in libpng ; do
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CPPFLAGS="$CPPFLAGS -I${ga_supplib_dir}/include/${ga_inc_name}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- done
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -11225,13 +11175,13 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- # png15
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ # png
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ echo
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ echo png
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ echo ---
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -17471,13 +17455,13 @@
</span> LDFLAGS="-L${ga_supplib_dir}/lib "
LIBS="$LIBS "
<span style='display:block; white-space:pre;background:#ffe0e0;'>-- echo "$as_me:$LINENO: checking for main in -lpng12" >&5
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--echo $ECHO_N "checking for main in -lpng12... $ECHO_C" >&6
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--if test "${ac_cv_lib_png12_main+set}" = set; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ echo "$as_me:$LINENO: checking for main in -lpng" >&5
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+echo $ECHO_N "checking for main in -lpng... $ECHO_C" >&6
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+if test "${ac_cv_lib_png_main+set}" = set; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- echo $ECHO_N "(cached) $ECHO_C" >&6
</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> else
ac_check_lib_save_LIBS=$LIBS
<span style='display:block; white-space:pre;background:#ffe0e0;'>--LIBS="-lpng12 $LIBS"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-LIBS="-lpng15 $LIBS"
</span> +LIBS="-lpng $LIBS"
<span style='display:block; white-space:pre;background:#ffe0e0;'>- cat >conftest.$ac_ext <<_ACEOF
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* confdefs.h. */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- _ACEOF
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -11270,20 +11220,20 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ac_status=$?
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- echo "$as_me:$LINENO: \$? = $ac_status" >&5
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- (exit $ac_status); }; }; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- ac_cv_lib_png12_main=yes
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ ac_cv_lib_png_main=yes
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- echo "$as_me: failed program was:" >&5
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sed 's/^/| /' conftest.$ac_ext >&5
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--ac_cv_lib_png12_main=no
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ac_cv_lib_png_main=no
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- rm -f conftest.err conftest.$ac_objext \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- conftest$ac_exeext conftest.$ac_ext
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- LIBS=$ac_check_lib_save_LIBS
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--echo "$as_me:$LINENO: result: $ac_cv_lib_png12_main" >&5
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--echo "${ECHO_T}$ac_cv_lib_png12_main" >&6
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--if test $ac_cv_lib_png12_main = yes; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+echo "$as_me:$LINENO: result: $ac_cv_lib_png_main" >&5
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+echo "${ECHO_T}$ac_cv_lib_png_main" >&6
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+if test $ac_cv_lib_png_main = yes; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- have_libpng=yes
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -11599,29 +11549,9 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if test $ac_cv_lib_gd_gdImageCreate = yes; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- use_printim=yes
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- ga_include_prefix='-I$(supp_include_dir)'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- for ga_include_name in gd ; do
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- printim_inc="$printim_inc ${ga_include_prefix}/${ga_include_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;'>-- if test "$have_jpeg" = "yes" ; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ printim_inc=""
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ printim_libs=-lgd
</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 gd png12 z jpeg ; do
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- printim_libs="$printim_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;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- else
</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 gd png12 z ; do
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- printim_libs="$printim_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;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -12848,7 +12778,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ga_saved_libs=$LIBS
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CPPFLAGS=""
</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:#ffe0e0;'>-- for ga_inc_name in libpng12 ; do
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ for ga_inc_name in libpng ; do
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CPPFLAGS="$CPPFLAGS -I${ga_supplib_dir}/include/${ga_inc_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;'>-@@ -12856,13 +12786,13 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- LDFLAGS="-L${ga_supplib_dir}/lib "
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- LIBS="$LIBS "
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- echo "$as_me:$LINENO: checking for main in -lpng12" >&5
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--echo $ECHO_N "checking for main in -lpng12... $ECHO_C" >&6
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--if test "${ac_cv_lib_png12_main+set}" = set; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ echo "$as_me:$LINENO: checking for main in -lpng" >&5
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+echo $ECHO_N "checking for main in -lpng... $ECHO_C" >&6
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+if test "${ac_cv_lib_png_main+set}" = set; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- echo $ECHO_N "(cached) $ECHO_C" >&6
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ac_check_lib_save_LIBS=$LIBS
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--LIBS="-lpng12 $LIBS"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+LIBS="-lpng $LIBS"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- cat >conftest.$ac_ext <<_ACEOF
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* confdefs.h. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -17491,17 +17475,17 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> _ACEOF
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -12901,20 +12831,20 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ac_status=$?
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- echo "$as_me:$LINENO: \$? = $ac_status" >&5
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- (exit $ac_status); }; }; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- ac_cv_lib_png12_main=yes
</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> + ac_cv_lib_png_main=yes
else
<span style='display:block; white-space:pre;background:#ffe0e0;'>- echo "$as_me: failed program was:" >&5
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sed 's/^/| /' conftest.$ac_ext >&5
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--ac_cv_lib_png12_main=no
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ac_cv_lib_png_main=no
</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> fi
<span style='display:block; white-space:pre;background:#ffe0e0;'>- rm -f conftest.err conftest.$ac_objext \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- conftest$ac_exeext conftest.$ac_ext
</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> LIBS=$ac_check_lib_save_LIBS
fi
<span style='display:block; white-space:pre;background:#ffe0e0;'>--echo "$as_me:$LINENO: result: $ac_cv_lib_png12_main" >&5
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--echo "${ECHO_T}$ac_cv_lib_png12_main" >&6
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--if test $ac_cv_lib_png12_main = yes; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+echo "$as_me:$LINENO: result: $ac_cv_lib_png_main" >&5
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+echo "${ECHO_T}$ac_cv_lib_png_main" >&6
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+if test $ac_cv_lib_png_main = yes; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- have_libpng=yes
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</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:#e0ffe0;'>+ have_png=yes
</span> fi
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -13227,18 +13157,8 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if test $ac_cv_lib_grib2c_main = yes; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -17887,15 +17871,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if test "x$ac_cv_lib_grib2c_main" = xyes; then :
</span> use_grib2=yes
<span style='display:block; white-space:pre;background:#ffe0e0;'>-- ga_include_prefix='-I$(supp_include_dir)'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- for ga_include_name in grib2c ; do
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- grib2_inc="$grib2_inc ${ga_include_prefix}/${ga_include_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;'>--
</span> - ga_lib_prefix='$(supp_lib_dir)/lib'
- ga_lib_suffix='.a'
<span style='display:block; white-space:pre;background:#ffe0e0;'>-- for ga_lib_name in grib2c jasper png12 z ; do
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- for ga_lib_name in grib2c jasper png15 z ; do
</span> - grib2_libs="$grib2_libs ${ga_lib_prefix}${ga_lib_name}${ga_lib_suffix}"
- done
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+ grib2_inc=""
</span> + grib2_libs="-lgrib2c -ljasper -lpng -lz"
<span style='display:block; white-space:pre;background:#ffe0e0;'>- fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -13459,13 +13379,13 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- echo "$as_me:$LINENO: result: $ac_cv_lib_grib2c_main" >&5
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- echo "${ECHO_T}$ac_cv_lib_grib2c_main" >&6
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if test $ac_cv_lib_grib2c_main = yes; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- echo "$as_me:$LINENO: checking for main in -lpng12" >&5
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--echo $ECHO_N "checking for main in -lpng12... $ECHO_C" >&6
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--if test "${ac_cv_lib_png12_main+set}" = set; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ echo "$as_me:$LINENO: checking for main in -lpng" >&5
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+echo $ECHO_N "checking for main in -lpng... $ECHO_C" >&6
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+if test "${ac_cv_lib_png_main+set}" = set; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- echo $ECHO_N "(cached) $ECHO_C" >&6
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ac_check_lib_save_LIBS=$LIBS
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--LIBS="-lpng12 $LIBS"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+LIBS="-lpng $LIBS"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- cat >conftest.$ac_ext <<_ACEOF
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* confdefs.h. */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- _ACEOF
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -13504,20 +13424,20 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ac_status=$?
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- echo "$as_me:$LINENO: \$? = $ac_status" >&5
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- (exit $ac_status); }; }; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- ac_cv_lib_png12_main=yes
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ ac_cv_lib_png_main=yes
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- echo "$as_me: failed program was:" >&5
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sed 's/^/| /' conftest.$ac_ext >&5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ga_lib_prefix='-l'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- for ga_lib_name in grib2c jasper png15 z ; do
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ for ga_lib_name in grib2c jasper png z ; do
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ grib2_dynlibs="$grib2_dynlibs ${ga_lib_prefix}${ga_lib_name}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ done
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -18172,11 +18152,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ done
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>--ac_cv_lib_png12_main=no
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ac_cv_lib_png_main=no
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- rm -f conftest.err conftest.$ac_objext \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- conftest$ac_exeext conftest.$ac_ext
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- LIBS=$ac_check_lib_save_LIBS
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--echo "$as_me:$LINENO: result: $ac_cv_lib_png12_main" >&5
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--echo "${ECHO_T}$ac_cv_lib_png12_main" >&6
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--if test $ac_cv_lib_png12_main = yes; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+echo "$as_me:$LINENO: result: $ac_cv_lib_png_main" >&5
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+echo "${ECHO_T}$ac_cv_lib_png_main" >&6
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+if test $ac_cv_lib_png_main = yes; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- echo "$as_me:$LINENO: checking for main in -lz" >&5
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- echo $ECHO_N "checking for main in -lz... $ECHO_C" >&6
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if test "${ac_cv_lib_z_main+set}" = set; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -14617,18 +14537,8 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if test $ac_cv_lib_mfhdf_main = yes; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- use_hdf=yes
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- ga_include_prefix='-I$(supp_include_dir)'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- for ga_include_name in hdf udunits ; do
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- hdf_inc="$hdf_inc ${ga_include_prefix}/${ga_include_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;'>--
</span> - ga_lib_prefix='$(supp_lib_dir)/lib'
- ga_lib_suffix='.a'
<span style='display:block; white-space:pre;background:#ffe0e0;'>-- for ga_lib_name in mfhdf df udunits sz jpeg z ; 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:#e0ffe0;'>+- for ga_lib_name in cairo Xrender fontconfig freetype pixman-1 png15 xml2 z ; do
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- cairo_libs="$cairo_libs ${ga_lib_prefix}${ga_lib_name}${ga_lib_suffix}"
</span> - done
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+ hdf_inc=""
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ hdf_libs="-lmfhdf -ldf -ludunits -lsz -ljpeg -lz"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ cairo_libs=-lcairo
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -17168,16 +17078,8 @@
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- ga_include_prefix='-I$(supp_include_dir)'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ga_lib_prefix='-l'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -18436,11 +18412,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ use_hdf5=yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ have_hdf5=yes
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-- for ga_include_name in hdf5 ; do
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- hdf5_inc="$hdf5_inc ${ga_include_prefix}/${ga_include_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;'>--
</span> - ga_lib_prefix='$(supp_lib_dir)/lib'
- ga_lib_suffix='.a'
<span style='display:block; white-space:pre;background:#ffe0e0;'>-- for ga_lib_name in hdf5 sz z ; do
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- for ga_lib_name in hdf5 z ; do
</span> - hdf5_libs="$hdf5_libs ${ga_lib_prefix}${ga_lib_name}${ga_lib_suffix}"
- done
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+ hdf5_inc=""
</span> + hdf5_libs=-lhdf5
<span style='display:block; white-space:pre;background:#ffe0e0;'>- fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -18653,18 +18555,8 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if test $ac_cv_lib_curl_main = yes; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- use_nc4="yes"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- ga_include_prefix='-I$(supp_include_dir)'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- for ga_include_name in udunits netcdf ; do
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- nc_inc="$nc_inc ${ga_include_prefix}/${ga_include_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;'>--
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ga_lib_prefix='-l'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -18555,6 +18527,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ for ga_lib_name in mfhdf df jpeg z udunits ; do
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ hdf_libs="$hdf_libs ${ga_lib_prefix}${ga_lib_name}${ga_lib_suffix}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ done
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ hdf_libs="-lmfhdf -ldf -ludunits"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ga_lib_prefix='-l'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -18637,11 +18610,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if test ! -f "$NC_CONFIG" || test ! -x "$NC_CONFIG"; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ use_nc4="no"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> - ga_lib_prefix='$(supp_lib_dir)/lib'
- ga_lib_suffix='.a'
<span style='display:block; white-space:pre;background:#ffe0e0;'>-- for ga_lib_name in udunits netcdf hdf5_hl hdf5 z sz curl ; do
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- for ga_lib_name in udunits netcdf ; do
</span> - nc_libs="$nc_libs ${ga_lib_prefix}${ga_lib_name}${ga_lib_suffix}"
- done
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+ nc_inc=""
</span> + nc_libs=-lnetcdf
<span style='display:block; white-space:pre;background:#ffe0e0;'>- fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -21604,18 +21496,8 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if test $ac_cv_lib_curl_main = yes; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- use_gadap="yes"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- ga_include_prefix='-I$(supp_include_dir)'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- for ga_include_name in gadap ; do
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- gadap_inc="$gadap_inc ${ga_include_prefix}/${ga_include_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;'>--
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ga_lib_prefix='-l'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -18656,11 +18625,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if test "$nchdf5" = "yes" -a "$use_dap" = "yes" -a "$have_curl" = "yes" ; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ use_nc4="yes"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> - ga_lib_prefix='$(supp_lib_dir)/lib'
- ga_lib_suffix='.a'
<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;'>+- for ga_lib_name in udunits netcdf hdf5_hl hdf5 curl z ; do
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- nc_libs="$nc_libs ${ga_lib_prefix}${ga_lib_name}${ga_lib_suffix}"
</span> - done
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+ gadap_inc=""
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ gadap_libs="-lgadap -ldap -ldapserver -ldapclient -lcurl -lidn -lssl -lcrypto -lz -lxml2 -lpthread -lz -liconv -lm"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ nc_libs=-lnetcdf
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- fi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ga_lib_prefix='-l'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -18799,6 +18764,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ for ga_lib_name in gadap dapclient dap curl xml2 z ; do
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ gadap_libs="$gadap_libs ${ga_lib_prefix}${ga_lib_name}${ga_lib_suffix}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ done
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ gadap_libs=-lgadap
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ga_lib_prefix='-l'
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/grads/files/udpt b/science/grads/files/udpt
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..5a2ade5
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/grads/files/udpt
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+gxdisplay Cairo PREFIX/lib/grads/libgxdCairo.dylib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+gxdisplay X11 PREFIX/lib/grads/libgxdX11.dylib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+gxdisplay gxdummy PREFIX/lib/grads/libgxdummy.dylib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+*
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+gxprint Cairo PREFIX/lib/grads/libgxpCairo.dylib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+gxprint GD PREFIX/lib/grads/libgxpGD.dylib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+gxprint gxdummy PREFIX/lib/grads/libgxdummy.dylib
</span></pre><pre style='margin:0'>
</pre>