--- 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" \