Revision

91551

Author

takeshi@macports.org

Date

2012-04-04 17:58:49 -0700 (Wed, 04 Apr 2012)

Log Message

grads: revamped to 2.0.1.
grads2: set to nomaintainer.
grads2 was created to take advantages of new features
using the development version from OpenGrADS project.
grads from IGES has released the non-alpha non-beta version
with the new features of GrADS 2
so I decided to update from 1.9b4 to 2.0.1.
grads2 is kept as it is.

Modified Paths

• trunk/dports/science/grads/Portfile
• trunk/dports/science/grads/files/patch-configure.diff
• trunk/dports/science/grads2/Portfile

Removed Paths

• trunk/dports/science/grads/files/patch-bufrscan.c.diff
• trunk/dports/science/grads/files/patch-gacfg.c.diff
• trunk/dports/science/grads/files/patch-grads.h.diff
• trunk/dports/science/grads/files/patch-gxhpng.c.diff
• trunk/dports/science/grads/files/patch-wgrib.c.diff

Diff

--- trunk/dports/science/grads/Portfile	2012-04-05 00:46:55 UTC (rev 91550)
+++ trunk/dports/science/grads/Portfile	2012-04-05 00:58:49 UTC (rev 91551)
@@ -1,22 +1,23 @@
 # -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
 # $Id$
 
-PortSystem 1.0
+PortSystem          1.0
 
 name                grads
-version             1.9b4
-revision            12
+version             2.0.1
 platforms           darwin
 maintainers         takeshi
 categories          science
 description         interactive visualization tool for earth science data
-master_sites        ftp://grads.iges.org/grads/1.9/:src \
+master_sites        ftp://grads.iges.org/grads/2.0/:src \
                     ftp://grads.iges.org/grads/:data
-set gradssrc        ${name}-src-${version}${extract.suffix}
-set gradsdata       data.tar.Z
+set gradssrc        ${name}-${version}-src${extract.suffix}
+set gradsdata       data2${extract.suffix}
 distfiles           ${gradssrc}:src ${gradsdata}:data
-checksums           ${gradssrc}  sha1 839e32693602e2695825d4d5a1a8ae7e1672c3a5 \
-                    ${gradsdata} sha1 6a3e997868b358ecf71ea618c27ad10f28183f5e
+checksums           ${gradssrc}  rmd160 6fa94639174f626a664effcf236beace79d660f4 \
+                    ${gradssrc}  sha256 5c8111ad650f10092dda12fc875e6f58bf00cf12affa6b10c0fefd03a29591a2 \
+                    ${gradsdata} rmd160 98637dd79e49335e0d986429549fbce2b81afc7a \
+                    ${gradsdata} sha256 55419fe15478d8213031bb1bfa7adec96984379373ec751cbe37d4bb22f6ce18
 homepage            http://www.iges.org/grads/grads.html
 long_description   \
     The Grid Analysis and Display System (GrADS) is an interactive     \
@@ -26,39 +27,48 @@
     GrADS has been implemented worldwide on a variety of commonly used \
     operating systems and is freely distributed over the Internet.
 
-depends_lib         port:libwww     port:readline   port:rx   \
-                    port:netcdf     port:udunits    port:hdf4 \
-                    port:libnc-dap  port:gd2
+depends_lib         port:readline   \
+                    port:netcdf     \
+                    port:udunits    \
+                    port:hdf4       \
+                    port:gd2        \
+                    port:gadap      \
+                    port:wgrib2     \
+                    port:curl       \
+                    port:libgeotiff \
+                    port:shapelib
+depends_build       port:pkgconfig
 
-patchfiles          patch-configure.diff patch-grads.h.diff    \
-                    patch-wgrib.c.diff   patch-bufrscan.c.diff \
-                    patch-gacfg.c.diff   patch-gxhpng.c.diff
+patchfiles          patch-configure.diff
 
-post-patch {
-    reinplace "s|/usr/local|${prefix}|" ${worksrcpath}/src/gx.h
-    reinplace "s| www | |" ${worksrcpath}/configure
-    foreach f {gaio gasdf gauser stnmap} {
-        reinplace "s|%li|%d|g" ${worksrcpath}/src/${f}.c
-    }
-}
+#if {${configure.compiler}=="clang"} {
+#    configure.compiler llvm-gcc-4.2
+#}
+configure.env-append    SUPPLIBS="${prefix}"
+configure.args          --without-gui   \
+                        --with-readline \
+                        --with-printim  \
+                        --with-grib2    \
+                        --with-sdf      \
+                        --with-gadap    \
+                        --with-shp      \
+                        --with-geotiff  \
+                        --with-x
 
-if {${configure.compiler}=="clang"} {
-    configure.compiler  llvm-gcc-4.2
-}
-configure.env       SUPPLIBS=${prefix} LIBS="-lsz"
-configure.args      --with-readline --with-lats \
-                    --with-nc --with-dods --with-hdf --with-x      \
-                    --with-printim --without-gui \
-                    --enable-dyn-supplibs
+test.run            yes
+test.target         check
 
-post-configure {
-    reinplace "s|\$(supp_lib_dir)/inst.o| |g" ${worksrcpath}/src/Makefile
+post-destroot {
+    xinstall -d -m 755 ${destroot}${prefix}/share/${name}
+    eval xinstall -m 644 [glob -directory ${worksrcpath}/data *.dat *res] \
+        ${destroot}${prefix}/share/${name}
+    xinstall -d -m 755 ${destroot}${prefix}/share/${name}/tables
+    eval xinstall -m 644 [glob -directory ${worksrcpath}/data/tables *] \
+        ${destroot}${prefix}/share/${name}/tables
 }
 
-post-destroot {
-    xinstall -d -m 755 ${destroot}${prefix}/share/${name}/
-    foreach file [glob -directory ${workpath} *.dat *res] {
-        file rename ${file} ${destroot}${prefix}/share/${name}/
-    }
-    system "ln -s ${prefix}/bin/${name}dods ${destroot}${prefix}/bin/${name}"
+platform darwin 8 {
+    depends_lib-delete      libnc-dap
+    configure.args-delete   --with-dap
+    configure.args-append   --without-dap
 }

--- trunk/dports/science/grads/files/patch-bufrscan.c.diff	2012-04-05 00:46:55 UTC (rev 91550)
+++ trunk/dports/science/grads/files/patch-bufrscan.c.diff	2012-04-05 00:58:49 UTC (rev 91551)
@@ -1,10 +0,0 @@
---- src/bufrscan.c.orig	2007-03-14 11:08:44.000000000 +0900
-+++ src/bufrscan.c	2007-03-14 11:08:59.000000000 +0900
-@@ -8,6 +8,7 @@
- #include <stdlib.h>
- #include <stdio.h>
- #include <string.h>
-+#include <sys/types.h>
- #include "gabufr.h"
- 
- #ifndef HAVE_FSEEKO

--- trunk/dports/science/grads/files/patch-configure.diff	2012-04-05 00:46:55 UTC (rev 91550)
+++ trunk/dports/science/grads/files/patch-configure.diff	2012-04-05 00:58:49 UTC (rev 91551)
@@ -1,1642 +1,401 @@
---- configure.orig	2005-05-24 00:04:40.000000000 +0900
-+++ configure	2008-03-13 22:53:01.000000000 +0900
-@@ -11916,7 +11916,7 @@
-      ga_lib_suffix='.a'
-   fi
+--- configure.orig	2012-04-04 11:18:20.000000000 +0900
++++ configure	2012-04-04 11:20:45.000000000 +0900
+@@ -3232,7 +3232,7 @@
  
--  for ga_lib_name in mfhdf df jpeg udunits z ; do
-+  for ga_lib_name in mfhdf df netcdf jpeg udunits z ; do
-       hdf_libs="$hdf_libs ${ga_lib_prefix}${ga_lib_name}${ga_lib_suffix}"
-   done
+   *darwin*)
+     is_darwin="yes"
+-    LDFLAGS="$LDFLAGS -lSystemStubs"
++    LDFLAGS="$LDFLAGS"
+   ;;
  
-@@ -12371,13 +12371,13 @@
- if test $ac_cv_lib_rx_main = yes; then
+   cray-*-*)
+@@ -8821,18 +8821,8 @@
+ if test $ac_cv_lib_readline_tgetent = yes; then
+    use_readline=yes
  
-   if test "${ga_dyn_supplibs}" = "yes" ; then
--     echo "$as_me:$LINENO: checking for main in -lwww" >&5
--echo $ECHO_N "checking for main in -lwww... $ECHO_C" >&6
-+     echo "$as_me:$LINENO: checking for main in -lwwwcore" >&5
-+echo $ECHO_N "checking for main in -lwwwcore... $ECHO_C" >&6
- if test "${ac_cv_lib_www_main+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   ac_check_lib_save_LIBS=$LIBS
--LIBS="-lwww  $LIBS"
-+LIBS="-lwwwcore  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
- #line $LINENO "configure"
- /* confdefs.h.  */
-@@ -12422,13 +12422,13 @@
- if test $ac_cv_lib_www_main = yes; then
+-  ga_include_prefix='-I$(supp_include_dir)'
+-
+-  for ga_include_name in "" ; do
+-      readline_inc="$readline_inc ${ga_include_prefix}/${ga_include_name}"
+-  done
+-
+-
+-  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
++  readline_inc=""
++  readline_libs=-lreadline
  
-   if test "${ga_dyn_supplibs}" = "yes" ; then
--     echo "$as_me:$LINENO: checking for main in -ldap++" >&5
--echo $ECHO_N "checking for main in -ldap++... $ECHO_C" >&6
-+     echo "$as_me:$LINENO: checking for main in -ldap" >&5
-+echo $ECHO_N "checking for main in -ldap... $ECHO_C" >&6
- if test "${ac_cv_lib_dappp_main+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   ac_check_lib_save_LIBS=$LIBS
--LIBS="-ldap++  $LIBS"
-+LIBS="-ldap  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
- #line $LINENO "configure"
- /* confdefs.h.  */
-@@ -12473,13 +12473,13 @@
- if test $ac_cv_lib_dappp_main = yes; then
  
-   if test "${ga_dyn_supplibs}" = "yes" ; then
--     echo "$as_me:$LINENO: checking for main in -lnc-dods" >&5
--echo $ECHO_N "checking for main in -lnc-dods... $ECHO_C" >&6
-+     echo "$as_me:$LINENO: checking for main in -lnc-dap" >&5
-+echo $ECHO_N "checking for main in -lnc-dap... $ECHO_C" >&6
- if test "${ac_cv_lib_nc_dods_main+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-   ac_check_lib_save_LIBS=$LIBS
--LIBS="-lnc-dods  $LIBS"
-+LIBS="-lnc-dap  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
- #line $LINENO "configure"
- /* confdefs.h.  */
-@@ -12527,9 +12527,9 @@
- fi
+@@ -8903,18 +8893,8 @@
+ if test $ac_cv_lib_ncurses_tgetent = yes; then
+    use_readline=yes
  
-   else
--     echo "$as_me:$LINENO: checking for libnc-dods.a in supplibs" >&5
--echo $ECHO_N "checking for libnc-dods.a in supplibs... $ECHO_C" >&6
--     if test -f "${ga_supplib_dir}/lib/libnc-dods.a" ; then
-+     echo "$as_me:$LINENO: checking for libnc-dap.a in supplibs" >&5
-+echo $ECHO_N "checking for libnc-dap.a in supplibs... $ECHO_C" >&6
-+     if test -f "${ga_supplib_dir}/lib/libnc-dap.a" ; then
-      	echo "$as_me:$LINENO: result: yes" >&5
- echo "${ECHO_T}yes" >&6
- 	 ga_check_dods="yes"
-@@ -12546,20 +12546,20 @@
- fi
+-  ga_include_prefix='-I$(supp_include_dir)'
+-
+-  for ga_include_name in "" ; do
+-      readline_inc="$readline_inc ${ga_include_prefix}/${ga_include_name}"
+-  done
+-
+-
+-  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
++  readline_inc=""
++  readline_libs=-lreadline
  
-   else
--     echo "$as_me:$LINENO: checking for libdap++.a in supplibs" >&5
--echo $ECHO_N "checking for libdap++.a in supplibs... $ECHO_C" >&6
--     if test -f "${ga_supplib_dir}/lib/libdap++.a" ; then
-+     echo "$as_me:$LINENO: checking for libdap.a in supplibs" >&5
-+echo $ECHO_N "checking for libdap.a in supplibs... $ECHO_C" >&6
-+     if test -f "${ga_supplib_dir}/lib/libdap.a" ; then
-      	echo "$as_me:$LINENO: result: yes" >&5
- echo "${ECHO_T}yes" >&6
  
-   if test "${ga_dyn_supplibs}" = "yes" ; then
--     echo "$as_me:$LINENO: checking for main in -lnc-dods" >&5
--echo $ECHO_N "checking for main in -lnc-dods... $ECHO_C" >&6
-+     echo "$as_me:$LINENO: checking for main in -lnc-dap" >&5
-+echo $ECHO_N "checking for main in -lnc-dap... $ECHO_C" >&6
- if test "${ac_cv_lib_nc_dods_main+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-   ac_check_lib_save_LIBS=$LIBS
--LIBS="-lnc-dods  $LIBS"
-+LIBS="-lnc-dap  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
- #line $LINENO "configure"
- /* confdefs.h.  */
-@@ -12607,9 +12607,9 @@
- fi
+@@ -8985,18 +8965,8 @@
+ if test $ac_cv_lib_termcap_tgetent = yes; then
+    use_readline=yes
  
