--- grads-1.9/configure.orig	Sat Feb 21 19:47:24 2004
+++ grads-1.9/configure	Sun Feb 22 06:47:19 2004
@@ -2639,6 +2639,7 @@
 echo "${ECHO_T}${SUPPLIBS}" >&6
     # This is the "official" variable name for use by other macros
     ga_supplib_dir="${SUPPLIBS}"
+    dods_dir="${DODSDIR}"
 
   else
     # Look for platform-specific supplib directory in ${top_builddir}
@@ -5928,7 +5929,7 @@
   else
      echo "$as_me:5929: checking for libz.a in supplibs" >&5
 echo $ECHO_N "checking for libz.a in supplibs... $ECHO_C" >&6
-     if test -f "${ga_supplib_dir}/lib/libz.a" ; then
+     if test -f "/usr/lib/libz.dylib" ; then
      	echo "$as_me:5932: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 
@@ -6172,9 +6173,10 @@
      ga_lib_suffix='.a'
   fi
 
-  for ga_lib_name in gd png z ; do
+  for ga_lib_name in gd png ; do
       printim_libs="$printim_libs ${ga_lib_prefix}${ga_lib_name}${ga_lib_suffix}"
   done
+  printim_libs="$printim_libs -lz"
 
   extra_utils="$extra_utils gxtran"
   echo "+ printim enabled"
@@ -8055,7 +8057,7 @@
   else
      echo "$as_me:8056: checking for libz.a in supplibs" >&5
 echo $ECHO_N "checking for libz.a in supplibs... $ECHO_C" >&6
-     if test -f "${ga_supplib_dir}/lib/libz.a" ; then
+     if test -f "/usr/lib/libz.dylib" ; then
      	echo "$as_me:8059: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 
@@ -9031,9 +9033,10 @@
      ga_lib_suffix='.a'
   fi
 
-  for ga_lib_name in mfhdf df jpeg udunits z ; do
+  for ga_lib_name in mfhdf df jpeg udunits ; do
       hdf_libs="$hdf_libs ${ga_lib_prefix}${ga_lib_name}${ga_lib_suffix}"
   done
+  hdf_libs="$hdf_libs  ${ga_lib_prefix}netcdf.a -lz"
 
     extra_bins="$extra_bins gradshdf"
     echo "+ gradshdf (HDF-SDS/netCDF) build enabled"
@@ -9283,13 +9286,13 @@
 if test $ac_cv_lib_rx_main = yes; then
 
   if test "${ga_dyn_supplibs}" = "yes" ; then
-     echo "$as_me:9286: checking for main in -lwww" >&5
-echo $ECHO_N "checking for main in -lwww... $ECHO_C" >&6
+     echo "$as_me:9286: checking for main in -lcurl" >&5
+echo $ECHO_N "checking for main in -lcurl... $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="-lcurl  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
 #line 9294 "configure"
 #include "confdefs.h"
@@ -9423,7 +9426,7 @@
   else
      echo "$as_me:9424: 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
+     if test -f "${dods_dir}/lib/libnc-dods.a" ; then
      	echo "$as_me:9427: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 	 ga_check_dods="yes"
@@ -9440,7 +9443,7 @@
   else
      echo "$as_me:9441: 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
+     if test -f "${dods_dir}/lib/libdap++.a" ; then
      	echo "$as_me:9444: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 
@@ -9495,7 +9498,7 @@
   else
      echo "$as_me:9496: 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
+     if test -f "${dods_dir}/lib/libnc-dods.a" ; then
      	echo "$as_me:9499: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 	 ga_check_dods="yes"
@@ -9517,9 +9520,9 @@
 fi
 
   else
-     echo "$as_me:9520: 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:9520: checking for libcurl.a in supplibs" >&5
+echo $ECHO_N "checking for libcurl.a in supplibs... $ECHO_C" >&6
+     if test -f "${dods_dir}/lib/libcurl.a" ; then
      	echo "$as_me:9523: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 
@@ -9619,7 +9622,7 @@
   else
      echo "$as_me:9620: 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
+     if test -f "${dods_dir}/lib/libnc-dods.a" ; then
      	echo "$as_me:9623: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 	 ga_check_dods="yes"
@@ -9636,7 +9639,7 @@
   else
      echo "$as_me:9637: 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
