[34981] trunk/dports/science/grads

Thu Mar 13 08:31:35 PDT 2008

Revision: 34981
          http://trac.macosforge.org/projects/macports/changeset/34981
Author:   takeshi at macports.org
Date:     2008-03-13 08:31:34 -0700 (Thu, 13 Mar 2008)

Log Message:
-----------
grads: corrected patch file names. fixed printim variant

Modified Paths:
--------------
    trunk/dports/science/grads/Portfile

Added Paths:
-----------
    trunk/dports/science/grads/files/patch-bufrscan.c.diff
    trunk/dports/science/grads/files/patch-configure.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

Removed Paths:
-------------
    trunk/dports/science/grads/files/patch-bufrscan.c
    trunk/dports/science/grads/files/patch-configure
    trunk/dports/science/grads/files/patch-gacfg.c
    trunk/dports/science/grads/files/patch-grads.h
    trunk/dports/science/grads/files/patch-wgrib.c

Modified: trunk/dports/science/grads/Portfile
===================================================================

--- trunk/dports/science/grads/Portfile	2008-03-13 15:27:31 UTC (rev 34980)
+++ trunk/dports/science/grads/Portfile	2008-03-13 15:31:34 UTC (rev 34981)
@@ -4,8 +4,8 @@
 
 name               grads
 version            1.9b4
-revision           2
-platforms          darwin 
+revision           3
+platforms          darwin
 maintainers        takeshi at macports.org
 categories         science
 description        interactive visualization tool for earth science data
@@ -18,24 +18,32 @@
                    ${gradsdata} sha1 6a3e997868b358ecf71ea618c27ad10f28183f5e
 homepage           http://www.iges.org/grads/grads.html
 long_description   \
-    The Grid Analysis and Display System (GrADS) is an interactive \
-    desktop tool that is used for easy access, manipulation, and \
-    visualization of earth science data. The format of the data may \
+    The Grid Analysis and Display System (GrADS) is an interactive     \
+    desktop tool that is used for easy access, manipulation, and       \
+    visualization of earth science data. The format of the data may    \
     be either binary, GRIB, NetCDF, or HDF-SDS (Scientific Data Sets). \
     GrADS has been implemented worldwide on a variety of commonly used \
     operating systems and is freely distributed over the Internet.
 
-depends_build      port:libwww port:readline port:rx port:libwmf \
-                   port:netcdf port:udunits port:libdap port:libnc-dap
+depends_build      port:libwww port:readline  port:rx   port:zlib \
+                   port:netcdf port:udunits   port:hdf4           \
+                   port:libdap port:libnc-dap
 
-patchfiles         patch-configure patch-grads.h patch-wgrib.c \
-                   patch-bufrscan.c patch-gacfg.c
+patchfiles         patch-configure.diff patch-grads.h.diff    \
+                   patch-wgrib.c.diff   patch-bufrscan.c.diff \
+                   patch-gacfg.c.diff   patch-gxhpng.c.diff
 
-configure.cppflags	"-I/usr/include -I${prefix}/include"
-configure.ldflags	"-L/usr/lib -L${prefix}/lib"
-configure.env	LIBS="-lwmf" SUPPLIBS=${prefix}
-configure.args     --prefix=${prefix} --with-lats --with-x
 
+post-patch {
+    reinplace "s|/usr/local|${prefix}|" ${worksrcpath}/src/gx.h
+}
+
+#configure.env LIBS="-lwmf" SUPPLIBS=${prefix}
+configure.env SUPPLIBS=${prefix}
+configure.args     --prefix=${prefix} --with-readline --with-lats \
+                   --with-nc --with-dods --with-hdf --with-x      \
+                   --without-printim --without-gui
+
 pre-build {
   reinplace "s|libwww.a|libwwwcore.a|g" ${worksrcpath}/src/Makefile
   reinplace "s|\$(supp_lib_dir)/inst.o| |g" ${worksrcpath}/src/Makefile
@@ -49,7 +57,13 @@
     system "ln -s ${prefix}/bin/${name}dods ${destroot}${prefix}/bin/${name}"
 }
 