-   else
--     echo "$as_me:$LINENO: checking for libnc-dods.a in supplibs" >&5
--echo $ECHO_N "checking for libnc-dods.a in supplibs... $ECHO_C" >&6
--     if test -f "${ga_supplib_dir}/lib/libnc-dods.a" ; then
-+     echo "$as_me:$LINENO: checking for libnc-dap.a in supplibs" >&5
-+echo $ECHO_N "checking for libnc-dap.a in supplibs... $ECHO_C" >&6
-+     if test -f "${ga_supplib_dir}/lib/libnc-dap.a" ; then
-      	echo "$as_me:$LINENO: result: yes" >&5
- echo "${ECHO_T}yes" >&6
- 	 ga_check_dods="yes"
-@@ -12635,20 +12635,20 @@
- fi
+-  ga_include_prefix='-I$(supp_include_dir)'
+-
+-  for ga_include_name in "" ; do
+-      readline_inc="$readline_inc ${ga_include_prefix}/${ga_include_name}"
+-  done
+-
+-
+-  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
++  readline_inc=""
++  readline_libs=-lreadline
  
-   else
--     echo "$as_me:$LINENO: checking for libwww.a in supplibs" >&5
--echo $ECHO_N "checking for libwww.a in supplibs... $ECHO_C" >&6
--     if test -f "${ga_supplib_dir}/lib/libwww.a" ; then
-+     echo "$as_me:$LINENO: checking for libwwwcore.a in supplibs" >&5
-+echo $ECHO_N "checking for libwwwcore.a in supplibs... $ECHO_C" >&6
-+     if test -f "${ga_supplib_dir}/lib/libwwwcore.a" ; then
-      	echo "$as_me:$LINENO: result: yes" >&5
- echo "${ECHO_T}yes" >&6
+               readline_libadd=" -ltermcap"
  
-   if test "${ga_dyn_supplibs}" = "yes" ; then
--     echo "$as_me:$LINENO: checking for main in -ldap++" >&5
--echo $ECHO_N "checking for main in -ldap++... $ECHO_C" >&6
-+     echo "$as_me:$LINENO: checking for main in -ldap" >&5
-+echo $ECHO_N "checking for main in -ldap... $ECHO_C" >&6
- if test "${ac_cv_lib_dappp_main+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   ac_check_lib_save_LIBS=$LIBS
--LIBS="-ldap++  $LIBS"
-+LIBS="-ldap  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
- #line $LINENO "configure"
- /* confdefs.h.  */
-@@ -12693,13 +12693,13 @@
- if test $ac_cv_lib_dappp_main = yes; then
+@@ -9978,18 +9948,8 @@
+ if test $ac_cv_lib_geotiff_main = yes; then
+    use_geotiff=yes
  
-   if test "${ga_dyn_supplibs}" = "yes" ; then
--     echo "$as_me:$LINENO: checking for main in -lnc-dods" >&5
--echo $ECHO_N "checking for main in -lnc-dods... $ECHO_C" >&6
-+     echo "$as_me:$LINENO: checking for main in -lnc-dap" >&5
-+echo $ECHO_N "checking for main in -lnc-dap... $ECHO_C" >&6
- if test "${ac_cv_lib_nc_dods_main+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   ac_check_lib_save_LIBS=$LIBS
--LIBS="-lnc-dods  $LIBS"
-+LIBS="-lnc-dap  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
- #line $LINENO "configure"
- /* confdefs.h.  */
-@@ -12747,9 +12747,9 @@
- fi
+-  ga_include_prefix='-I$(supp_include_dir)'
+-
+-  for ga_include_name in tiff geotiff ; do
+-      geotiff_inc="$geotiff_inc ${ga_include_prefix}/${ga_include_name}"
+-  done
+-
+-
+-  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
++  geotiff_inc=""
++  geotiff_libs="-lgeotiff -ltiff"
  
-   else
--     echo "$as_me:$LINENO: checking for libnc-dods.a in supplibs" >&5
--echo $ECHO_N "checking for libnc-dods.a in supplibs... $ECHO_C" >&6
--     if test -f "${ga_supplib_dir}/lib/libnc-dods.a" ; then
-+     echo "$as_me:$LINENO: checking for libnc-dap.a in supplibs" >&5
-+echo $ECHO_N "checking for libnc-dap.a in supplibs... $ECHO_C" >&6
-+     if test -f "${ga_supplib_dir}/lib/libnc-dap.a" ; then
-      	echo "$as_me:$LINENO: result: yes" >&5
- echo "${ECHO_T}yes" >&6
- 	 ga_check_dods="yes"
-@@ -12766,20 +12766,20 @@
- fi
  
-   else
--     echo "$as_me:$LINENO: checking for libdap++.a in supplibs" >&5
--echo $ECHO_N "checking for libdap++.a in supplibs... $ECHO_C" >&6
--     if test -f "${ga_supplib_dir}/lib/libdap++.a" ; then
-+     echo "$as_me:$LINENO: checking for libdap.a in supplibs" >&5
-+echo $ECHO_N "checking for libdap.a in supplibs... $ECHO_C" >&6
-+     if test -f "${ga_supplib_dir}/lib/libdap.a" ; then
-      	echo "$as_me:$LINENO: result: yes" >&5
- echo "${ECHO_T}yes" >&6
- 
-   if test "${ga_dyn_supplibs}" = "yes" ; then
--     echo "$as_me:$LINENO: checking for main in -lnc-dods" >&5
--echo $ECHO_N "checking for main in -lnc-dods... $ECHO_C" >&6
-+     echo "$as_me:$LINENO: checking for main in -lnc-dap" >&5
-+echo $ECHO_N "checking for main in -lnc-dap... $ECHO_C" >&6
- if test "${ac_cv_lib_nc_dods_main+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   ac_check_lib_save_LIBS=$LIBS
--LIBS="-lnc-dods  $LIBS"
-+LIBS="-lnc-dap  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
- #line $LINENO "configure"
- /* confdefs.h.  */
-@@ -12827,9 +12827,9 @@
  fi
+@@ -10911,18 +10871,8 @@
+ if test $ac_cv_lib_shp_main = yes; then
+    use_shp=yes
  
-   else
--     echo "$as_me:$LINENO: checking for libnc-dods.a in supplibs" >&5
--echo $ECHO_N "checking for libnc-dods.a in supplibs... $ECHO_C" >&6
--     if test -f "${ga_supplib_dir}/lib/libnc-dods.a" ; then
-+     echo "$as_me:$LINENO: checking for libnc-dap.a in supplibs" >&5
-+echo $ECHO_N "checking for libnc-dap.a in supplibs... $ECHO_C" >&6
-+     if test -f "${ga_supplib_dir}/lib/libnc-dap.a" ; then
-      	echo "$as_me:$LINENO: result: yes" >&5
- echo "${ECHO_T}yes" >&6
- 	 ga_check_dods="yes"
-@@ -12871,13 +12871,13 @@
- echo "${ECHO_T}yes" >&6
+-  ga_include_prefix='-I$(supp_include_dir)'
+-
+-  for ga_include_name in shapelib shp ; do
+-      shp_inc="$shp_inc ${ga_include_prefix}/${ga_include_name}"
+-  done
+-
+-
+-  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
++  shp_inc=""
++  shp_libs=-lshp
  
-   if test "${ga_dyn_supplibs}" = "yes" ; then
--     echo "$as_me:$LINENO: checking for main in -lwww" >&5
--echo $ECHO_N "checking for main in -lwww... $ECHO_C" >&6
-+     echo "$as_me:$LINENO: checking for main in -lwwwcore" >&5
-+echo $ECHO_N "checking for main in -lwwwcore... $ECHO_C" >&6
- if test "${ac_cv_lib_www_main+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   ac_check_lib_save_LIBS=$LIBS
--LIBS="-lwww  $LIBS"
-+LIBS="-lwwwcore  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
- #line $LINENO "configure"
- /* confdefs.h.  */
-@@ -12922,13 +12922,13 @@
- if test $ac_cv_lib_www_main = yes; then
  
-   if test "${ga_dyn_supplibs}" = "yes" ; then
--     echo "$as_me:$LINENO: checking for main in -ldap++" >&5
--echo $ECHO_N "checking for main in -ldap++... $ECHO_C" >&6
-+     echo "$as_me:$LINENO: checking for main in -ldap" >&5
-+echo $ECHO_N "checking for main in -ldap... $ECHO_C" >&6
- if test "${ac_cv_lib_dappp_main+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   ac_check_lib_save_LIBS=$LIBS
--LIBS="-ldap++  $LIBS"
-+LIBS="-ldap  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
- #line $LINENO "configure"
- /* confdefs.h.  */
-@@ -12973,13 +12973,13 @@
- if test $ac_cv_lib_dappp_main = yes; then
- 
-   if test "${ga_dyn_supplibs}" = "yes" ; then
--     echo "$as_me:$LINENO: checking for main in -lnc-dods" >&5
--echo $ECHO_N "checking for main in -lnc-dods... $ECHO_C" >&6
-+     echo "$as_me:$LINENO: checking for main in -lnc-dap" >&5
-+echo $ECHO_N "checking for main in -lnc-dap... $ECHO_C" >&6
- if test "${ac_cv_lib_nc_dods_main+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   ac_check_lib_save_LIBS=$LIBS
--LIBS="-lnc-dods  $LIBS"
-+LIBS="-lnc-dap  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
- #line $LINENO "configure"
- /* confdefs.h.  */
-@@ -13027,9 +13027,9 @@
  fi
+@@ -11217,7 +11167,7 @@
+   ga_saved_libs=$LIBS
+   CPPFLAGS=""
  
-   else
--     echo "$as_me:$LINENO: checking for libnc-dods.a in supplibs" >&5
--echo $ECHO_N "checking for libnc-dods.a in supplibs... $ECHO_C" >&6
--     if test -f "${ga_supplib_dir}/lib/libnc-dods.a" ; then
-+     echo "$as_me:$LINENO: checking for libnc-dap.a in supplibs" >&5
-+echo $ECHO_N "checking for libnc-dap.a in supplibs... $ECHO_C" >&6
-+     if test -f "${ga_supplib_dir}/lib/libnc-dap.a" ; then
-      	echo "$as_me:$LINENO: result: yes" >&5
- echo "${ECHO_T}yes" >&6
- 	 ga_check_dods="yes"
-@@ -13046,20 +13046,20 @@
- fi
+-    for ga_inc_name in libpng12 ; do
++    for ga_inc_name in libpng ; do
+       CPPFLAGS="$CPPFLAGS -I${ga_supplib_dir}/include/${ga_inc_name}"
+     done
  
-   else
--     echo "$as_me:$LINENO: checking for libdap++.a in supplibs" >&5
--echo $ECHO_N "checking for libdap++.a in supplibs... $ECHO_C" >&6
--     if test -f "${ga_supplib_dir}/lib/libdap++.a" ; then
-+     echo "$as_me:$LINENO: checking for libdap.a in supplibs" >&5
-+echo $ECHO_N "checking for libdap.a in supplibs... $ECHO_C" >&6
-+     if test -f "${ga_supplib_dir}/lib/libdap.a" ; then
-      	echo "$as_me:$LINENO: result: yes" >&5
- echo "${ECHO_T}yes" >&6
+@@ -11225,13 +11175,13 @@
+   LDFLAGS="-L${ga_supplib_dir}/lib "
+   LIBS="$LIBS "
  
-   if test "${ga_dyn_supplibs}" = "yes" ; then
--     echo "$as_me:$LINENO: checking for main in -lnc-dods" >&5
--echo $ECHO_N "checking for main in -lnc-dods... $ECHO_C" >&6
-+     echo "$as_me:$LINENO: checking for main in -lnc-dap" >&5
-+echo $ECHO_N "checking for main in -lnc-dap... $ECHO_C" >&6
- if test "${ac_cv_lib_nc_dods_main+set}" = set; then
+-    echo "$as_me:$LINENO: checking for main in -lpng12" >&5
+-echo $ECHO_N "checking for main in -lpng12... $ECHO_C" >&6
+-if test "${ac_cv_lib_png12_main+set}" = set; then
++    echo "$as_me:$LINENO: checking for main in -lpng" >&5
++echo $ECHO_N "checking for main in -lpng... $ECHO_C" >&6
++if test "${ac_cv_lib_png_main+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    ac_check_lib_save_LIBS=$LIBS
--LIBS="-lnc-dods  $LIBS"
-+LIBS="-lnc-dap  $LIBS"
+-LIBS="-lpng12  $LIBS"
++LIBS="-lpng  $LIBS"
  cat >conftest.$ac_ext <<_ACEOF
- #line $LINENO "configure"
  /* confdefs.h.  */
-@@ -13107,9 +13107,9 @@
- fi
- 
-   else
--     echo "$as_me:$LINENO: checking for libnc-dods.a in supplibs" >&5
--echo $ECHO_N "checking for libnc-dods.a in supplibs... $ECHO_C" >&6
--     if test -f "${ga_supplib_dir}/lib/libnc-dods.a" ; then
-+     echo "$as_me:$LINENO: checking for libnc-dap.a in supplibs" >&5
-+echo $ECHO_N "checking for libnc-dap.a in supplibs... $ECHO_C" >&6
-+     if test -f "${ga_supplib_dir}/lib/libnc-dap.a" ; then
-      	echo "$as_me:$LINENO: result: yes" >&5
- echo "${ECHO_T}yes" >&6
- 	 ga_check_dods="yes"
-@@ -13135,20 +13135,20 @@
- fi
- 
-   else
--     echo "$as_me:$LINENO: checking for libwww.a in supplibs" >&5
--echo $ECHO_N "checking for libwww.a in supplibs... $ECHO_C" >&6
--     if test -f "${ga_supplib_dir}/lib/libwww.a" ; then
-+     echo "$as_me:$LINENO: checking for libwwwcore.a in supplibs" >&5
-+echo $ECHO_N "checking for libwwwcore.a in supplibs... $ECHO_C" >&6
-+     if test -f "${ga_supplib_dir}/lib/libwwwcore.a" ; then
-      	echo "$as_me:$LINENO: result: yes" >&5
- echo "${ECHO_T}yes" >&6
- 
-   if test "${ga_dyn_supplibs}" = "yes" ; then
--     echo "$as_me:$LINENO: checking for main in -ldap++" >&5
--echo $ECHO_N "checking for main in -ldap++... $ECHO_C" >&6
-+     echo "$as_me:$LINENO: checking for main in -ldap" >&5
-+echo $ECHO_N "checking for main in -ldap... $ECHO_C" >&6
- if test "${ac_cv_lib_dappp_main+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
+ _ACEOF
+@@ -11270,20 +11220,20 @@
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+-  ac_cv_lib_png12_main=yes
++  ac_cv_lib_png_main=yes
  else