+     if test -f "${dods_dir}/lib/libdap++.a" ; then
      	echo "$as_me:9640: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 
@@ -9691,7 +9694,7 @@
   else
      echo "$as_me:9692: 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
+     if test -f "${dods_dir}/lib/libnc-dods.a" ; then
      	echo "$as_me:9695: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 	 ga_check_dods="yes"
@@ -9722,18 +9725,18 @@
   else
      echo "$as_me:9723: checking for librx.a in supplibs" >&5
 echo $ECHO_N "checking for librx.a in supplibs... $ECHO_C" >&6
-     if test -f "${ga_supplib_dir}/lib/librx.a" ; then
+     if test -f "${dods_dir}/lib/librx.a" ; then
      	echo "$as_me:9726: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 
   if test "${ga_dyn_supplibs}" = "yes" ; then
-     echo "$as_me:9730: checking for main in -lwww" >&5
-echo $ECHO_N "checking for main in -lwww... $ECHO_C" >&6
+     echo "$as_me:9730: checking for main in -lcurl" >&5
+echo $ECHO_N "checking for main in -lcurl... $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="-lcurl  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
 #line 9738 "configure"
 #include "confdefs.h"
@@ -9867,7 +9870,7 @@
   else
      echo "$as_me:9868: 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
+     if test -f "${dods_dir}/lib/libnc-dods.a" ; then
      	echo "$as_me:9871: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 	 ga_check_dods="yes"
@@ -9884,7 +9887,7 @@
   else
      echo "$as_me:9885: 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
+     if test -f "${dods_dir}/lib/libdap++.a" ; then
      	echo "$as_me:9888: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 
@@ -9939,7 +9942,7 @@
   else
      echo "$as_me:9940: 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
+     if test -f "${dods_dir}/lib/libnc-dods.a" ; then
      	echo "$as_me:9943: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 	 ga_check_dods="yes"
@@ -9961,9 +9964,9 @@
 fi
 
   else
-     echo "$as_me:9964: 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:9964: checking for libcurl.a in supplibs" >&5
+echo $ECHO_N "checking for libcurl.a in supplibs... $ECHO_C" >&6
+     if test -f "${dods_dir}/lib/libcurl.a" ; then
      	echo "$as_me:9967: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 
@@ -10063,7 +10066,7 @@
   else
      echo "$as_me:10064: 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
+     if test -f "${dods_dir}/lib/libnc-dods.a" ; then
      	echo "$as_me:10067: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 	 ga_check_dods="yes"
@@ -10080,7 +10083,7 @@
   else
      echo "$as_me:10081: 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
+     if test -f "${dods_dir}/lib/libdap++.a" ; then
      	echo "$as_me:10084: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 
@@ -10135,7 +10138,7 @@
   else
      echo "$as_me:10136: 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
+     if test -f "${dods_dir}/lib/libnc-dods.a" ; then
      	echo "$as_me:10139: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 	 ga_check_dods="yes"
@@ -10223,13 +10226,13 @@
 if test $ac_cv_lib_rx_main = yes; then
 
   if test "${ga_dyn_supplibs}" = "yes" ; then
-     echo "$as_me:10226: checking for main in -lwww" >&5
-echo $ECHO_N "checking for main in -lwww... $ECHO_C" >&6
+     echo "$as_me:10226: checking for main in -lcurl" >&5
+echo $ECHO_N "checking for main in -lcurl... $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="-lcurl  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
 #line 10234 "configure"
 #include "confdefs.h"
@@ -10363,7 +10366,7 @@
   else
      echo "$as_me:10364: 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
+     if test -f "${dods_dir}/lib/libnc-dods.a" ; then
      	echo "$as_me:10367: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 	 ga_check_dods="yes"
@@ -10380,7 +10383,7 @@
   else
      echo "$as_me:10381: 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
+     if test -f "${dods_dir}/lib/libdap++.a" ; then
      	echo "$as_me:10384: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 
@@ -10435,7 +10438,7 @@
   else
      echo "$as_me:10436: 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
+     if test -f "${dods_dir}/lib/libnc-dods.a" ; then
      	echo "$as_me:10439: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 	 ga_check_dods="yes"
@@ -10457,9 +10460,9 @@
 fi
 
   else