-variant printim {
+variant printim description {image output using GD} {
     depends_build-append    port:jpeg port:libpng port:gd2 port:libwmf
+    configure.args-delete   --without-printim
     configure.args-append   --with-printim
 }
+
+#variant gui description {enables GUI} {
+#    configure.args-delete   --without-gui
+#    configure.args-append   --with-gui
+#}

Deleted: trunk/dports/science/grads/files/patch-bufrscan.c
===================================================================
--- trunk/dports/science/grads/files/patch-bufrscan.c	2008-03-13 15:27:31 UTC (rev 34980)
+++ trunk/dports/science/grads/files/patch-bufrscan.c	2008-03-13 15:31:34 UTC (rev 34981)
@@ -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

Added: trunk/dports/science/grads/files/patch-bufrscan.c.diff
===================================================================
--- trunk/dports/science/grads/files/patch-bufrscan.c.diff	                        (rev 0)
+++ trunk/dports/science/grads/files/patch-bufrscan.c.diff	2008-03-13 15:31:34 UTC (rev 34981)
@@ -0,0 +1,10 @@
+--- 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

Deleted: trunk/dports/science/grads/files/patch-configure
===================================================================
--- trunk/dports/science/grads/files/patch-configure	2008-03-13 15:27:31 UTC (rev 34980)
+++ trunk/dports/science/grads/files/patch-configure	2008-03-13 15:31:34 UTC (rev 34981)
@@ -1,1633 +0,0 @@
---- configure.orig	2007-03-14 13:53:35.000000000 +0900
-+++ configure	2007-03-14 19:20:27.000000000 +0900
-@@ -12371,13 +12371,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.  */
-@@ -12422,13 +12422,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.  */
-@@ -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
- 
-   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
- 
-   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
- 
-   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
- 
-   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.  */
-@@ -12693,13 +12693,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.  */
-@@ -12747,9 +12747,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"
-@@ -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
- 
-   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
- 
-   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
- 
-   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
- 
-   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.  */
-@@ -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
- 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
- 
-   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 @@
- 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 @@
- 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.  */
-@@ -13327,9 +13327,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"
-@@ -13431,13 +13431,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.  */
-@@ -13482,13 +13482,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.  */
-@@ -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
- 
-   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.  */
-@@ -13667,9 +13667,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"
-@@ -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 $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.  */
-@@ -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
- 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
- 
-   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 @@
- 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 @@
- 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"
-@@ -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
- 
-   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
- 
-   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
-   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.  */
-@@ -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
- 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
- 
-   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 @@
- 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 @@
- 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"
-@@ -14557,13 +14557,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.  */
-@@ -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
- 
-   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
- 
-   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.  */
-@@ -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
- 
-   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.  */
-@@ -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
- 
-   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
- 
-   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" \

Added: trunk/dports/science/grads/files/patch-configure.diff
===================================================================
--- trunk/dports/science/grads/files/patch-configure.diff	                        (rev 0)
+++ trunk/dports/science/grads/files/patch-configure.diff	2008-03-13 15:31:34 UTC (rev 34981)
@@ -0,0 +1,1642 @@
+--- 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
+ 
+-  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
+ 
+@@ -12371,13 +12371,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.  */
+@@ -12422,13 +12422,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.  */
+@@ -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
+ 
+   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
+ 
+   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
+ 
+   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
+ 
+   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.  */
+@@ -12693,13 +12693,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.  */
+@@ -12747,9 +12747,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"
+@@ -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
+ 
+   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
+ 
+   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
+ 
+   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
+ 
+   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.  */
+@@ -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
+ 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
+ 
+   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 @@
+ 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 @@
+ 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.  */
+@@ -13327,9 +13327,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"
+@@ -13431,13 +13431,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.  */
+@@ -13482,13 +13482,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.  */
+@@ -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
+ 
+   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.  */
+@@ -13667,9 +13667,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"
+@@ -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 $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.  */
+@@ -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
+ 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
+ 
+   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 @@
+ 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 @@
+ 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"
+@@ -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
+ 
+   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
+ 
+   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
+   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.  */
+@@ -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
+ 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
+ 
+   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 @@
+ 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 @@
+ 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"
+@@ -14557,13 +14557,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.  */
+@@ -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
+ 
+   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
+ 
+   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.  */
+@@ -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
+ 
+   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.  */
+@@ -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
+ 
+   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
+ 
+   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" \

Deleted: trunk/dports/science/grads/files/patch-gacfg.c
===================================================================
--- trunk/dports/science/grads/files/patch-gacfg.c	2008-03-13 15:27:31 UTC (rev 34980)
+++ trunk/dports/science/grads/files/patch-gacfg.c	2008-03-13 15:31:34 UTC (rev 34981)
@@ -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");

Added: trunk/dports/science/grads/files/patch-gacfg.c.diff
===================================================================
--- trunk/dports/science/grads/files/patch-gacfg.c.diff	                        (rev 0)
+++ trunk/dports/science/grads/files/patch-gacfg.c.diff	2008-03-13 15:31:34 UTC (rev 34981)
@@ -0,0 +1,20 @@
+--- 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");

Deleted: trunk/dports/science/grads/files/patch-grads.h
===================================================================
--- trunk/dports/science/grads/files/patch-grads.h	2008-03-13 15:27:31 UTC (rev 34980)
+++ trunk/dports/science/grads/files/patch-grads.h	2008-03-13 15:31:34 UTC (rev 34981)
@@ -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

Added: trunk/dports/science/grads/files/patch-grads.h.diff
===================================================================
--- trunk/dports/science/grads/files/patch-grads.h.diff	                        (rev 0)
+++ trunk/dports/science/grads/files/patch-grads.h.diff	2008-03-13 15:31:34 UTC (rev 34981)
@@ -0,0 +1,10 @@
+--- 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

Added: trunk/dports/science/grads/files/patch-gxhpng.c.diff
===================================================================
--- trunk/dports/science/grads/files/patch-gxhpng.c.diff	                        (rev 0)
+++ trunk/dports/science/grads/files/patch-gxhpng.c.diff	2008-03-13 15:31:34 UTC (rev 34981)
@@ -0,0 +1,14 @@
+--- 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 */

Deleted: trunk/dports/science/grads/files/patch-wgrib.c
===================================================================
--- trunk/dports/science/grads/files/patch-wgrib.c	2008-03-13 15:27:31 UTC (rev 34980)
+++ trunk/dports/science/grads/files/patch-wgrib.c	2008-03-13 15:31:34 UTC (rev 34981)
@@ -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

Added: trunk/dports/science/grads/files/patch-wgrib.c.diff
===================================================================
--- trunk/dports/science/grads/files/patch-wgrib.c.diff	                        (rev 0)
+++ trunk/dports/science/grads/files/patch-wgrib.c.diff	2008-03-13 15:31:34 UTC (rev 34981)
@@ -0,0 +1,10 @@
+--- 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

-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/macports-changes/attachments/20080313/ce6f3976/attachment-0001.html