-   ac_check_lib_save_LIBS=$LIBS
--LIBS="-ldap++  $LIBS"
-+LIBS="-ldap  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
- #line $LINENO "configure"
- /* confdefs.h.  */
-@@ -13193,13 +13193,13 @@
- if test $ac_cv_lib_dappp_main = yes; then
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
  
-   if test "${ga_dyn_supplibs}" = "yes" ; then
--     echo "$as_me:$LINENO: checking for main in -lnc-dods" >&5
--echo $ECHO_N "checking for main in -lnc-dods... $ECHO_C" >&6
-+     echo "$as_me:$LINENO: checking for main in -lnc-dap" >&5
-+echo $ECHO_N "checking for main in -lnc-dap... $ECHO_C" >&6
- if test "${ac_cv_lib_nc_dods_main+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   ac_check_lib_save_LIBS=$LIBS
--LIBS="-lnc-dods  $LIBS"
-+LIBS="-lnc-dap  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
- #line $LINENO "configure"
- /* confdefs.h.  */
-@@ -13247,9 +13247,9 @@
+-ac_cv_lib_png12_main=no
++ac_cv_lib_png_main=no
  fi
- 
-   else
--     echo "$as_me:$LINENO: checking for libnc-dods.a in supplibs" >&5
--echo $ECHO_N "checking for libnc-dods.a in supplibs... $ECHO_C" >&6
--     if test -f "${ga_supplib_dir}/lib/libnc-dods.a" ; then
-+     echo "$as_me:$LINENO: checking for libnc-dap.a in supplibs" >&5
-+echo $ECHO_N "checking for libnc-dap.a in supplibs... $ECHO_C" >&6
-+     if test -f "${ga_supplib_dir}/lib/libnc-dap.a" ; then
-      	echo "$as_me:$LINENO: result: yes" >&5
- echo "${ECHO_T}yes" >&6
- 	 ga_check_dods="yes"
-@@ -13266,20 +13266,20 @@
+ rm -f conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
  fi
+-echo "$as_me:$LINENO: result: $ac_cv_lib_png12_main" >&5
+-echo "${ECHO_T}$ac_cv_lib_png12_main" >&6
+-if test $ac_cv_lib_png12_main = yes; then
++echo "$as_me:$LINENO: result: $ac_cv_lib_png_main" >&5
++echo "${ECHO_T}$ac_cv_lib_png_main" >&6
++if test $ac_cv_lib_png_main = yes; then
+    have_libpng=yes
  
-   else
--     echo "$as_me:$LINENO: checking for libdap++.a in supplibs" >&5
--echo $ECHO_N "checking for libdap++.a in supplibs... $ECHO_C" >&6
--     if test -f "${ga_supplib_dir}/lib/libdap++.a" ; then
-+     echo "$as_me:$LINENO: checking for libdap.a in supplibs" >&5
-+echo $ECHO_N "checking for libdap.a in supplibs... $ECHO_C" >&6
-+     if test -f "${ga_supplib_dir}/lib/libdap.a" ; then
-      	echo "$as_me:$LINENO: result: yes" >&5
- echo "${ECHO_T}yes" >&6
- 
-   if test "${ga_dyn_supplibs}" = "yes" ; then
--     echo "$as_me:$LINENO: checking for main in -lnc-dods" >&5
--echo $ECHO_N "checking for main in -lnc-dods... $ECHO_C" >&6
-+     echo "$as_me:$LINENO: checking for main in -lnc-dap" >&5
-+echo $ECHO_N "checking for main in -lnc-dap... $ECHO_C" >&6
- if test "${ac_cv_lib_nc_dods_main+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   ac_check_lib_save_LIBS=$LIBS
--LIBS="-lnc-dods  $LIBS"
-+LIBS="-lnc-dap  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
- #line $LINENO "configure"
- /* confdefs.h.  */
-@@ -13327,9 +13327,9 @@
  fi
+@@ -11599,29 +11549,9 @@
+ if test $ac_cv_lib_gd_gdImageCreate = yes; then
+    use_printim=yes
  
-   else
--     echo "$as_me:$LINENO: checking for libnc-dods.a in supplibs" >&5
--echo $ECHO_N "checking for libnc-dods.a in supplibs... $ECHO_C" >&6
--     if test -f "${ga_supplib_dir}/lib/libnc-dods.a" ; then
-+     echo "$as_me:$LINENO: checking for libnc-dap.a in supplibs" >&5
-+echo $ECHO_N "checking for libnc-dap.a in supplibs... $ECHO_C" >&6
-+     if test -f "${ga_supplib_dir}/lib/libnc-dap.a" ; then
-      	echo "$as_me:$LINENO: result: yes" >&5
- echo "${ECHO_T}yes" >&6
- 	 ga_check_dods="yes"
-@@ -13431,13 +13431,13 @@
- if test $ac_cv_lib_rx_main = yes; then
+-  ga_include_prefix='-I$(supp_include_dir)'
+-
+-  for ga_include_name in gd ; do
+-      printim_inc="$printim_inc ${ga_include_prefix}/${ga_include_name}"
+-  done
+-
+-	  if test "$have_jpeg" = "yes" ; then
++  printim_inc=""
++  printim_libs=-lgd
  
-   if test "${ga_dyn_supplibs}" = "yes" ; then
--     echo "$as_me:$LINENO: checking for main in -lwww" >&5
--echo $ECHO_N "checking for main in -lwww... $ECHO_C" >&6
-+     echo "$as_me:$LINENO: checking for main in -lwwwcore" >&5
-+echo $ECHO_N "checking for main in -lwwwcore... $ECHO_C" >&6
- if test "${ac_cv_lib_www_main+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   ac_check_lib_save_LIBS=$LIBS
--LIBS="-lwww  $LIBS"
-+LIBS="-lwwwcore  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
- #line $LINENO "configure"
- /* confdefs.h.  */
-@@ -13482,13 +13482,13 @@
- if test $ac_cv_lib_www_main = yes; then
+-  ga_lib_prefix='$(supp_lib_dir)/lib'
+-  ga_lib_suffix='.a'
+-  for ga_lib_name in gd png12 z jpeg ; do
+-      printim_libs="$printim_libs ${ga_lib_prefix}${ga_lib_name}${ga_lib_suffix}"
+-  done
+-
+-	  else
+-
+-  ga_lib_prefix='$(supp_lib_dir)/lib'
+-  ga_lib_suffix='.a'
+-  for ga_lib_name in gd png12 z ; do
+-      printim_libs="$printim_libs ${ga_lib_prefix}${ga_lib_name}${ga_lib_suffix}"
+-  done
+-
+-          fi
  
-   if test "${ga_dyn_supplibs}" = "yes" ; then
--     echo "$as_me:$LINENO: checking for main in -ldap++" >&5
--echo $ECHO_N "checking for main in -ldap++... $ECHO_C" >&6
-+     echo "$as_me:$LINENO: checking for main in -ldap" >&5
-+echo $ECHO_N "checking for main in -ldap... $ECHO_C" >&6
- if test "${ac_cv_lib_dappp_main+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   ac_check_lib_save_LIBS=$LIBS
--LIBS="-ldap++  $LIBS"
-+LIBS="-ldap  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
- #line $LINENO "configure"
- /* confdefs.h.  */
-@@ -13533,13 +13533,13 @@
- if test $ac_cv_lib_dappp_main = yes; then
- 
-   if test "${ga_dyn_supplibs}" = "yes" ; then
--     echo "$as_me:$LINENO: checking for main in -lnc-dods" >&5
--echo $ECHO_N "checking for main in -lnc-dods... $ECHO_C" >&6
-+     echo "$as_me:$LINENO: checking for main in -lnc-dap" >&5
-+echo $ECHO_N "checking for main in -lnc-dap... $ECHO_C" >&6
- if test "${ac_cv_lib_nc_dods_main+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   ac_check_lib_save_LIBS=$LIBS
--LIBS="-lnc-dods  $LIBS"
-+LIBS="-lnc-dap  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
- #line $LINENO "configure"
- /* confdefs.h.  */
-@@ -13587,9 +13587,9 @@
  fi
  
-   else
--     echo "$as_me:$LINENO: checking for libnc-dods.a in supplibs" >&5
--echo $ECHO_N "checking for libnc-dods.a in supplibs... $ECHO_C" >&6
--     if test -f "${ga_supplib_dir}/lib/libnc-dods.a" ; then
-+     echo "$as_me:$LINENO: checking for libnc-dap.a in supplibs" >&5
-+echo $ECHO_N "checking for libnc-dap.a in supplibs... $ECHO_C" >&6
-+     if test -f "${ga_supplib_dir}/lib/libnc-dap.a" ; then
-      	echo "$as_me:$LINENO: result: yes" >&5
- echo "${ECHO_T}yes" >&6
- 	 ga_check_dods="yes"
-@@ -13606,20 +13606,20 @@
- fi
+@@ -12848,7 +12778,7 @@
+   ga_saved_libs=$LIBS
+   CPPFLAGS=""
  
-   else
--     echo "$as_me:$LINENO: checking for libdap++.a in supplibs" >&5
--echo $ECHO_N "checking for libdap++.a in supplibs... $ECHO_C" >&6
--     if test -f "${ga_supplib_dir}/lib/libdap++.a" ; then
-+     echo "$as_me:$LINENO: checking for libdap.a in supplibs" >&5
-+echo $ECHO_N "checking for libdap.a in supplibs... $ECHO_C" >&6
-+     if test -f "${ga_supplib_dir}/lib/libdap.a" ; then
-      	echo "$as_me:$LINENO: result: yes" >&5
- echo "${ECHO_T}yes" >&6
+-    for ga_inc_name in libpng12 ; do
++    for ga_inc_name in libpng ; do
+       CPPFLAGS="$CPPFLAGS -I${ga_supplib_dir}/include/${ga_inc_name}"
+     done
  
-   if test "${ga_dyn_supplibs}" = "yes" ; then
--     echo "$as_me:$LINENO: checking for main in -lnc-dods" >&5
--echo $ECHO_N "checking for main in -lnc-dods... $ECHO_C" >&6
-+     echo "$as_me:$LINENO: checking for main in -lnc-dap" >&5
-+echo $ECHO_N "checking for main in -lnc-dap... $ECHO_C" >&6
- if test "${ac_cv_lib_nc_dods_main+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   ac_check_lib_save_LIBS=$LIBS
--LIBS="-lnc-dods  $LIBS"
-+LIBS="-lnc-dap  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
- #line $LINENO "configure"
- /* confdefs.h.  */
-@@ -13667,9 +13667,9 @@
- fi
+@@ -12856,13 +12786,13 @@
+   LDFLAGS="-L${ga_supplib_dir}/lib "
+   LIBS="$LIBS "
  
-   else
--     echo "$as_me:$LINENO: checking for libnc-dods.a in supplibs" >&5
--echo $ECHO_N "checking for libnc-dods.a in supplibs... $ECHO_C" >&6
--     if test -f "${ga_supplib_dir}/lib/libnc-dods.a" ; then
-+     echo "$as_me:$LINENO: checking for libnc-dap.a in supplibs" >&5
-+echo $ECHO_N "checking for libnc-dap.a in supplibs... $ECHO_C" >&6
-+     if test -f "${ga_supplib_dir}/lib/libnc-dap.a" ; then
-      	echo "$as_me:$LINENO: result: yes" >&5
- echo "${ECHO_T}yes" >&6
- 	 ga_check_dods="yes"
-@@ -13695,20 +13695,20 @@
- fi
- 
-   else
--     echo "$as_me:$LINENO: checking for libwww.a in supplibs" >&5
--echo $ECHO_N "checking for libwww.a in supplibs... $ECHO_C" >&6
--     if test -f "${ga_supplib_dir}/lib/libwww.a" ; then
-+     echo "$as_me:$LINENO: checking for libwwwcore.a in supplibs" >&5
-+echo $ECHO_N "checking for libwwwcore.a in supplibs... $ECHO_C" >&6
-+     if test -f "${ga_supplib_dir}/lib/libwwwcore.a" ; then
-      	echo "$as_me:$LINENO: result: yes" >&5
- echo "${ECHO_T}yes" >&6
- 
-   if test "${ga_dyn_supplibs}" = "yes" ; then
--     echo "$as_me:$LINENO: checking for main in -ldap++" >&5
--echo $ECHO_N "checking for main in -ldap++... $ECHO_C" >&6
-+     echo "$as_me:$LINENO: checking for main in -ldap" >&5
-+echo $ECHO_N "checking for main in -ldap... $ECHO_C" >&6
- if test "${ac_cv_lib_dappp_main+set}" = set; then
+-      echo "$as_me:$LINENO: checking for main in -lpng12" >&5
+-echo $ECHO_N "checking for main in -lpng12... $ECHO_C" >&6
+-if test "${ac_cv_lib_png12_main+set}" = set; then
++      echo "$as_me:$LINENO: checking for main in -lpng" >&5
++echo $ECHO_N "checking for main in -lpng... $ECHO_C" >&6
++if test "${ac_cv_lib_png_main+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    ac_check_lib_save_LIBS=$LIBS
--LIBS="-ldap++  $LIBS"
-+LIBS="-ldap  $LIBS"
+-LIBS="-lpng12  $LIBS"
++LIBS="-lpng  $LIBS"
  cat >conftest.$ac_ext <<_ACEOF