-     echo "$as_me:10460: 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:10460: checking for libcurl.a in supplibs" >&5
+echo $ECHO_N "checking for libcurl.a in supplibs... $ECHO_C" >&6
+     if test -f "${dods_dir}/lib/libcurl.a" ; then
      	echo "$as_me:10463: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 
@@ -10559,7 +10562,7 @@
   else
      echo "$as_me:10560: 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
+     if test -f "${dods_dir}/lib/libnc-dods.a" ; then
      	echo "$as_me:10563: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 	 ga_check_dods="yes"
@@ -10576,7 +10579,7 @@
   else
      echo "$as_me:10577: 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
+     if test -f "${dods_dir}/lib/libdap++.a" ; then
      	echo "$as_me:10580: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 
@@ -10631,7 +10634,7 @@
   else
      echo "$as_me:10632: 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
+     if test -f "${dods_dir}/lib/libnc-dods.a" ; then
      	echo "$as_me:10635: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 	 ga_check_dods="yes"
@@ -10662,18 +10665,18 @@
   else
      echo "$as_me:10663: checking for librx.a in supplibs" >&5
 echo $ECHO_N "checking for librx.a in supplibs... $ECHO_C" >&6
-     if test -f "${ga_supplib_dir}/lib/librx.a" ; then
+     if test -f "${dods_dir}/lib/librx.a" ; then
      	echo "$as_me:10666: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 
   if test "${ga_dyn_supplibs}" = "yes" ; then
-     echo "$as_me:10670: checking for main in -lwww" >&5
-echo $ECHO_N "checking for main in -lwww... $ECHO_C" >&6
+     echo "$as_me:10670: checking for main in -lcurl" >&5
+echo $ECHO_N "checking for main in -lcurl... $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="-lcurl  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
 #line 10678 "configure"
 #include "confdefs.h"
@@ -10807,7 +10810,7 @@
   else
      echo "$as_me:10808: 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
+     if test -f "${dods_dir}/lib/libnc-dods.a" ; then
      	echo "$as_me:10811: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 	 ga_check_dods="yes"
@@ -10824,7 +10827,7 @@
   else
      echo "$as_me:10825: 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
+     if test -f "${dods_dir}/lib/libdap++.a" ; then
      	echo "$as_me:10828: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 
@@ -10879,7 +10882,7 @@
   else
      echo "$as_me:10880: 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
+     if test -f "${dods_dir}/lib/libnc-dods.a" ; then
      	echo "$as_me:10883: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 	 ga_check_dods="yes"
@@ -10901,9 +10904,9 @@
 fi
 
   else
-     echo "$as_me:10904: 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:10904: checking for libcurl.a in supplibs" >&5
+echo $ECHO_N "checking for libcurl.a in supplibs... $ECHO_C" >&6
+     if test -f "${dods_dir}/lib/libcurl.a" ; then
      	echo "$as_me:10907: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 
@@ -11003,7 +11006,7 @@
   else
      echo "$as_me:11004: 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
+     if test -f "${dods_dir}/lib/libnc-dods.a" ; then
      	echo "$as_me:11007: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 	 ga_check_dods="yes"
@@ -11020,7 +11023,7 @@
   else
      echo "$as_me:11021: 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
+     if test -f "${dods_dir}/lib/libdap++.a" ; then
      	echo "$as_me:11024: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 
@@ -11075,7 +11078,7 @@
   else
      echo "$as_me:11076: 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
+     if test -f "${dods_dir}/lib/libnc-dods.a" ; then
      	echo "$as_me:11079: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 	 ga_check_dods="yes"
@@ -11120,7 +11123,7 @@
   else
      echo "$as_me:11121: checking for libz.a in supplibs" >&5
 echo $ECHO_N "checking for libz.a in supplibs... $ECHO_C" >&6
-     if test -f "${ga_supplib_dir}/lib/libz.a" ; then
+     if test -f "/usr/lib/libz.dylib" ; then
      	echo "$as_me:11124: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 
@@ -11222,13 +11225,13 @@
 if test $ac_cv_lib_rx_main = yes; then
 
   if test "${ga_dyn_supplibs}" = "yes" ; then