- #line $LINENO "configure"
  /* confdefs.h.  */
-@@ -13753,13 +13753,13 @@
- if test $ac_cv_lib_dappp_main = yes; then
- 
-   if test "${ga_dyn_supplibs}" = "yes" ; then
--     echo "$as_me:$LINENO: checking for main in -lnc-dods" >&5
--echo $ECHO_N "checking for main in -lnc-dods... $ECHO_C" >&6
-+     echo "$as_me:$LINENO: checking for main in -lnc-dap" >&5
-+echo $ECHO_N "checking for main in -lnc-dap... $ECHO_C" >&6
- if test "${ac_cv_lib_nc_dods_main+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
+ _ACEOF
+@@ -12901,20 +12831,20 @@
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+-  ac_cv_lib_png12_main=yes
++  ac_cv_lib_png_main=yes
  else
-   ac_check_lib_save_LIBS=$LIBS
--LIBS="-lnc-dods  $LIBS"
-+LIBS="-lnc-dap  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
- #line $LINENO "configure"
- /* confdefs.h.  */
-@@ -13807,9 +13807,9 @@
- fi
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
  
-   else
--     echo "$as_me:$LINENO: checking for libnc-dods.a in supplibs" >&5
--echo $ECHO_N "checking for libnc-dods.a in supplibs... $ECHO_C" >&6
--     if test -f "${ga_supplib_dir}/lib/libnc-dods.a" ; then
-+     echo "$as_me:$LINENO: checking for libnc-dap.a in supplibs" >&5
-+echo $ECHO_N "checking for libnc-dap.a in supplibs... $ECHO_C" >&6
-+     if test -f "${ga_supplib_dir}/lib/libnc-dap.a" ; then
-      	echo "$as_me:$LINENO: result: yes" >&5
- echo "${ECHO_T}yes" >&6
- 	 ga_check_dods="yes"
-@@ -13826,20 +13826,20 @@
+-ac_cv_lib_png12_main=no
++ac_cv_lib_png_main=no
  fi
- 
-   else
--     echo "$as_me:$LINENO: checking for libdap++.a in supplibs" >&5
--echo $ECHO_N "checking for libdap++.a in supplibs... $ECHO_C" >&6
--     if test -f "${ga_supplib_dir}/lib/libdap++.a" ; then
-+     echo "$as_me:$LINENO: checking for libdap.a in supplibs" >&5
-+echo $ECHO_N "checking for libdap.a in supplibs... $ECHO_C" >&6
-+     if test -f "${ga_supplib_dir}/lib/libdap.a" ; then
-      	echo "$as_me:$LINENO: result: yes" >&5
- echo "${ECHO_T}yes" >&6
- 
-   if test "${ga_dyn_supplibs}" = "yes" ; then
--     echo "$as_me:$LINENO: checking for main in -lnc-dods" >&5
--echo $ECHO_N "checking for main in -lnc-dods... $ECHO_C" >&6
-+     echo "$as_me:$LINENO: checking for main in -lnc-dap" >&5
-+echo $ECHO_N "checking for main in -lnc-dap... $ECHO_C" >&6
- if test "${ac_cv_lib_nc_dods_main+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   ac_check_lib_save_LIBS=$LIBS
--LIBS="-lnc-dods  $LIBS"
-+LIBS="-lnc-dap  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
- #line $LINENO "configure"
- /* confdefs.h.  */
-@@ -13887,9 +13887,9 @@
+ rm -f conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
  fi
+-echo "$as_me:$LINENO: result: $ac_cv_lib_png12_main" >&5
+-echo "${ECHO_T}$ac_cv_lib_png12_main" >&6
+-if test $ac_cv_lib_png12_main = yes; then
++echo "$as_me:$LINENO: result: $ac_cv_lib_png_main" >&5
++echo "${ECHO_T}$ac_cv_lib_png_main" >&6
++if test $ac_cv_lib_png_main = yes; then
+    have_libpng=yes
  
-   else
--     echo "$as_me:$LINENO: checking for libnc-dods.a in supplibs" >&5
--echo $ECHO_N "checking for libnc-dods.a in supplibs... $ECHO_C" >&6
--     if test -f "${ga_supplib_dir}/lib/libnc-dods.a" ; then
-+     echo "$as_me:$LINENO: checking for libnc-dap.a in supplibs" >&5
-+echo $ECHO_N "checking for libnc-dap.a in supplibs... $ECHO_C" >&6
-+     if test -f "${ga_supplib_dir}/lib/libnc-dap.a" ; then
-      	echo "$as_me:$LINENO: result: yes" >&5
- echo "${ECHO_T}yes" >&6
- 	 ga_check_dods="yes"
-@@ -13931,13 +13931,13 @@
- echo "${ECHO_T}yes" >&6
- 
-   if test "${ga_dyn_supplibs}" = "yes" ; then
--     echo "$as_me:$LINENO: checking for main in -lwww" >&5
--echo $ECHO_N "checking for main in -lwww... $ECHO_C" >&6
-+     echo "$as_me:$LINENO: checking for main in -lwwwcore" >&5
-+echo $ECHO_N "checking for main in -lwwwcore... $ECHO_C" >&6
- if test "${ac_cv_lib_www_main+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   ac_check_lib_save_LIBS=$LIBS
--LIBS="-lwww  $LIBS"
-+LIBS="-lwwwcore  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
- #line $LINENO "configure"
- /* confdefs.h.  */
-@@ -13982,13 +13982,13 @@
- if test $ac_cv_lib_www_main = yes; then
- 
-   if test "${ga_dyn_supplibs}" = "yes" ; then
--     echo "$as_me:$LINENO: checking for main in -ldap++" >&5
--echo $ECHO_N "checking for main in -ldap++... $ECHO_C" >&6
-+     echo "$as_me:$LINENO: checking for main in -ldap" >&5
-+echo $ECHO_N "checking for main in -ldap... $ECHO_C" >&6
- if test "${ac_cv_lib_dappp_main+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   ac_check_lib_save_LIBS=$LIBS
--LIBS="-ldap++  $LIBS"
-+LIBS="-ldap  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
- #line $LINENO "configure"
- /* confdefs.h.  */
-@@ -14033,13 +14033,13 @@
- if test $ac_cv_lib_dappp_main = yes; then
- 
-   if test "${ga_dyn_supplibs}" = "yes" ; then
--     echo "$as_me:$LINENO: checking for main in -lnc-dods" >&5
--echo $ECHO_N "checking for main in -lnc-dods... $ECHO_C" >&6
-+     echo "$as_me:$LINENO: checking for main in -lnc-dap" >&5
-+echo $ECHO_N "checking for main in -lnc-dap... $ECHO_C" >&6
- if test "${ac_cv_lib_nc_dods_main+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   ac_check_lib_save_LIBS=$LIBS
--LIBS="-lnc-dods  $LIBS"
-+LIBS="-lnc-dap  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
- #line $LINENO "configure"
- /* confdefs.h.  */
-@@ -14087,9 +14087,9 @@
  fi
+@@ -13227,18 +13157,8 @@
+ if test $ac_cv_lib_grib2c_main = yes; then
+    use_grib2=yes
  
-   else
--     echo "$as_me:$LINENO: checking for libnc-dods.a in supplibs" >&5
--echo $ECHO_N "checking for libnc-dods.a in supplibs... $ECHO_C" >&6
--     if test -f "${ga_supplib_dir}/lib/libnc-dods.a" ; then
-+     echo "$as_me:$LINENO: checking for libnc-dap.a in supplibs" >&5
-+echo $ECHO_N "checking for libnc-dap.a in supplibs... $ECHO_C" >&6
-+     if test -f "${ga_supplib_dir}/lib/libnc-dap.a" ; then
-      	echo "$as_me:$LINENO: result: yes" >&5
- echo "${ECHO_T}yes" >&6
- 	 ga_check_dods="yes"
-@@ -14106,20 +14106,20 @@
- fi
+-  ga_include_prefix='-I$(supp_include_dir)'
+-
+-  for ga_include_name in grib2c ; do
+-      grib2_inc="$grib2_inc ${ga_include_prefix}/${ga_include_name}"
+-  done
+-
+-
+-  ga_lib_prefix='$(supp_lib_dir)/lib'
+-  ga_lib_suffix='.a'
+-  for ga_lib_name in grib2c jasper png12 z ; do
+-      grib2_libs="$grib2_libs ${ga_lib_prefix}${ga_lib_name}${ga_lib_suffix}"
+-  done
++  grib2_inc=""
++  grib2_libs="-lgrib2c -ljasper -lpng -lz"
  
-   else
--     echo "$as_me:$LINENO: checking for libdap++.a in supplibs" >&5
--echo $ECHO_N "checking for libdap++.a in supplibs... $ECHO_C" >&6
--     if test -f "${ga_supplib_dir}/lib/libdap++.a" ; then
-+     echo "$as_me:$LINENO: checking for libdap.a in supplibs" >&5
-+echo $ECHO_N "checking for libdap.a in supplibs... $ECHO_C" >&6
-+     if test -f "${ga_supplib_dir}/lib/libdap.a" ; then
-      	echo "$as_me:$LINENO: result: yes" >&5
- echo "${ECHO_T}yes" >&6
  
-   if test "${ga_dyn_supplibs}" = "yes" ; then
--     echo "$as_me:$LINENO: checking for main in -lnc-dods" >&5
--echo $ECHO_N "checking for main in -lnc-dods... $ECHO_C" >&6
-+     echo "$as_me:$LINENO: checking for main in -lnc-dap" >&5
-+echo $ECHO_N "checking for main in -lnc-dap... $ECHO_C" >&6
- if test "${ac_cv_lib_nc_dods_main+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   ac_check_lib_save_LIBS=$LIBS
--LIBS="-lnc-dods  $LIBS"
-+LIBS="-lnc-dap  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
- #line $LINENO "configure"
- /* confdefs.h.  */
-@@ -14167,9 +14167,9 @@
  fi
- 
-   else
--     echo "$as_me:$LINENO: checking for libnc-dods.a in supplibs" >&5
--echo $ECHO_N "checking for libnc-dods.a in supplibs... $ECHO_C" >&6
--     if test -f "${ga_supplib_dir}/lib/libnc-dods.a" ; then
-+     echo "$as_me:$LINENO: checking for libnc-dap.a in supplibs" >&5
-+echo $ECHO_N "checking for libnc-dap.a in supplibs... $ECHO_C" >&6
-+     if test -f "${ga_supplib_dir}/lib/libnc-dap.a" ; then
-      	echo "$as_me:$LINENO: result: yes" >&5
- echo "${ECHO_T}yes" >&6
- 	 ga_check_dods="yes"
-@@ -14195,20 +14195,20 @@
- fi
- 
-   else
--     echo "$as_me:$LINENO: checking for libwww.a in supplibs" >&5
--echo $ECHO_N "checking for libwww.a in supplibs... $ECHO_C" >&6
--     if test -f "${ga_supplib_dir}/lib/libwww.a" ; then
-+     echo "$as_me:$LINENO: checking for libwwwcore.a in supplibs" >&5
-+echo $ECHO_N "checking for libwwwcore.a in supplibs... $ECHO_C" >&6
-+     if test -f "${ga_supplib_dir}/lib/libwwwcore.a" ; then
-      	echo "$as_me:$LINENO: result: yes" >&5
- echo "${ECHO_T}yes" >&6
- 
-   if test "${ga_dyn_supplibs}" = "yes" ; then
--     echo "$as_me:$LINENO: checking for main in -ldap++" >&5
--echo $ECHO_N "checking for main in -ldap++... $ECHO_C" >&6
-+     echo "$as_me:$LINENO: checking for main in -ldap" >&5
-+echo $ECHO_N "checking for main in -ldap... $ECHO_C" >&6
- if test "${ac_cv_lib_dappp_main+set}" = set; then
+@@ -13459,13 +13379,13 @@
+ echo "$as_me:$LINENO: result: $ac_cv_lib_grib2c_main" >&5
+ echo "${ECHO_T}$ac_cv_lib_grib2c_main" >&6
+ if test $ac_cv_lib_grib2c_main = yes; then
+-   echo "$as_me:$LINENO: checking for main in -lpng12" >&5
+-echo $ECHO_N "checking for main in -lpng12... $ECHO_C" >&6
+-if test "${ac_cv_lib_png12_main+set}" = set; then
++   echo "$as_me:$LINENO: checking for main in -lpng" >&5
++echo $ECHO_N "checking for main in -lpng... $ECHO_C" >&6
++if test "${ac_cv_lib_png_main+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    ac_check_lib_save_LIBS=$LIBS
--LIBS="-ldap++  $LIBS"
-+LIBS="-ldap  $LIBS"
+-LIBS="-lpng12  $LIBS"
++LIBS="-lpng  $LIBS"
  cat >conftest.$ac_ext <<_ACEOF
- #line $LINENO "configure"
  /* confdefs.h.  */
-@@ -14253,13 +14253,13 @@
- if test $ac_cv_lib_dappp_main = yes; then
- 
-   if test "${ga_dyn_supplibs}" = "yes" ; then
--     echo "$as_me:$LINENO: checking for main in -lnc-dods" >&5
--echo $ECHO_N "checking for main in -lnc-dods... $ECHO_C" >&6
-+     echo "$as_me:$LINENO: checking for main in -lnc-dap" >&5
-+echo $ECHO_N "checking for main in -lnc-dap... $ECHO_C" >&6
- if test "${ac_cv_lib_nc_dods_main+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
+ _ACEOF
+@@ -13504,20 +13424,20 @@
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+-  ac_cv_lib_png12_main=yes
++  ac_cv_lib_png_main=yes
  else
-   ac_check_lib_save_LIBS=$LIBS
--LIBS="-lnc-dods  $LIBS"
-+LIBS="-lnc-dap  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
- #line $LINENO "configure"
- /* confdefs.h.  */
-@@ -14307,9 +14307,9 @@
- fi
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
  
-   else
--     echo "$as_me:$LINENO: checking for libnc-dods.a in supplibs" >&5
--echo $ECHO_N "checking for libnc-dods.a in supplibs... $ECHO_C" >&6
--     if test -f "${ga_supplib_dir}/lib/libnc-dods.a" ; then
-+     echo "$as_me:$LINENO: checking for libnc-dap.a in supplibs" >&5
-+echo $ECHO_N "checking for libnc-dap.a in supplibs... $ECHO_C" >&6
-+     if test -f "${ga_supplib_dir}/lib/libnc-dap.a" ; then
-      	echo "$as_me:$LINENO: result: yes" >&5
- echo "${ECHO_T}yes" >&6
- 	 ga_check_dods="yes"
-@@ -14326,20 +14326,20 @@
+-ac_cv_lib_png12_main=no
++ac_cv_lib_png_main=no
  fi
- 
-   else
--     echo "$as_me:$LINENO: checking for libdap++.a in supplibs" >&5
--echo $ECHO_N "checking for libdap++.a in supplibs... $ECHO_C" >&6
--     if test -f "${ga_supplib_dir}/lib/libdap++.a" ; then
-+     echo "$as_me:$LINENO: checking for libdap.a in supplibs" >&5
-+echo $ECHO_N "checking for libdap.a in supplibs... $ECHO_C" >&6
-+     if test -f "${ga_supplib_dir}/lib/libdap.a" ; then
-      	echo "$as_me:$LINENO: result: yes" >&5
- echo "${ECHO_T}yes" >&6
- 
-   if test "${ga_dyn_supplibs}" = "yes" ; then
--     echo "$as_me:$LINENO: checking for main in -lnc-dods" >&5
--echo $ECHO_N "checking for main in -lnc-dods... $ECHO_C" >&6
-+     echo "$as_me:$LINENO: checking for main in -lnc-dap" >&5
-+echo $ECHO_N "checking for main in -lnc-dap... $ECHO_C" >&6
- if test "${ac_cv_lib_nc_dods_main+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   ac_check_lib_save_LIBS=$LIBS
--LIBS="-lnc-dods  $LIBS"
-+LIBS="-lnc-dap  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
- #line $LINENO "configure"
- /* confdefs.h.  */
-@@ -14387,9 +14387,9 @@
+ rm -f conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
  fi
+-echo "$as_me:$LINENO: result: $ac_cv_lib_png12_main" >&5
+-echo "${ECHO_T}$ac_cv_lib_png12_main" >&6
+-if test $ac_cv_lib_png12_main = yes; then
++echo "$as_me:$LINENO: result: $ac_cv_lib_png_main" >&5
++echo "${ECHO_T}$ac_cv_lib_png_main" >&6
++if test $ac_cv_lib_png_main = yes; then
+    echo "$as_me:$LINENO: checking for main in -lz" >&5
+ echo $ECHO_N "checking for main in -lz... $ECHO_C" >&6
+ if test "${ac_cv_lib_z_main+set}" = set; then
+@@ -14617,18 +14537,8 @@
+ if test $ac_cv_lib_mfhdf_main = yes; then
+    use_hdf=yes
  
-   else
--     echo "$as_me:$LINENO: checking for libnc-dods.a in supplibs" >&5
--echo $ECHO_N "checking for libnc-dods.a in supplibs... $ECHO_C" >&6
--     if test -f "${ga_supplib_dir}/lib/libnc-dods.a" ; then
-+     echo "$as_me:$LINENO: checking for libnc-dap.a in supplibs" >&5
-+echo $ECHO_N "checking for libnc-dap.a in supplibs... $ECHO_C" >&6
-+     if test -f "${ga_supplib_dir}/lib/libnc-dap.a" ; then
-      	echo "$as_me:$LINENO: result: yes" >&5
- echo "${ECHO_T}yes" >&6
- 	 ga_check_dods="yes"
-@@ -14557,13 +14557,13 @@
- if test $ac_cv_lib_rx_main = yes; then
+-  ga_include_prefix='-I$(supp_include_dir)'
+-
+-  for ga_include_name in hdf udunits ; do
+-      hdf_inc="$hdf_inc ${ga_include_prefix}/${ga_include_name}"
+-  done
+-
+-
+-  ga_lib_prefix='$(supp_lib_dir)/lib'
+-  ga_lib_suffix='.a'
+-  for ga_lib_name in mfhdf df udunits sz jpeg z ; do
+-      hdf_libs="$hdf_libs ${ga_lib_prefix}${ga_lib_name}${ga_lib_suffix}"
+-  done
++  hdf_inc=""
++  hdf_libs="-lmfhdf -ldf -ludunits -lsz -ljpeg -lz"
  
-   if test "${ga_dyn_supplibs}" = "yes" ; then
--     echo "$as_me:$LINENO: checking for main in -lwww" >&5
--echo $ECHO_N "checking for main in -lwww... $ECHO_C" >&6
-+     echo "$as_me:$LINENO: checking for main in -lwwwcore" >&5
-+echo $ECHO_N "checking for main in -lwwwcore... $ECHO_C" >&6
- if test "${ac_cv_lib_www_main+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   ac_check_lib_save_LIBS=$LIBS
--LIBS="-lwww  $LIBS"
-+LIBS="-lwwwcore  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
- #line $LINENO "configure"
- /* confdefs.h.  */
-@@ -14608,13 +14608,13 @@
- if test $ac_cv_lib_www_main = yes; then
  
-   if test "${ga_dyn_supplibs}" = "yes" ; then
--     echo "$as_me:$LINENO: checking for main in -ldap++" >&5
--echo $ECHO_N "checking for main in -ldap++... $ECHO_C" >&6
-+     echo "$as_me:$LINENO: checking for main in -ldap" >&5
-+echo $ECHO_N "checking for main in -ldap... $ECHO_C" >&6
- if test "${ac_cv_lib_dappp_main+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   ac_check_lib_save_LIBS=$LIBS
--LIBS="-ldap++  $LIBS"
-+LIBS="-ldap  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
- #line $LINENO "configure"
- /* confdefs.h.  */
-@@ -14659,13 +14659,13 @@
- if test $ac_cv_lib_dappp_main = yes; then
- 
-   if test "${ga_dyn_supplibs}" = "yes" ; then
--     echo "$as_me:$LINENO: checking for main in -lnc-dods" >&5
--echo $ECHO_N "checking for main in -lnc-dods... $ECHO_C" >&6
-+     echo "$as_me:$LINENO: checking for main in -lnc-dap" >&5
-+echo $ECHO_N "checking for main in -lnc-dap... $ECHO_C" >&6
- if test "${ac_cv_lib_nc_dods_main+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   ac_check_lib_save_LIBS=$LIBS
--LIBS="-lnc-dods  $LIBS"
-+LIBS="-lnc-dap  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
- #line $LINENO "configure"
- /* confdefs.h.  */
-@@ -14713,9 +14713,9 @@
  fi
+@@ -17168,16 +17078,8 @@
  
-   else
--     echo "$as_me:$LINENO: checking for libnc-dods.a in supplibs" >&5
--echo $ECHO_N "checking for libnc-dods.a in supplibs... $ECHO_C" >&6
--     if test -f "${ga_supplib_dir}/lib/libnc-dods.a" ; then
-+     echo "$as_me:$LINENO: checking for libnc-dap.a in supplibs" >&5
-+echo $ECHO_N "checking for libnc-dap.a in supplibs... $ECHO_C" >&6
-+     if test -f "${ga_supplib_dir}/lib/libnc-dap.a" ; then
-      	echo "$as_me:$LINENO: result: yes" >&5
- echo "${ECHO_T}yes" >&6
- 	 ga_check_dods="yes"
-@@ -14732,20 +14732,20 @@
- fi
+   ga_include_prefix='-I$(supp_include_dir)'
  
-   else
--     echo "$as_me:$LINENO: checking for libdap++.a in supplibs" >&5
--echo $ECHO_N "checking for libdap++.a in supplibs... $ECHO_C" >&6
--     if test -f "${ga_supplib_dir}/lib/libdap++.a" ; then
-+     echo "$as_me:$LINENO: checking for libdap.a in supplibs" >&5
-+echo $ECHO_N "checking for libdap.a in supplibs... $ECHO_C" >&6
-+     if test -f "${ga_supplib_dir}/lib/libdap.a" ; then
-      	echo "$as_me:$LINENO: result: yes" >&5
- echo "${ECHO_T}yes" >&6
+-  for ga_include_name in hdf5 ; do
+-      hdf5_inc="$hdf5_inc ${ga_include_prefix}/${ga_include_name}"
+-  done
+-
+-
+-  ga_lib_prefix='$(supp_lib_dir)/lib'
+-  ga_lib_suffix='.a'
+-  for ga_lib_name in hdf5 sz z ; do
+-      hdf5_libs="$hdf5_libs ${ga_lib_prefix}${ga_lib_name}${ga_lib_suffix}"
+-  done
++  hdf5_inc=""
++  hdf5_libs=-lhdf5
  
-   if test "${ga_dyn_supplibs}" = "yes" ; then
--     echo "$as_me:$LINENO: checking for main in -lnc-dods" >&5
--echo $ECHO_N "checking for main in -lnc-dods... $ECHO_C" >&6
-+     echo "$as_me:$LINENO: checking for main in -lnc-dap" >&5
-+echo $ECHO_N "checking for main in -lnc-dap... $ECHO_C" >&6
- if test "${ac_cv_lib_nc_dods_main+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   ac_check_lib_save_LIBS=$LIBS
--LIBS="-lnc-dods  $LIBS"
-+LIBS="-lnc-dap  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
- #line $LINENO "configure"
- /* confdefs.h.  */
-@@ -14793,9 +14793,9 @@
- fi
  
-   else
--     echo "$as_me:$LINENO: checking for libnc-dods.a in supplibs" >&5
--echo $ECHO_N "checking for libnc-dods.a in supplibs... $ECHO_C" >&6
--     if test -f "${ga_supplib_dir}/lib/libnc-dods.a" ; then
-+     echo "$as_me:$LINENO: checking for libnc-dap.a in supplibs" >&5
-+echo $ECHO_N "checking for libnc-dap.a in supplibs... $ECHO_C" >&6
-+     if test -f "${ga_supplib_dir}/lib/libnc-dap.a" ; then
-      	echo "$as_me:$LINENO: result: yes" >&5
- echo "${ECHO_T}yes" >&6
- 	 ga_check_dods="yes"
-@@ -14821,20 +14821,20 @@
  fi
+@@ -18653,18 +18555,8 @@
+ if test $ac_cv_lib_curl_main = yes; then
+    use_nc4="yes"
  
-   else
--     echo "$as_me:$LINENO: checking for libwww.a in supplibs" >&5
--echo $ECHO_N "checking for libwww.a in supplibs... $ECHO_C" >&6
--     if test -f "${ga_supplib_dir}/lib/libwww.a" ; then
-+     echo "$as_me:$LINENO: checking for libwwwcore.a in supplibs" >&5
-+echo $ECHO_N "checking for libwwwcore.a in supplibs... $ECHO_C" >&6
-+     if test -f "${ga_supplib_dir}/lib/libwwwcore.a" ; then
-      	echo "$as_me:$LINENO: result: yes" >&5
- echo "${ECHO_T}yes" >&6
+-  ga_include_prefix='-I$(supp_include_dir)'
+-
+-  for ga_include_name in udunits netcdf ; do
+-      nc_inc="$nc_inc ${ga_include_prefix}/${ga_include_name}"
+-  done
+-
+-
+-  ga_lib_prefix='$(supp_lib_dir)/lib'
+-  ga_lib_suffix='.a'
+-  for ga_lib_name in udunits netcdf hdf5_hl hdf5 z sz curl ; do
+-      nc_libs="$nc_libs ${ga_lib_prefix}${ga_lib_name}${ga_lib_suffix}"
+-  done
++  nc_inc=""
++  nc_libs=-lnetcdf
  
-   if test "${ga_dyn_supplibs}" = "yes" ; then
--     echo "$as_me:$LINENO: checking for main in -ldap++" >&5
--echo $ECHO_N "checking for main in -ldap++... $ECHO_C" >&6
-+     echo "$as_me:$LINENO: checking for main in -ldap" >&5
-+echo $ECHO_N "checking for main in -ldap... $ECHO_C" >&6
- if test "${ac_cv_lib_dappp_main+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   ac_check_lib_save_LIBS=$LIBS
--LIBS="-ldap++  $LIBS"
-+LIBS="-ldap  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
- #line $LINENO "configure"
- /* confdefs.h.  */
-@@ -14879,13 +14879,13 @@
- if test $ac_cv_lib_dappp_main = yes; then
  