-     echo "$as_me:11225: checking for main in -lwww" >&5
-echo $ECHO_N "checking for main in -lwww... $ECHO_C" >&6
+     echo "$as_me:11225: checking for main in -lcurl" >&5
+echo $ECHO_N "checking for main in -lcurl... $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="-lcurl  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
 #line 11233 "configure"
 #include "confdefs.h"
@@ -11362,7 +11365,7 @@
   else
      echo "$as_me:11363: 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
+     if test -f "${dods_dir}/lib/libnc-dods.a" ; then
      	echo "$as_me:11366: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 	 ga_check_dods="yes"
@@ -11379,7 +11382,7 @@
   else
      echo "$as_me:11380: 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
+     if test -f "${dods_dir}/lib/libdap++.a" ; then
      	echo "$as_me:11383: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 
@@ -11434,7 +11437,7 @@
   else
      echo "$as_me:11435: 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
+     if test -f "${dods_dir}/lib/libnc-dods.a" ; then
      	echo "$as_me:11438: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 	 ga_check_dods="yes"
@@ -11456,9 +11459,9 @@
 fi
 
   else
-     echo "$as_me:11459: 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:11459: checking for libcurl.a in supplibs" >&5
+echo $ECHO_N "checking for libcurl.a in supplibs... $ECHO_C" >&6
+     if test -f "${dods_dir}/lib/libcurl.a" ; then
      	echo "$as_me:11462: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 
@@ -11558,7 +11561,7 @@
   else
      echo "$as_me:11559: 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
+     if test -f "${dods_dir}/lib/libnc-dods.a" ; then
      	echo "$as_me:11562: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 	 ga_check_dods="yes"
@@ -11575,7 +11578,7 @@
   else
      echo "$as_me:11576: 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
+     if test -f "${dods_dir}/lib/libdap++.a" ; then
      	echo "$as_me:11579: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 
@@ -11630,7 +11633,7 @@
   else
      echo "$as_me:11631: 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
+     if test -f "${dods_dir}/lib/libnc-dods.a" ; then
      	echo "$as_me:11634: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 	 ga_check_dods="yes"
@@ -11661,18 +11664,18 @@
   else
      echo "$as_me:11662: checking for librx.a in supplibs" >&5
 echo $ECHO_N "checking for librx.a in supplibs... $ECHO_C" >&6
-     if test -f "${ga_supplib_dir}/lib/librx.a" ; then
+     if test -f "${dods_dir}/lib/librx.a" ; then
      	echo "$as_me:11665: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 
   if test "${ga_dyn_supplibs}" = "yes" ; then
-     echo "$as_me:11669: checking for main in -lwww" >&5
-echo $ECHO_N "checking for main in -lwww... $ECHO_C" >&6
+     echo "$as_me:11669: checking for main in -lcurl" >&5
+echo $ECHO_N "checking for main in -lcurl... $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="-lcurl  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
 #line 11677 "configure"
 #include "confdefs.h"
@@ -11806,7 +11809,7 @@
   else
      echo "$as_me:11807: 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
+     if test -f "${dods_dir}/lib/libnc-dods.a" ; then
      	echo "$as_me:11810: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 	 ga_check_dods="yes"
@@ -11823,7 +11826,7 @@
   else
      echo "$as_me:11824: 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
+     if test -f "${dods_dir}/lib/libdap++.a" ; then
      	echo "$as_me:11827: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 
@@ -11878,7 +11881,7 @@
   else
      echo "$as_me:11879: 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
+     if test -f "${dods_dir}/lib/libnc-dods.a" ; then
      	echo "$as_me:11882: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 	 ga_check_dods="yes"
@@ -11900,9 +11903,9 @@
 fi
 
   else
-     echo "$as_me:11903: 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:11903: checking for libcurl.a in supplibs" >&5
+echo $ECHO_N "checking for libcurl.a in supplibs... $ECHO_C" >&6
+     if test -f "${dods_dir}/lib/libcurl.a" ; then
      	echo "$as_me:11906: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 
@@ -12002,7 +12005,7 @@
   else
      echo "$as_me:12003: 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
+     if test -f "${dods_dir}/lib/libnc-dods.a" ; then
      	echo "$as_me:12006: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 	 ga_check_dods="yes"
@@ -12019,7 +12022,7 @@
   else
      echo "$as_me:12020: 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
+     if test -f "${dods_dir}/lib/libdap++.a" ; then
      	echo "$as_me:12023: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 