-   if test "${ga_dyn_supplibs}" = "yes" ; then
--     echo "$as_me:$LINENO: checking for main in -lnc-dods" >&5
--echo $ECHO_N "checking for main in -lnc-dods... $ECHO_C" >&6
-+     echo "$as_me:$LINENO: checking for main in -lnc-dap" >&5
-+echo $ECHO_N "checking for main in -lnc-dap... $ECHO_C" >&6
- if test "${ac_cv_lib_nc_dods_main+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   ac_check_lib_save_LIBS=$LIBS
--LIBS="-lnc-dods  $LIBS"
-+LIBS="-lnc-dap  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
- #line $LINENO "configure"
- /* confdefs.h.  */
-@@ -14933,9 +14933,9 @@
  fi
+@@ -21604,18 +21496,8 @@
+ if test $ac_cv_lib_curl_main = yes; then
+    use_gadap="yes"
  
-   else
--     echo "$as_me:$LINENO: checking for libnc-dods.a in supplibs" >&5
--echo $ECHO_N "checking for libnc-dods.a in supplibs... $ECHO_C" >&6
--     if test -f "${ga_supplib_dir}/lib/libnc-dods.a" ; then
-+     echo "$as_me:$LINENO: checking for libnc-dap.a in supplibs" >&5
-+echo $ECHO_N "checking for libnc-dap.a in supplibs... $ECHO_C" >&6
-+     if test -f "${ga_supplib_dir}/lib/libnc-dap.a" ; then
-      	echo "$as_me:$LINENO: result: yes" >&5
- echo "${ECHO_T}yes" >&6
- 	 ga_check_dods="yes"
-@@ -14952,20 +14952,20 @@
- fi
+-  ga_include_prefix='-I$(supp_include_dir)'
+-
+-  for ga_include_name in gadap ; do
+-      gadap_inc="$gadap_inc ${ga_include_prefix}/${ga_include_name}"
+-  done
+-
+-
+-  ga_lib_prefix='$(supp_lib_dir)/lib'
+-  ga_lib_suffix='.a'
+-  for ga_lib_name in gadap dapclient dap curl xml2 z ; do
+-      gadap_libs="$gadap_libs ${ga_lib_prefix}${ga_lib_name}${ga_lib_suffix}"
+-  done
++  gadap_inc=""
++  gadap_libs="-lgadap -ldap -ldapserver -ldapclient -lcurl -lidn -lssl -lcrypto -lz -lxml2 -lpthread -lz -liconv -lm"
  
-   else
--     echo "$as_me:$LINENO: checking for libdap++.a in supplibs" >&5
--echo $ECHO_N "checking for libdap++.a in supplibs... $ECHO_C" >&6
--     if test -f "${ga_supplib_dir}/lib/libdap++.a" ; then
-+     echo "$as_me:$LINENO: checking for libdap.a in supplibs" >&5
-+echo $ECHO_N "checking for libdap.a in supplibs... $ECHO_C" >&6
-+     if test -f "${ga_supplib_dir}/lib/libdap.a" ; then
-      	echo "$as_me:$LINENO: result: yes" >&5
- echo "${ECHO_T}yes" >&6
  
-   if test "${ga_dyn_supplibs}" = "yes" ; then
--     echo "$as_me:$LINENO: checking for main in -lnc-dods" >&5
--echo $ECHO_N "checking for main in -lnc-dods... $ECHO_C" >&6
-+     echo "$as_me:$LINENO: checking for main in -lnc-dap" >&5
-+echo $ECHO_N "checking for main in -lnc-dap... $ECHO_C" >&6
- if test "${ac_cv_lib_nc_dods_main+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   ac_check_lib_save_LIBS=$LIBS
--LIBS="-lnc-dods  $LIBS"
-+LIBS="-lnc-dap  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
- #line $LINENO "configure"
- /* confdefs.h.  */
-@@ -15013,9 +15013,9 @@
  fi
- 
-   else
--     echo "$as_me:$LINENO: checking for libnc-dods.a in supplibs" >&5
--echo $ECHO_N "checking for libnc-dods.a in supplibs... $ECHO_C" >&6
--     if test -f "${ga_supplib_dir}/lib/libnc-dods.a" ; then
-+     echo "$as_me:$LINENO: checking for libnc-dap.a in supplibs" >&5
-+echo $ECHO_N "checking for libnc-dap.a in supplibs... $ECHO_C" >&6
-+     if test -f "${ga_supplib_dir}/lib/libnc-dap.a" ; then
-      	echo "$as_me:$LINENO: result: yes" >&5
- echo "${ECHO_T}yes" >&6
- 	 ga_check_dods="yes"
-@@ -15057,13 +15057,13 @@
- echo "${ECHO_T}yes" >&6
- 
-   if test "${ga_dyn_supplibs}" = "yes" ; then
--     echo "$as_me:$LINENO: checking for main in -lwww" >&5
--echo $ECHO_N "checking for main in -lwww... $ECHO_C" >&6
-+     echo "$as_me:$LINENO: checking for main in -lwwwcore" >&5
-+echo $ECHO_N "checking for main in -lwwwcore... $ECHO_C" >&6
- if test "${ac_cv_lib_www_main+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   ac_check_lib_save_LIBS=$LIBS
--LIBS="-lwww  $LIBS"
-+LIBS="-lwwwcore  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
- #line $LINENO "configure"
- /* confdefs.h.  */
-@@ -15108,13 +15108,13 @@
- if test $ac_cv_lib_www_main = yes; then
- 
-   if test "${ga_dyn_supplibs}" = "yes" ; then
--     echo "$as_me:$LINENO: checking for main in -ldap++" >&5
--echo $ECHO_N "checking for main in -ldap++... $ECHO_C" >&6
-+     echo "$as_me:$LINENO: checking for main in -ldap" >&5
-+echo $ECHO_N "checking for main in -ldap... $ECHO_C" >&6
- if test "${ac_cv_lib_dappp_main+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   ac_check_lib_save_LIBS=$LIBS
--LIBS="-ldap++  $LIBS"
-+LIBS="-ldap  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
- #line $LINENO "configure"
- /* confdefs.h.  */
-@@ -15159,13 +15159,13 @@
- if test $ac_cv_lib_dappp_main = yes; then
- 
-   if test "${ga_dyn_supplibs}" = "yes" ; then
--     echo "$as_me:$LINENO: checking for main in -lnc-dods" >&5
--echo $ECHO_N "checking for main in -lnc-dods... $ECHO_C" >&6
-+     echo "$as_me:$LINENO: checking for main in -lnc-dap" >&5
-+echo $ECHO_N "checking for main in -lnc-dap... $ECHO_C" >&6
- if test "${ac_cv_lib_nc_dods_main+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   ac_check_lib_save_LIBS=$LIBS
--LIBS="-lnc-dods  $LIBS"
-+LIBS="-lnc-dap  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
- #line $LINENO "configure"
- /* confdefs.h.  */
-@@ -15213,9 +15213,9 @@
- fi
- 
-   else
--     echo "$as_me:$LINENO: checking for libnc-dods.a in supplibs" >&5
--echo $ECHO_N "checking for libnc-dods.a in supplibs... $ECHO_C" >&6
--     if test -f "${ga_supplib_dir}/lib/libnc-dods.a" ; then
-+     echo "$as_me:$LINENO: checking for libnc-dap.a in supplibs" >&5
-+echo $ECHO_N "checking for libnc-dap.a in supplibs... $ECHO_C" >&6
-+     if test -f "${ga_supplib_dir}/lib/libnc-dap.a" ; then
-      	echo "$as_me:$LINENO: result: yes" >&5
- echo "${ECHO_T}yes" >&6
- 	 ga_check_dods="yes"
-@@ -15232,20 +15232,20 @@
- fi
- 
-   else
--     echo "$as_me:$LINENO: checking for libdap++.a in supplibs" >&5
--echo $ECHO_N "checking for libdap++.a in supplibs... $ECHO_C" >&6
--     if test -f "${ga_supplib_dir}/lib/libdap++.a" ; then
-+     echo "$as_me:$LINENO: checking for libdap.a in supplibs" >&5
-+echo $ECHO_N "checking for libdap.a in supplibs... $ECHO_C" >&6
-+     if test -f "${ga_supplib_dir}/lib/libdap.a" ; then
-      	echo "$as_me:$LINENO: result: yes" >&5
- echo "${ECHO_T}yes" >&6
- 
-   if test "${ga_dyn_supplibs}" = "yes" ; then
--     echo "$as_me:$LINENO: checking for main in -lnc-dods" >&5
--echo $ECHO_N "checking for main in -lnc-dods... $ECHO_C" >&6
-+     echo "$as_me:$LINENO: checking for main in -lnc-dap" >&5
-+echo $ECHO_N "checking for main in -lnc-dap... $ECHO_C" >&6
- if test "${ac_cv_lib_nc_dods_main+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   ac_check_lib_save_LIBS=$LIBS
--LIBS="-lnc-dods  $LIBS"
-+LIBS="-lnc-dap  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
- #line $LINENO "configure"
- /* confdefs.h.  */
-@@ -15293,9 +15293,9 @@
- fi
- 
-   else
--     echo "$as_me:$LINENO: checking for libnc-dods.a in supplibs" >&5
--echo $ECHO_N "checking for libnc-dods.a in supplibs... $ECHO_C" >&6
--     if test -f "${ga_supplib_dir}/lib/libnc-dods.a" ; then
-+     echo "$as_me:$LINENO: checking for libnc-dap.a in supplibs" >&5
-+echo $ECHO_N "checking for libnc-dap.a in supplibs... $ECHO_C" >&6
-+     if test -f "${ga_supplib_dir}/lib/libnc-dap.a" ; then
-      	echo "$as_me:$LINENO: result: yes" >&5
- echo "${ECHO_T}yes" >&6
- 	 ga_check_dods="yes"
-@@ -15321,20 +15321,20 @@
- fi
- 
-   else
--     echo "$as_me:$LINENO: checking for libwww.a in supplibs" >&5
--echo $ECHO_N "checking for libwww.a in supplibs... $ECHO_C" >&6
--     if test -f "${ga_supplib_dir}/lib/libwww.a" ; then
-+     echo "$as_me:$LINENO: checking for libwwwcore.a in supplibs" >&5
-+echo $ECHO_N "checking for libwwwcore.a in supplibs... $ECHO_C" >&6
-+     if test -f "${ga_supplib_dir}/lib/libwwwcore.a" ; then
-      	echo "$as_me:$LINENO: result: yes" >&5
- echo "${ECHO_T}yes" >&6
- 
-   if test "${ga_dyn_supplibs}" = "yes" ; then
--     echo "$as_me:$LINENO: checking for main in -ldap++" >&5
--echo $ECHO_N "checking for main in -ldap++... $ECHO_C" >&6
-+     echo "$as_me:$LINENO: checking for main in -ldap" >&5
-+echo $ECHO_N "checking for main in -ldap... $ECHO_C" >&6
- if test "${ac_cv_lib_dappp_main+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   ac_check_lib_save_LIBS=$LIBS
--LIBS="-ldap++  $LIBS"
-+LIBS="-ldap  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
- #line $LINENO "configure"
- /* confdefs.h.  */
-@@ -15379,13 +15379,13 @@
- if test $ac_cv_lib_dappp_main = yes; then
- 
-   if test "${ga_dyn_supplibs}" = "yes" ; then
--     echo "$as_me:$LINENO: checking for main in -lnc-dods" >&5
--echo $ECHO_N "checking for main in -lnc-dods... $ECHO_C" >&6
-+     echo "$as_me:$LINENO: checking for main in -lnc-dap" >&5
-+echo $ECHO_N "checking for main in -lnc-dap... $ECHO_C" >&6
- if test "${ac_cv_lib_nc_dods_main+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   ac_check_lib_save_LIBS=$LIBS
--LIBS="-lnc-dods  $LIBS"
-+LIBS="-lnc-dap  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
- #line $LINENO "configure"
- /* confdefs.h.  */
-@@ -15433,9 +15433,9 @@
- fi
- 
-   else
--     echo "$as_me:$LINENO: checking for libnc-dods.a in supplibs" >&5
--echo $ECHO_N "checking for libnc-dods.a in supplibs... $ECHO_C" >&6
--     if test -f "${ga_supplib_dir}/lib/libnc-dods.a" ; then
-+     echo "$as_me:$LINENO: checking for libnc-dap.a in supplibs" >&5
-+echo $ECHO_N "checking for libnc-dap.a in supplibs... $ECHO_C" >&6
-+     if test -f "${ga_supplib_dir}/lib/libnc-dap.a" ; then
-      	echo "$as_me:$LINENO: result: yes" >&5
- echo "${ECHO_T}yes" >&6
- 	 ga_check_dods="yes"
-@@ -15452,20 +15452,20 @@
- fi
- 
-   else
--     echo "$as_me:$LINENO: checking for libdap++.a in supplibs" >&5
--echo $ECHO_N "checking for libdap++.a in supplibs... $ECHO_C" >&6
--     if test -f "${ga_supplib_dir}/lib/libdap++.a" ; then
-+     echo "$as_me:$LINENO: checking for libdap.a in supplibs" >&5
-+echo $ECHO_N "checking for libdap.a in supplibs... $ECHO_C" >&6
-+     if test -f "${ga_supplib_dir}/lib/libdap.a" ; then
-      	echo "$as_me:$LINENO: result: yes" >&5
- echo "${ECHO_T}yes" >&6
- 
-   if test "${ga_dyn_supplibs}" = "yes" ; then
--     echo "$as_me:$LINENO: checking for main in -lnc-dods" >&5
--echo $ECHO_N "checking for main in -lnc-dods... $ECHO_C" >&6
-+     echo "$as_me:$LINENO: checking for main in -lnc-dap" >&5
-+echo $ECHO_N "checking for main in -lnc-dap... $ECHO_C" >&6
- if test "${ac_cv_lib_nc_dods_main+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   ac_check_lib_save_LIBS=$LIBS
--LIBS="-lnc-dods  $LIBS"
-+LIBS="-lnc-dap  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
- #line $LINENO "configure"
- /* confdefs.h.  */
-@@ -15513,9 +15513,9 @@
- fi
- 
-   else
--     echo "$as_me:$LINENO: checking for libnc-dods.a in supplibs" >&5
--echo $ECHO_N "checking for libnc-dods.a in supplibs... $ECHO_C" >&6
--     if test -f "${ga_supplib_dir}/lib/libnc-dods.a" ; then
-+     echo "$as_me:$LINENO: checking for libnc-dap.a in supplibs" >&5
-+echo $ECHO_N "checking for libnc-dap.a in supplibs... $ECHO_C" >&6
-+     if test -f "${ga_supplib_dir}/lib/libnc-dap.a" ; then
-      	echo "$as_me:$LINENO: result: yes" >&5
- echo "${ECHO_T}yes" >&6
- 	 ga_check_dods="yes"
-@@ -15617,13 +15617,13 @@
- if test $ac_cv_lib_rx_main = yes; then
- 
-   if test "${ga_dyn_supplibs}" = "yes" ; then
--     echo "$as_me:$LINENO: checking for main in -lwww" >&5
--echo $ECHO_N "checking for main in -lwww... $ECHO_C" >&6
-+     echo "$as_me:$LINENO: checking for main in -lwwwcore" >&5
-+echo $ECHO_N "checking for main in -lwwwcore... $ECHO_C" >&6
- if test "${ac_cv_lib_www_main+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   ac_check_lib_save_LIBS=$LIBS
--LIBS="-lwww  $LIBS"
-+LIBS="-lwwwcore  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
- #line $LINENO "configure"
- /* confdefs.h.  */
-@@ -15668,13 +15668,13 @@
- if test $ac_cv_lib_www_main = yes; then
- 
-   if test "${ga_dyn_supplibs}" = "yes" ; then
--     echo "$as_me:$LINENO: checking for main in -ldap++" >&5
--echo $ECHO_N "checking for main in -ldap++... $ECHO_C" >&6
-+     echo "$as_me:$LINENO: checking for main in -ldap" >&5
-+echo $ECHO_N "checking for main in -ldap... $ECHO_C" >&6
- if test "${ac_cv_lib_dappp_main+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   ac_check_lib_save_LIBS=$LIBS
--LIBS="-ldap++  $LIBS"
-+LIBS="-ldap  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
- #line $LINENO "configure"
- /* confdefs.h.  */
-@@ -15719,13 +15719,13 @@
- if test $ac_cv_lib_dappp_main = yes; then
- 
-   if test "${ga_dyn_supplibs}" = "yes" ; then
--     echo "$as_me:$LINENO: checking for main in -lnc-dods" >&5
--echo $ECHO_N "checking for main in -lnc-dods... $ECHO_C" >&6
-+     echo "$as_me:$LINENO: checking for main in -lnc-dap" >&5
-+echo $ECHO_N "checking for main in -lnc-dap... $ECHO_C" >&6
- if test "${ac_cv_lib_nc_dods_main+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   ac_check_lib_save_LIBS=$LIBS
--LIBS="-lnc-dods  $LIBS"
-+LIBS="-lnc-dap  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
- #line $LINENO "configure"
- /* confdefs.h.  */
-@@ -15773,9 +15773,9 @@
- fi
- 
-   else
--     echo "$as_me:$LINENO: checking for libnc-dods.a in supplibs" >&5
--echo $ECHO_N "checking for libnc-dods.a in supplibs... $ECHO_C" >&6
--     if test -f "${ga_supplib_dir}/lib/libnc-dods.a" ; then
-+     echo "$as_me:$LINENO: checking for libnc-dap.a in supplibs" >&5
-+echo $ECHO_N "checking for libnc-dap.a in supplibs... $ECHO_C" >&6
-+     if test -f "${ga_supplib_dir}/lib/libnc-dap.a" ; then
-      	echo "$as_me:$LINENO: result: yes" >&5
- echo "${ECHO_T}yes" >&6
- 	 ga_check_dods="yes"
-@@ -15792,20 +15792,20 @@
- fi
- 
-   else
--     echo "$as_me:$LINENO: checking for libdap++.a in supplibs" >&5
--echo $ECHO_N "checking for libdap++.a in supplibs... $ECHO_C" >&6
--     if test -f "${ga_supplib_dir}/lib/libdap++.a" ; then
-+     echo "$as_me:$LINENO: checking for libdap.a in supplibs" >&5
-+echo $ECHO_N "checking for libdap.a in supplibs... $ECHO_C" >&6
-+     if test -f "${ga_supplib_dir}/lib/libdap.a" ; then
-      	echo "$as_me:$LINENO: result: yes" >&5
- echo "${ECHO_T}yes" >&6
- 
-   if test "${ga_dyn_supplibs}" = "yes" ; then
--     echo "$as_me:$LINENO: checking for main in -lnc-dods" >&5
--echo $ECHO_N "checking for main in -lnc-dods... $ECHO_C" >&6
-+     echo "$as_me:$LINENO: checking for main in -lnc-dap" >&5
-+echo $ECHO_N "checking for main in -lnc-dap... $ECHO_C" >&6
- if test "${ac_cv_lib_nc_dods_main+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   ac_check_lib_save_LIBS=$LIBS
--LIBS="-lnc-dods  $LIBS"
-+LIBS="-lnc-dap  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
- #line $LINENO "configure"
- /* confdefs.h.  */
-@@ -15853,9 +15853,9 @@
- fi
- 
-   else
--     echo "$as_me:$LINENO: checking for libnc-dods.a in supplibs" >&5
--echo $ECHO_N "checking for libnc-dods.a in supplibs... $ECHO_C" >&6
--     if test -f "${ga_supplib_dir}/lib/libnc-dods.a" ; then
-+     echo "$as_me:$LINENO: checking for libnc-dap.a in supplibs" >&5
-+echo $ECHO_N "checking for libnc-dap.a in supplibs... $ECHO_C" >&6
-+     if test -f "${ga_supplib_dir}/lib/libnc-dap.a" ; then
-      	echo "$as_me:$LINENO: result: yes" >&5
- echo "${ECHO_T}yes" >&6
- 	 ga_check_dods="yes"
-@@ -15881,20 +15881,20 @@
- fi
- 
-   else
--     echo "$as_me:$LINENO: checking for libwww.a in supplibs" >&5
--echo $ECHO_N "checking for libwww.a in supplibs... $ECHO_C" >&6
--     if test -f "${ga_supplib_dir}/lib/libwww.a" ; then
-+     echo "$as_me:$LINENO: checking for libwwwcore.a in supplibs" >&5
-+echo $ECHO_N "checking for libwwwcore.a in supplibs... $ECHO_C" >&6
-+     if test -f "${ga_supplib_dir}/lib/libwwwcore.a" ; then
-      	echo "$as_me:$LINENO: result: yes" >&5
- echo "${ECHO_T}yes" >&6
- 
-   if test "${ga_dyn_supplibs}" = "yes" ; then
--     echo "$as_me:$LINENO: checking for main in -ldap++" >&5
--echo $ECHO_N "checking for main in -ldap++... $ECHO_C" >&6
-+     echo "$as_me:$LINENO: checking for main in -ldap" >&5
-+echo $ECHO_N "checking for main in -ldap... $ECHO_C" >&6
- if test "${ac_cv_lib_dappp_main+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   ac_check_lib_save_LIBS=$LIBS
--LIBS="-ldap++  $LIBS"
-+LIBS="-ldap  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
- #line $LINENO "configure"
- /* confdefs.h.  */
-@@ -15939,13 +15939,13 @@
- if test $ac_cv_lib_dappp_main = yes; then
- 
-   if test "${ga_dyn_supplibs}" = "yes" ; then
--     echo "$as_me:$LINENO: checking for main in -lnc-dods" >&5
--echo $ECHO_N "checking for main in -lnc-dods... $ECHO_C" >&6
-+     echo "$as_me:$LINENO: checking for main in -lnc-dap" >&5
-+echo $ECHO_N "checking for main in -lnc-dap... $ECHO_C" >&6
- if test "${ac_cv_lib_nc_dods_main+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   ac_check_lib_save_LIBS=$LIBS
--LIBS="-lnc-dods  $LIBS"
-+LIBS="-lnc-dap  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
- #line $LINENO "configure"
- /* confdefs.h.  */
-@@ -15993,9 +15993,9 @@
- fi
- 
-   else
--     echo "$as_me:$LINENO: checking for libnc-dods.a in supplibs" >&5
--echo $ECHO_N "checking for libnc-dods.a in supplibs... $ECHO_C" >&6
--     if test -f "${ga_supplib_dir}/lib/libnc-dods.a" ; then
-+     echo "$as_me:$LINENO: checking for libnc-dap.a in supplibs" >&5
-+echo $ECHO_N "checking for libnc-dap.a in supplibs... $ECHO_C" >&6
-+     if test -f "${ga_supplib_dir}/lib/libnc-dap.a" ; then
-      	echo "$as_me:$LINENO: result: yes" >&5
- echo "${ECHO_T}yes" >&6
- 	 ga_check_dods="yes"
-@@ -16012,20 +16012,20 @@
- fi
- 
-   else
--     echo "$as_me:$LINENO: checking for libdap++.a in supplibs" >&5
--echo $ECHO_N "checking for libdap++.a in supplibs... $ECHO_C" >&6
--     if test -f "${ga_supplib_dir}/lib/libdap++.a" ; then
-+     echo "$as_me:$LINENO: checking for libdap.a in supplibs" >&5
-+echo $ECHO_N "checking for libdap.a in supplibs... $ECHO_C" >&6
-+     if test -f "${ga_supplib_dir}/lib/libdap.a" ; then
-      	echo "$as_me:$LINENO: result: yes" >&5
- echo "${ECHO_T}yes" >&6
- 
-   if test "${ga_dyn_supplibs}" = "yes" ; then
--     echo "$as_me:$LINENO: checking for main in -lnc-dods" >&5
--echo $ECHO_N "checking for main in -lnc-dods... $ECHO_C" >&6
-+     echo "$as_me:$LINENO: checking for main in -lnc-dap" >&5
-+echo $ECHO_N "checking for main in -lnc-dap... $ECHO_C" >&6
- if test "${ac_cv_lib_nc_dods_main+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   ac_check_lib_save_LIBS=$LIBS
--LIBS="-lnc-dods  $LIBS"
-+LIBS="-lnc-dap  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
- #line $LINENO "configure"
- /* confdefs.h.  */
-@@ -16073,9 +16073,9 @@
- fi
- 
-   else
--     echo "$as_me:$LINENO: checking for libnc-dods.a in supplibs" >&5
--echo $ECHO_N "checking for libnc-dods.a in supplibs... $ECHO_C" >&6
--     if test -f "${ga_supplib_dir}/lib/libnc-dods.a" ; then
-+     echo "$as_me:$LINENO: checking for libnc-dap.a in supplibs" >&5
-+echo $ECHO_N "checking for libnc-dap.a in supplibs... $ECHO_C" >&6
-+     if test -f "${ga_supplib_dir}/lib/libnc-dap.a" ; then
-      	echo "$as_me:$LINENO: result: yes" >&5
- echo "${ECHO_T}yes" >&6
- 	 ga_check_dods="yes"
-@@ -16117,13 +16117,13 @@
- echo "${ECHO_T}yes" >&6
- 
-   if test "${ga_dyn_supplibs}" = "yes" ; then
--     echo "$as_me:$LINENO: checking for main in -lwww" >&5
--echo $ECHO_N "checking for main in -lwww... $ECHO_C" >&6
-+     echo "$as_me:$LINENO: checking for main in -lwwwcore" >&5
-+echo $ECHO_N "checking for main in -lwwwcore... $ECHO_C" >&6
- if test "${ac_cv_lib_www_main+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   ac_check_lib_save_LIBS=$LIBS
--LIBS="-lwww  $LIBS"
-+LIBS="-lwwwcore  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
- #line $LINENO "configure"
- /* confdefs.h.  */
-@@ -16168,13 +16168,13 @@
- if test $ac_cv_lib_www_main = yes; then
- 
-   if test "${ga_dyn_supplibs}" = "yes" ; then
--     echo "$as_me:$LINENO: checking for main in -ldap++" >&5
--echo $ECHO_N "checking for main in -ldap++... $ECHO_C" >&6
-+     echo "$as_me:$LINENO: checking for main in -ldap" >&5
-+echo $ECHO_N "checking for main in -ldap... $ECHO_C" >&6
- if test "${ac_cv_lib_dappp_main+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   ac_check_lib_save_LIBS=$LIBS
--LIBS="-ldap++  $LIBS"
-+LIBS="-ldap  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
- #line $LINENO "configure"
- /* confdefs.h.  */
-@@ -16219,13 +16219,13 @@
- if test $ac_cv_lib_dappp_main = yes; then
- 
-   if test "${ga_dyn_supplibs}" = "yes" ; then
--     echo "$as_me:$LINENO: checking for main in -lnc-dods" >&5
--echo $ECHO_N "checking for main in -lnc-dods... $ECHO_C" >&6
-+     echo "$as_me:$LINENO: checking for main in -lnc-dap" >&5
-+echo $ECHO_N "checking for main in -lnc-dap... $ECHO_C" >&6
- if test "${ac_cv_lib_nc_dods_main+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   ac_check_lib_save_LIBS=$LIBS
--LIBS="-lnc-dods  $LIBS"
-+LIBS="-lnc-dap  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
- #line $LINENO "configure"
- /* confdefs.h.  */
-@@ -16273,9 +16273,9 @@
- fi
- 
-   else
--     echo "$as_me:$LINENO: checking for libnc-dods.a in supplibs" >&5
--echo $ECHO_N "checking for libnc-dods.a in supplibs... $ECHO_C" >&6
--     if test -f "${ga_supplib_dir}/lib/libnc-dods.a" ; then
-+     echo "$as_me:$LINENO: checking for libnc-dap.a in supplibs" >&5
-+echo $ECHO_N "checking for libnc-dap.a in supplibs... $ECHO_C" >&6
-+     if test -f "${ga_supplib_dir}/lib/libnc-dap.a" ; then
-      	echo "$as_me:$LINENO: result: yes" >&5
- echo "${ECHO_T}yes" >&6
- 	 ga_check_dods="yes"
-@@ -16292,20 +16292,20 @@
- fi
- 
-   else
--     echo "$as_me:$LINENO: checking for libdap++.a in supplibs" >&5
--echo $ECHO_N "checking for libdap++.a in supplibs... $ECHO_C" >&6
--     if test -f "${ga_supplib_dir}/lib/libdap++.a" ; then
-+     echo "$as_me:$LINENO: checking for libdap.a in supplibs" >&5
-+echo $ECHO_N "checking for libdap.a in supplibs... $ECHO_C" >&6
-+     if test -f "${ga_supplib_dir}/lib/libdap.a" ; then
-      	echo "$as_me:$LINENO: result: yes" >&5
- echo "${ECHO_T}yes" >&6
- 
-   if test "${ga_dyn_supplibs}" = "yes" ; then
--     echo "$as_me:$LINENO: checking for main in -lnc-dods" >&5
--echo $ECHO_N "checking for main in -lnc-dods... $ECHO_C" >&6
-+     echo "$as_me:$LINENO: checking for main in -lnc-dap" >&5
-+echo $ECHO_N "checking for main in -lnc-dap... $ECHO_C" >&6
- if test "${ac_cv_lib_nc_dods_main+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   ac_check_lib_save_LIBS=$LIBS
--LIBS="-lnc-dods  $LIBS"
-+LIBS="-lnc-dap  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
- #line $LINENO "configure"
- /* confdefs.h.  */
-@@ -16353,9 +16353,9 @@
- fi
- 
-   else
--     echo "$as_me:$LINENO: checking for libnc-dods.a in supplibs" >&5
--echo $ECHO_N "checking for libnc-dods.a in supplibs... $ECHO_C" >&6
--     if test -f "${ga_supplib_dir}/lib/libnc-dods.a" ; then
-+     echo "$as_me:$LINENO: checking for libnc-dap.a in supplibs" >&5
-+echo $ECHO_N "checking for libnc-dap.a in supplibs... $ECHO_C" >&6
-+     if test -f "${ga_supplib_dir}/lib/libnc-dap.a" ; then
-      	echo "$as_me:$LINENO: result: yes" >&5
- echo "${ECHO_T}yes" >&6
- 	 ga_check_dods="yes"
-@@ -16381,20 +16381,20 @@
- fi
- 
-   else
--     echo "$as_me:$LINENO: checking for libwww.a in supplibs" >&5
--echo $ECHO_N "checking for libwww.a in supplibs... $ECHO_C" >&6
--     if test -f "${ga_supplib_dir}/lib/libwww.a" ; then
-+     echo "$as_me:$LINENO: checking for libwwwcore.a in supplibs" >&5
-+echo $ECHO_N "checking for libwwwcore.a in supplibs... $ECHO_C" >&6
-+     if test -f "${ga_supplib_dir}/lib/libwwwcore.a" ; then
-      	echo "$as_me:$LINENO: result: yes" >&5
- echo "${ECHO_T}yes" >&6
- 
-   if test "${ga_dyn_supplibs}" = "yes" ; then
--     echo "$as_me:$LINENO: checking for main in -ldap++" >&5
--echo $ECHO_N "checking for main in -ldap++... $ECHO_C" >&6
-+     echo "$as_me:$LINENO: checking for main in -ldap" >&5
-+echo $ECHO_N "checking for main in -ldap... $ECHO_C" >&6
- if test "${ac_cv_lib_dappp_main+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   ac_check_lib_save_LIBS=$LIBS
--LIBS="-ldap++  $LIBS"
-+LIBS="-ldap  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
- #line $LINENO "configure"
- /* confdefs.h.  */
-@@ -16439,13 +16439,13 @@
- if test $ac_cv_lib_dappp_main = yes; then
- 
-   if test "${ga_dyn_supplibs}" = "yes" ; then
--     echo "$as_me:$LINENO: checking for main in -lnc-dods" >&5
--echo $ECHO_N "checking for main in -lnc-dods... $ECHO_C" >&6
-+     echo "$as_me:$LINENO: checking for main in -lnc-dap" >&5
-+echo $ECHO_N "checking for main in -lnc-dap... $ECHO_C" >&6
- if test "${ac_cv_lib_nc_dods_main+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   ac_check_lib_save_LIBS=$LIBS
--LIBS="-lnc-dods  $LIBS"
-+LIBS="-lnc-dap  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
- #line $LINENO "configure"
- /* confdefs.h.  */
-@@ -16493,9 +16493,9 @@
- fi
- 
-   else
--     echo "$as_me:$LINENO: checking for libnc-dods.a in supplibs" >&5
--echo $ECHO_N "checking for libnc-dods.a in supplibs... $ECHO_C" >&6
--     if test -f "${ga_supplib_dir}/lib/libnc-dods.a" ; then
-+     echo "$as_me:$LINENO: checking for libnc-dap.a in supplibs" >&5
-+echo $ECHO_N "checking for libnc-dap.a in supplibs... $ECHO_C" >&6
-+     if test -f "${ga_supplib_dir}/lib/libnc-dap.a" ; then
-      	echo "$as_me:$LINENO: result: yes" >&5
- echo "${ECHO_T}yes" >&6
- 	 ga_check_dods="yes"
-@@ -16512,20 +16512,20 @@
- fi
- 
-   else
--     echo "$as_me:$LINENO: checking for libdap++.a in supplibs" >&5
--echo $ECHO_N "checking for libdap++.a in supplibs... $ECHO_C" >&6
--     if test -f "${ga_supplib_dir}/lib/libdap++.a" ; then
-+     echo "$as_me:$LINENO: checking for libdap.a in supplibs" >&5
-+echo $ECHO_N "checking for libdap.a in supplibs... $ECHO_C" >&6
-+     if test -f "${ga_supplib_dir}/lib/libdap.a" ; then
-      	echo "$as_me:$LINENO: result: yes" >&5
- echo "${ECHO_T}yes" >&6
- 
-   if test "${ga_dyn_supplibs}" = "yes" ; then
--     echo "$as_me:$LINENO: checking for main in -lnc-dods" >&5
--echo $ECHO_N "checking for main in -lnc-dods... $ECHO_C" >&6
-+     echo "$as_me:$LINENO: checking for main in -lnc-dap" >&5
-+echo $ECHO_N "checking for main in -lnc-dap... $ECHO_C" >&6
- if test "${ac_cv_lib_nc_dods_main+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   ac_check_lib_save_LIBS=$LIBS
--LIBS="-lnc-dods  $LIBS"
-+LIBS="-lnc-dap  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
- #line $LINENO "configure"
- /* confdefs.h.  */
-@@ -16573,9 +16573,9 @@
- fi
- 
-   else
--     echo "$as_me:$LINENO: checking for libnc-dods.a in supplibs" >&5
--echo $ECHO_N "checking for libnc-dods.a in supplibs... $ECHO_C" >&6
--     if test -f "${ga_supplib_dir}/lib/libnc-dods.a" ; then
-+     echo "$as_me:$LINENO: checking for libnc-dap.a in supplibs" >&5
-+echo $ECHO_N "checking for libnc-dap.a in supplibs... $ECHO_C" >&6
-+     if test -f "${ga_supplib_dir}/lib/libnc-dap.a" ; then
-      	echo "$as_me:$LINENO: result: yes" >&5
- echo "${ECHO_T}yes" >&6
- 	 ga_check_dods="yes"
-@@ -16748,11 +16748,11 @@
- 
- 
-     if test $use_gadods = "yes" ; then
--       dods_rep_libs="-lgadods -lnc-dods -ldap++"
-+       dods_rep_libs="-lgadods -lnc-dap -ldap"
-        gadods_def="-DUSEGADODS=1"
-        echo "+ gradsdods (OPeNDAP/netCDF) build enabled - gridded and station interfaces"
-     else
--       dods_rep_libs="-lnc-dods -ldap++"
-+       dods_rep_libs="-lnc-dap -ldap"
-        gadods_def="-DUSEGADODS=0"
-        echo "+ gradsdods (OPeNDAP/netCDF) build enabled - gridded interface only"
-     fi
-@@ -16898,7 +16898,7 @@
- 
- # Hack to deal with Darwin C++ quirk: template instantiations can't
- # be done inside archives, and must be separate objects.
--# So inst.o is extracted from libdap++.a and linked separately.
-+# So inst.o is extracted from libdap.a and linked separately.
- 
- 
- if  test "$is_darwin" = "yes" \