@@ -12074,7 +12077,7 @@
   else
      echo "$as_me:12075: 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
+     if test -f "${dods_dir}/lib/libnc-dods.a" ; then
      	echo "$as_me:12078: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 	 ga_check_dods="yes"
@@ -12162,13 +12165,13 @@
 if test $ac_cv_lib_rx_main = yes; then
 
   if test "${ga_dyn_supplibs}" = "yes" ; then
-     echo "$as_me:12165: checking for main in -lwww" >&5
-echo $ECHO_N "checking for main in -lwww... $ECHO_C" >&6
+     echo "$as_me:12165: checking for main in -lcurl" >&5
+echo $ECHO_N "checking for main in -lcurl... $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="-lcurl  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
 #line 12173 "configure"
 #include "confdefs.h"
@@ -12302,7 +12305,7 @@
   else
      echo "$as_me:12303: 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
+     if test -f "${dods_dir}/lib/libnc-dods.a" ; then
      	echo "$as_me:12306: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 	 ga_check_dods="yes"
@@ -12319,7 +12322,7 @@
   else
      echo "$as_me:12320: 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
+     if test -f "${dods_dir}/lib/libdap++.a" ; then
      	echo "$as_me:12323: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 
@@ -12374,7 +12377,7 @@
   else
      echo "$as_me:12375: 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
+     if test -f "${dods_dir}/lib/libnc-dods.a" ; then
      	echo "$as_me:12378: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 	 ga_check_dods="yes"
@@ -12396,9 +12399,9 @@
 fi
 
   else
-     echo "$as_me:12399: 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:12399: checking for libcurl.a in supplibs" >&5
+echo $ECHO_N "checking for libcurl.a in supplibs... $ECHO_C" >&6
+     if test -f "${dods_dir}/lib/libcurl.a" ; then
      	echo "$as_me:12402: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 
@@ -12498,7 +12501,7 @@
   else
      echo "$as_me:12499: 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
+     if test -f "${dods_dir}/lib/libnc-dods.a" ; then
      	echo "$as_me:12502: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 	 ga_check_dods="yes"
@@ -12515,7 +12518,7 @@
   else
      echo "$as_me:12516: 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
+     if test -f "${dods_dir}/lib/libdap++.a" ; then
      	echo "$as_me:12519: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 
@@ -12570,7 +12573,7 @@
   else
      echo "$as_me:12571: 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
+     if test -f "${dods_dir}/lib/libnc-dods.a" ; then
      	echo "$as_me:12574: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 	 ga_check_dods="yes"
@@ -12601,18 +12604,18 @@
   else
      echo "$as_me:12602: checking for librx.a in supplibs" >&5
 echo $ECHO_N "checking for librx.a in supplibs... $ECHO_C" >&6
-     if test -f "${ga_supplib_dir}/lib/librx.a" ; then
+     if test -f "${dods_dir}/lib/librx.a" ; then
      	echo "$as_me:12605: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 
   if test "${ga_dyn_supplibs}" = "yes" ; then
-     echo "$as_me:12609: checking for main in -lwww" >&5
-echo $ECHO_N "checking for main in -lwww... $ECHO_C" >&6
+     echo "$as_me:12609: checking for main in -lcurl" >&5
+echo $ECHO_N "checking for main in -lcurl... $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="-lcurl  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
 #line 12617 "configure"
 #include "confdefs.h"
@@ -12746,7 +12749,7 @@
   else
      echo "$as_me:12747: 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
+     if test -f "${dods_dir}/lib/libnc-dods.a" ; then
      	echo "$as_me:12750: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 	 ga_check_dods="yes"
@@ -12763,7 +12766,7 @@
   else
      echo "$as_me:12764: 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
+     if test -f "${dods_dir}/lib/libdap++.a" ; then
      	echo "$as_me:12767: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 
@@ -12818,7 +12821,7 @@
   else
      echo "$as_me:12819: 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
+     if test -f "${dods_dir}/lib/libnc-dods.a" ; then
      	echo "$as_me:12822: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 	 ga_check_dods="yes"
@@ -12840,9 +12843,9 @@
 fi
 
   else