--- trunk/dports/science/grads/files/patch-gacfg.c.diff	2012-04-05 00:46:55 UTC (rev 91550)
+++ trunk/dports/science/grads/files/patch-gacfg.c.diff	2012-04-05 00:58:49 UTC (rev 91551)
@@ -1,20 +0,0 @@
---- src/gacfg.c.orig	2007-03-14 17:38:56.000000000 +0900
-+++ src/gacfg.c	2007-03-14 18:15:48.000000000 +0900
-@@ -50,13 +50,13 @@
- 
- /* Config: v1.7b2,32-bit,little-endian,readline,NetCDF,sdf/xdf,lats,athena */
- 
--sprintf(cmd,"Config: v%s",GRADS_VERSION);
-+sprintf(cmd,"Config: v%s %2d-bit",GRADS_VERSION,sizeof(off_t)*8);
- 
--if(GRADS_CRAY)  strcat(cmd," 64-bit,cray");
-+/*if(GRADS_CRAY)  strcat(cmd," 64-bit,cray");*/
- /*kk 020624 --- s */
--else if (GRADS_HP64) strcat(cmd," 64-bit,hpux11");
-+/*else if (GRADS_HP64) strcat(cmd," 64-bit,hpux11");*/
- /*kk 020624 --- e */
--else            strcat(cmd," 32-bit");
-+/*else            strcat(cmd," 32-bit");*/
- 
- if(BYTEORDER)   strcat(cmd," big-endian");
- else            strcat(cmd," little-endian");

--- trunk/dports/science/grads/files/patch-grads.h.diff	2012-04-05 00:46:55 UTC (rev 91550)
+++ trunk/dports/science/grads/files/patch-grads.h.diff	2012-04-05 00:58:49 UTC (rev 91551)
@@ -1,10 +0,0 @@
---- src/grads.h.orig	2007-03-14 10:54:17.000000000 +0900
-+++ src/grads.h	2007-03-14 10:55:53.000000000 +0900
-@@ -14,6 +14,7 @@
- #include <stdio.h>
- #include <stdlib.h>
- #include <gabufr.h>
-+#include <sys/types.h>
- 
- #define SETMISS 1
- #define EPSILON 1e5

--- trunk/dports/science/grads/files/patch-gxhpng.c.diff	2012-04-05 00:46:55 UTC (rev 91550)
+++ trunk/dports/science/grads/files/patch-gxhpng.c.diff	2012-04-05 00:58:49 UTC (rev 91551)
@@ -1,14 +0,0 @@
---- src/gxhpng.c.orig	2008-03-13 23:57:19.000000000 +0900
-+++ src/gxhpng.c	2008-03-13 23:58:39.000000000 +0900
-@@ -377,7 +377,10 @@
-   return (retcod);
- }
- 	
--int gdCompareInt(const void *a, const void *b);
-+int gdCompareInt(const void *a, const void *b)
-+{
-+  return (*(const int *)a) - (*(const int *)b);
-+}
- 
- /* Version of gdImageFilledPolygon to invoke my local 
-    version of gdImageLne.  Nothing else changed... B.Doty 5/31/01 */

--- trunk/dports/science/grads/files/patch-wgrib.c.diff	2012-04-05 00:46:55 UTC (rev 91550)
+++ trunk/dports/science/grads/files/patch-wgrib.c.diff	2012-04-05 00:58:49 UTC (rev 91551)
@@ -1,10 +0,0 @@
---- src/wgrib.c.orig	2007-03-14 11:08:04.000000000 +0900
-+++ src/wgrib.c	2007-03-14 11:08:18.000000000 +0900
-@@ -12,6 +12,7 @@
- #include <stddef.h>
- #include <math.h>
- #include <float.h>
-+#include <sys/types.h>
- /* version 1.2.1 of grib headers  w. ebisuzaki */
- 
- #ifndef INT2

--- trunk/dports/science/grads2/Portfile	2012-04-05 00:46:55 UTC (rev 91550)
+++ trunk/dports/science/grads2/Portfile	2012-04-05 00:58:49 UTC (rev 91551)
@@ -7,7 +7,7 @@
 version             2.0.a9.oga.1
 revision            3
 platforms           darwin
-maintainers         takeshi
+maintainers         nomaintainer
 categories          science
 description         interactive visualization tool for earth science data
 master_sites        sourceforge:opengrads