-     echo "$as_me:12843: 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:12843: checking for libcurl.a in supplibs" >&5
+echo $ECHO_N "checking for libcurl.a in supplibs... $ECHO_C" >&6
+     if test -f "${dods_dir}/lib/libcurl.a" ; then
      	echo "$as_me:12846: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 
@@ -12942,7 +12945,7 @@
   else
      echo "$as_me:12943: 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
+     if test -f "${dods_dir}/lib/libnc-dods.a" ; then
      	echo "$as_me:12946: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 	 ga_check_dods="yes"
@@ -12959,7 +12962,7 @@
   else
      echo "$as_me:12960: 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
+     if test -f "${dods_dir}/lib/libdap++.a" ; then
      	echo "$as_me:12963: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 
@@ -13014,7 +13017,7 @@
   else
      echo "$as_me:13015: 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
+     if test -f "${dods_dir}/lib/libnc-dods.a" ; then
      	echo "$as_me:13018: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 	 ga_check_dods="yes"
@@ -13091,9 +13094,10 @@
      ga_lib_suffix='.a'
   fi
 
-  for ga_lib_name in udunits www rx z ; do
-      dods_libs="$dods_libs ${ga_lib_prefix}${ga_lib_name}${ga_lib_suffix}"
+  for ga_lib_name in curl rx ; do
+     dods_libs="$dods_libs ${dods_dir}/lib/lib${ga_lib_name}${ga_lib_suffix}"
   done
+  dods_libs="$dods_libs  -ludunits -lz -lxml2 -L@PREFIX@/lib -lssl -lcrypto"
 
   if test "${ga_dyn_supplibs}" = "yes" ; then
      echo "$as_me:13099: checking for main in -lgadods" >&5
@@ -13163,7 +13167,7 @@
        gadods_def="-DUSEGADODS=1"
        echo "+ gradsdods (OPeNDAP/netCDF) build enabled - gridded and station interfaces"
     else
-       dods_rep_libs="-lnc-dods -ldap++"
+	    dods_rep_libs="-L${dods_dir}/lib -lnc-dods -ldap++"
        gadods_def="-DUSEGADODS=0"
        echo "+ gradsdods (OPeNDAP/netCDF) build enabled - gridded interface only"
     fi
--- grads-1.9/src/Makefile.in.orig	Sun Feb 22 06:26:58 2004
+++ grads-1.9/src/Makefile.in	Sun Feb 22 06:27:20 2004
@@ -132,7 +132,7 @@
 			-lX11 $(wi_libadd) $(xlibemu_libs) $(host_ldadd)
 
 # Hack for DODS 3.2 on Mac OS X
-@DODS_DARWIN_TRUE@dods_darwin_libs = $(supp_lib_dir)/inst.o
+#@DODS_DARWIN_TRUE@dods_darwin_libs = $(supp_lib_dir)/inst.o
 
 ######################################################################
 #
@@ -463,7 +463,7 @@
 @DODS_DARWIN_TRUE@@USEDODS_TRUE@gradsdods_DEPENDENCIES = gaddes-dods.o \
 @DODS_DARWIN_TRUE@@USEDODS_TRUE@	gacfg-dods.o gaio-dods.o \
 @DODS_DARWIN_TRUE@@USEDODS_TRUE@	gauser-dods.o gasdf-dods.o \
-@DODS_DARWIN_TRUE@@USEDODS_TRUE@	$(supp_lib_dir)/inst.o
+#@DODS_DARWIN_TRUE@@USEDODS_TRUE@	$(supp_lib_dir)/inst.o
 @DODS_DARWIN_TRUE@@USEDODS_FALSE@gradsdods_DEPENDENCIES =
 gradsdods_LDFLAGS =
 @USEHDF_TRUE@am_gradshdf_OBJECTS = grads.$(OBJEXT) gxsubs.$(OBJEXT) \
--- grads-1.9/src/gx.h.orig	Sun Feb 22 16:53:04 2004
+++ grads-1.9/src/gx.h	Sun Feb 22 16:53:30 2004
@@ -45,7 +45,7 @@
 /* Default directory containing the stroke and map data sets.
    User can override this default via setenv GADDIR */
 
-static char *datad = "/usr/local/lib/grads";
+static char *datad = "@PREFIX@/lib/grads";
 
 /* Option flag.  If 0, map data set is only read once into a
    dynamically allocated memory area.  The memory is held onto