[GRASS-SVN] r32551 - in grass/trunk: . db/db.login general general/g.ask general/g.proj general/manage/lib imagery/i.class include include/Make lib lib/edit lib/gis lib/imagery lib/init lib/proj lib/sites lib/vask raster/r.coin raster/r.le/r.le.setup raster3d/r3.mkdspf vector/v.transform

svn_grass at osgeo.org svn_grass at osgeo.org
Tue Aug 5 23:28:23 EDT 2008


Author: glynn
Date: 2008-08-05 23:28:21 -0400 (Tue, 05 Aug 2008)
New Revision: 32551

Removed:
   grass/trunk/general/g.ask/Makefile
   grass/trunk/general/g.ask/description.html
   grass/trunk/general/g.ask/main.c
   grass/trunk/general/manage/lib/menu.c
   grass/trunk/include/edit.h
   grass/trunk/include/vask.h
   grass/trunk/lib/edit/Makefile
   grass/trunk/lib/edit/edit_cats.c
   grass/trunk/lib/edit/edit_cellhd.c
   grass/trunk/lib/edit/edit_hist.c
   grass/trunk/lib/gis/ask.c
   grass/trunk/lib/gis/ask_cell.c
   grass/trunk/lib/gis/ask_vctrs.c
   grass/trunk/lib/gis/get_datum_name.c
   grass/trunk/lib/gis/get_ell_name.c
   grass/trunk/lib/gis/get_projname.c
   grass/trunk/lib/gis/gets.c
   grass/trunk/lib/gis/intr_char.c
   grass/trunk/lib/gis/make_colr.c
   grass/trunk/lib/gis/yes.c
   grass/trunk/lib/imagery/ask_group.c
   grass/trunk/lib/init/chk_dbase.c
   grass/trunk/lib/init/mke_loc.c
   grass/trunk/lib/init/mke_mapset.c
   grass/trunk/lib/init/other.c
   grass/trunk/lib/init/set_data.c
   grass/trunk/lib/vask/Makefile
   grass/trunk/lib/vask/README
   grass/trunk/lib/vask/V_acc.c
   grass/trunk/lib/vask/V_call.c
   grass/trunk/lib/vask/V_clear.c
   grass/trunk/lib/vask/V_const.c
   grass/trunk/lib/vask/V_error.c
   grass/trunk/lib/vask/V_exit.c
   grass/trunk/lib/vask/V_init.c
   grass/trunk/lib/vask/V_line.c
   grass/trunk/lib/vask/V_ques.c
   grass/trunk/lib/vask/V_support.c
   grass/trunk/lib/vask/V_trim_dec.c
   grass/trunk/raster/r.coin/check.c
   grass/trunk/raster/r.coin/inter.c
   grass/trunk/vector/v.transform/ask_trans.c
Modified:
   grass/trunk/configure
   grass/trunk/configure.in
   grass/trunk/db/db.login/main.c
   grass/trunk/general/Makefile
   grass/trunk/general/g.proj/datumtrans.c
   grass/trunk/general/g.proj/local_proto.h
   grass/trunk/general/g.proj/main.c
   grass/trunk/general/g.proj/output.c
   grass/trunk/imagery/i.class/Makefile
   grass/trunk/include/Make/Platform.make.in
   grass/trunk/include/P_site.h
   grass/trunk/include/config.h.in
   grass/trunk/include/gisdefs.h
   grass/trunk/include/gprojects.h
   grass/trunk/include/imagedefs.h
   grass/trunk/lib/Makefile
   grass/trunk/lib/gis/parser.c
   grass/trunk/lib/imagery/ls_groups.c
   grass/trunk/lib/init/Makefile
   grass/trunk/lib/proj/datum.c
   grass/trunk/lib/sites/sites.c
   grass/trunk/raster/r.coin/main.c
   grass/trunk/raster/r.le/r.le.setup/Makefile
   grass/trunk/raster3d/r3.mkdspf/main.c
   grass/trunk/raster3d/r3.mkdspf/r3_find.c
   grass/trunk/vector/v.transform/Makefile
Log:
Breaking stuff part 1: the 1970s called; they want their TTYs back
 Remove vask, edit, curses, G_ask_*, G_yes, G_gets, I_ask_*, GPJ_ask_*
 Remove g.ask, etc/set_data
 Remove various terminal-interactive features
 Break d.colors, g.setproj, i.class, i.ortho.photo, i.points, i.vpoints,
  r.le, r.quant, r.support, r.digit, v.transform



Modified: grass/trunk/configure
===================================================================
--- grass/trunk/configure	2008-08-06 00:57:07 UTC (rev 32550)
+++ grass/trunk/configure	2008-08-06 03:28:21 UTC (rev 32551)
@@ -65,8 +65,6 @@
 ac_help="$ac_help
   --with-opendwg          support openDWG functionality (default: no)"
 ac_help="$ac_help
-  --with-curses           support Curses functionality (default: yes)"
-ac_help="$ac_help
   --with-python[=path/python-config] enable support for Python SWIG bindings (python-config with path, \
 e.g. '--with-python=/usr/bin/python2.5-config', default: no)"
 ac_help="$ac_help
@@ -724,7 +722,7 @@
 fi
 
 echo $ac_n "checking host system type""... $ac_c" 1>&6
-echo "configure:728: checking host system type" >&5
+echo "configure:726: checking host system type" >&5
 
 host_alias=$host
 case "$host_alias" in
@@ -747,7 +745,7 @@
 # Extract the first word of "gcc", so it can be a program name with args.
 set dummy gcc; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:751: checking for $ac_word" >&5
+echo "configure:749: checking for $ac_word" >&5
 
 if test -n "$CC"; then
   ac_cv_prog_CC="$CC" # Let the user override the test.
@@ -774,7 +772,7 @@
   # Extract the first word of "cc", so it can be a program name with args.
 set dummy cc; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:778: checking for $ac_word" >&5
+echo "configure:776: checking for $ac_word" >&5
 
 if test -n "$CC"; then
   ac_cv_prog_CC="$CC" # Let the user override the test.
@@ -822,7 +820,7 @@
       # Extract the first word of "cl", so it can be a program name with args.
 set dummy cl; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:826: checking for $ac_word" >&5
+echo "configure:824: checking for $ac_word" >&5
 
 if test -n "$CC"; then
   ac_cv_prog_CC="$CC" # Let the user override the test.
@@ -851,7 +849,7 @@
 fi
 
 echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6
-echo "configure:855: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
+echo "configure:853: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
 
 ac_ext=c
 # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
@@ -862,12 +860,12 @@
 
 cat > conftest.$ac_ext << EOF
 
-#line 866 "configure"
+#line 864 "configure"
 #include "confdefs.h"
 
 main(){return(0);}
 EOF
-if { (eval echo configure:871: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:869: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   ac_cv_prog_cc_works=yes
   # If we can't run a trivial program, we are probably using a cross compiler.
   if (./conftest; exit) 2>/dev/null; then
@@ -893,19 +891,19 @@
   { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; }
 fi
 echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
-echo "configure:897: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
+echo "configure:895: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
 echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6
 cross_compiling=$ac_cv_prog_cc_cross
 
 echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6
-echo "configure:902: checking whether we are using GNU C" >&5
+echo "configure:900: checking whether we are using GNU C" >&5
 
 cat > conftest.c <<EOF
 #ifdef __GNUC__
   yes;
 #endif
 EOF
-if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:909: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
+if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:907: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
   ac_cv_prog_gcc=yes
 else
   ac_cv_prog_gcc=no
@@ -923,7 +921,7 @@
 ac_save_CFLAGS="$CFLAGS"
 CFLAGS=
 echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
-echo "configure:927: checking whether ${CC-cc} accepts -g" >&5
+echo "configure:925: checking whether ${CC-cc} accepts -g" >&5
 
 echo 'void f(){}' > conftest.c
 if test -z "`${CC-cc} -g -c conftest.c 2>&1`"; then
@@ -952,10 +950,10 @@
 fi
 
 echo $ac_n "checking for Cygwin environment""... $ac_c" 1>&6
-echo "configure:956: checking for Cygwin environment" >&5
+echo "configure:954: checking for Cygwin environment" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 959 "configure"
+#line 957 "configure"
 #include "confdefs.h"
 
 int main() {
@@ -966,7 +964,7 @@
 return __CYGWIN__;
 ; return 0; }
 EOF
-if { (eval echo configure:970: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:968: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_cygwin=yes
 else
@@ -982,17 +980,17 @@
 CYGWIN=
 test "$ac_cv_cygwin" = yes && CYGWIN=yes
 echo $ac_n "checking for mingw32 environment""... $ac_c" 1>&6
-echo "configure:986: checking for mingw32 environment" >&5
+echo "configure:984: checking for mingw32 environment" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 989 "configure"
+#line 987 "configure"
 #include "confdefs.h"
 
 int main() {
 return __MINGW32__;
 ; return 0; }
 EOF
-if { (eval echo configure:996: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:994: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_mingw32=yes
 else
@@ -1010,7 +1008,7 @@
 
 
 echo $ac_n "checking for executable suffix""... $ac_c" 1>&6
-echo "configure:1014: checking for executable suffix" >&5
+echo "configure:1012: checking for executable suffix" >&5
 
 if test "$CYGWIN" = yes || test "$MINGW32" = yes; then
   ac_cv_exeext=.exe
@@ -1029,23 +1027,23 @@
 IEEEFLAG=
 
 echo $ac_n "checking for full floating-point support""... $ac_c" 1>&6
-echo "configure:1033: checking for full floating-point support" >&5
+echo "configure:1031: checking for full floating-point support" >&5
 if test "$cross_compiling" = yes; then
      echo "$ac_t""unknown (cross-compiling)" 1>&6
      
 echo $ac_n "checking whether "cc -mieee" works""... $ac_c" 1>&6
-echo "configure:1038: checking whether "cc -mieee" works" >&5
+echo "configure:1036: checking whether "cc -mieee" works" >&5
 ac_save_cflags=${CFLAGS}
 CFLAGS="$CFLAGS -mieee"
 cat > conftest.$ac_ext <<EOF
-#line 1042 "configure"
+#line 1040 "configure"
 #include "confdefs.h"
 
 int main() {
 
 ; return 0; }
 EOF
-if { (eval echo configure:1049: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:1047: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
      echo "$ac_t""yes" 1>&6
         IEEEFLAG="-mieee"
@@ -1061,7 +1059,7 @@
 
 else
   cat > conftest.$ac_ext <<EOF
-#line 1065 "configure"
+#line 1063 "configure"
 #include "confdefs.h"
 
 #include <float.h>
@@ -1075,7 +1073,7 @@
 }
 
 EOF
-if { (eval echo configure:1079: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:1077: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
      echo "$ac_t""yes" 1>&6
     
@@ -1088,14 +1086,14 @@
   CFLAGS=-mieee
   
 echo $ac_n "checking for full floating-point support with -mieee""... $ac_c" 1>&6
-echo "configure:1092: checking for full floating-point support with -mieee" >&5
+echo "configure:1090: checking for full floating-point support with -mieee" >&5
 if test "$cross_compiling" = yes; then
      echo "$ac_t""unknown (cross-compiling)" 1>&6
     { echo "configure: error: *** INTERNAL CONFIGURE ERROR" 1>&2; exit 1; }
 
 else
   cat > conftest.$ac_ext <<EOF
-#line 1099 "configure"
+#line 1097 "configure"
 #include "confdefs.h"
 
 #include <float.h>
@@ -1109,7 +1107,7 @@
 }
 
 EOF
-if { (eval echo configure:1113: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:1111: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
      echo "$ac_t""yes" 1>&6
     IEEEFLAG="-mieee"
@@ -1146,7 +1144,7 @@
 # Extract the first word of "pwd", so it can be a program name with args.
 set dummy pwd; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1150: checking for $ac_word" >&5
+echo "configure:1148: checking for $ac_word" >&5
 
 case "$pwd" in
   /*)
@@ -1184,7 +1182,7 @@
 fi
 
 echo $ac_n "checking for source directory""... $ac_c" 1>&6
-echo "configure:1188: checking for source directory" >&5
+echo "configure:1186: checking for source directory" >&5
 
 if test -z "$srcdir" ; then
   SRCDIR=`$pwd`
@@ -1195,7 +1193,7 @@
 echo "$ac_t"""$SRCDIR"" 1>&6
 
 echo $ac_n "checking for build directory""... $ac_c" 1>&6
-echo "configure:1199: checking for build directory" >&5
+echo "configure:1197: checking for build directory" >&5
 
 DSTDIR=`$pwd`
 WINDSTDIR=`$winpwd`
@@ -1280,7 +1278,7 @@
 
 
 echo $ac_n "checking for MacOSX App""... $ac_c" 1>&6
-echo "configure:1284: checking for MacOSX App" >&5
+echo "configure:1282: checking for MacOSX App" >&5
 case "$enable_macosx_app" in
 	yes)	MACOSX_APP=1	;;
 	no)	MACOSX_APP=	;;
@@ -1303,7 +1301,7 @@
 
 
     echo $ac_n "checking how to build libraries""... $ac_c" 1>&6
-echo "configure:1307: checking how to build libraries" >&5
+echo "configure:1305: checking how to build libraries" >&5
     # Check whether --enable-shared or --disable-shared was given.
 if test "${enable_shared+set}" = set; then
   enableval="$enable_shared"
@@ -1346,7 +1344,7 @@
 # Extract the first word of "ranlib", so it can be a program name with args.
 set dummy ranlib; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1350: checking for $ac_word" >&5
+echo "configure:1348: checking for $ac_word" >&5
 
 if test -n "$RANLIB"; then
   ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
@@ -1371,7 +1369,7 @@
 fi
 
 echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6
-echo "configure:1375: checking how to run the C preprocessor" >&5
+echo "configure:1373: checking how to run the C preprocessor" >&5
 # On Suns, sometimes $CPP names a directory.
 if test -n "$CPP" && test -d "$CPP"; then
   CPP=
@@ -1384,13 +1382,13 @@
   # On the NeXT, cc -E runs the code through the compiler's parser,
   # not just through cpp.
   cat > conftest.$ac_ext <<EOF
-#line 1388 "configure"
+#line 1386 "configure"
 #include "confdefs.h"
 #include <assert.h>
 Syntax Error
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1394: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1392: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   :
@@ -1401,13 +1399,13 @@
   rm -rf conftest*
   CPP="${CC-cc} -E -traditional-cpp"
   cat > conftest.$ac_ext <<EOF
-#line 1405 "configure"
+#line 1403 "configure"
 #include "confdefs.h"
 #include <assert.h>
 Syntax Error
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1411: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1409: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   :
@@ -1418,13 +1416,13 @@
   rm -rf conftest*
   CPP="${CC-cc} -nologo -E"
   cat > conftest.$ac_ext <<EOF
-#line 1422 "configure"
+#line 1420 "configure"
 #include "confdefs.h"
 #include <assert.h>
 Syntax Error
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1428: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1426: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   :
@@ -1452,7 +1450,7 @@
     # Step 0.a: Enable 64 bit support?
 
     echo $ac_n "checking if 64bit support is requested""... $ac_c" 1>&6
-echo "configure:1456: checking if 64bit support is requested" >&5
+echo "configure:1454: checking if 64bit support is requested" >&5
     # Check whether --enable-64bit or --disable-64bit was given.
 if test "${enable_64bit+set}" = set; then
   enableval="$enable_64bit"
@@ -1472,7 +1470,7 @@
     # Step 0.b: Enable Solaris 64 bit VIS support?
 
     echo $ac_n "checking if 64bit Sparc VIS support is requested""... $ac_c" 1>&6
-echo "configure:1476: checking if 64bit Sparc VIS support is requested" >&5
+echo "configure:1474: checking if 64bit Sparc VIS support is requested" >&5
     # Check whether --enable-64bit-vis or --disable-64bit-vis was given.
 if test "${enable_64bit_vis+set}" = set; then
   enableval="$enable_64bit_vis"
@@ -1496,7 +1494,7 @@
     # there are a few systems, like Next, where this doesn't work.
 
     echo $ac_n "checking system version (for dynamic loading)""... $ac_c" 1>&6
-echo "configure:1500: checking system version (for dynamic loading)" >&5
+echo "configure:1498: checking system version (for dynamic loading)" >&5
     if test -f /usr/lib/NextStep/software_version; then
 	system=NEXTSTEP-`awk '/3/,/3/' /usr/lib/NextStep/software_version`
     else
@@ -1522,13 +1520,13 @@
     # Linux can use either -ldl or -ldld for dynamic loading.
 
     echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6
-echo "configure:1526: checking for dlopen in -ldl" >&5
+echo "configure:1524: checking for dlopen in -ldl" >&5
 ac_lib_var=`echo dl'_'dlopen | sed 'y%./+-%__p_%'`
 
 ac_save_LIBS="$LIBS"
 LIBS="-ldl  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 1532 "configure"
+#line 1530 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -1539,7 +1537,7 @@
 dlopen()
 ; return 0; }
 EOF
-if { (eval echo configure:1543: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1541: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -1586,7 +1584,7 @@
     # Extract the first word of "ar", so it can be a program name with args.
 set dummy ar; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1590: checking for $ac_word" >&5
+echo "configure:1588: checking for $ac_word" >&5
 
 if test -n "$AR"; then
   ac_cv_prog_AR="$AR" # Let the user override the test.
@@ -1715,13 +1713,13 @@
 	    # known GMT value.
 
 	    echo $ac_n "checking for gettimeofday in -lbsd""... $ac_c" 1>&6
-echo "configure:1719: checking for gettimeofday in -lbsd" >&5
+echo "configure:1717: checking for gettimeofday in -lbsd" >&5
 ac_lib_var=`echo bsd'_'gettimeofday | sed 'y%./+-%__p_%'`
 
 ac_save_LIBS="$LIBS"
 LIBS="-lbsd  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 1725 "configure"
+#line 1723 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -1732,7 +1730,7 @@
 gettimeofday()
 ; return 0; }
 EOF
-if { (eval echo configure:1736: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1734: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -1773,13 +1771,13 @@
 	    # is always linked to, for compatibility.
 	    #-----------------------------------------------------------
 	    echo $ac_n "checking for inet_ntoa in -lbind""... $ac_c" 1>&6
-echo "configure:1777: checking for inet_ntoa in -lbind" >&5
+echo "configure:1775: checking for inet_ntoa in -lbind" >&5
 ac_lib_var=`echo bind'_'inet_ntoa | sed 'y%./+-%__p_%'`
 
 ac_save_LIBS="$LIBS"
 LIBS="-lbind  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 1783 "configure"
+#line 1781 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -1790,7 +1788,7 @@
 inet_ntoa()
 ; return 0; }
 EOF
-if { (eval echo configure:1794: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1792: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -1851,13 +1849,13 @@
 
 	    SHLIB_SUFFIX=".sl"
 	    echo $ac_n "checking for shl_load in -ldld""... $ac_c" 1>&6
-echo "configure:1855: checking for shl_load in -ldld" >&5
+echo "configure:1853: checking for shl_load in -ldld" >&5
 ac_lib_var=`echo dld'_'shl_load | sed 'y%./+-%__p_%'`
 
 ac_save_LIBS="$LIBS"
 LIBS="-ldld  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 1861 "configure"
+#line 1859 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -1868,7 +1866,7 @@
 shl_load()
 ; return 0; }
 EOF
-if { (eval echo configure:1872: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1870: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -1933,13 +1931,13 @@
 	HP-UX-*.08.*|HP-UX-*.09.*|HP-UX-*.10.*)
 	    SHLIB_SUFFIX=".sl"
 	    echo $ac_n "checking for shl_load in -ldld""... $ac_c" 1>&6
-echo "configure:1937: checking for shl_load in -ldld" >&5
+echo "configure:1935: checking for shl_load in -ldld" >&5
 ac_lib_var=`echo dld'_'shl_load | sed 'y%./+-%__p_%'`
 
 ac_save_LIBS="$LIBS"
 LIBS="-ldld  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 1943 "configure"
+#line 1941 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -1950,7 +1948,7 @@
 shl_load()
 ; return 0; }
 EOF
-if { (eval echo configure:1954: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1952: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -2072,15 +2070,15 @@
 	    else
 		ac_safe=`echo "dld.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for dld.h""... $ac_c" 1>&6
-echo "configure:2076: checking for dld.h" >&5
+echo "configure:2074: checking for dld.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 2079 "configure"
+#line 2077 "configure"
 #include "confdefs.h"
 #include <dld.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2084: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:2082: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -2140,15 +2138,15 @@
 	    else
 		ac_safe=`echo "dld.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for dld.h""... $ac_c" 1>&6
-echo "configure:2144: checking for dld.h" >&5
+echo "configure:2142: checking for dld.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 2147 "configure"
+#line 2145 "configure"
 #include "confdefs.h"
 #include <dld.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2152: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:2150: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -2245,9 +2243,9 @@
 	    CC_SEARCH_FLAGS=""
 	    LD_SEARCH_FLAGS=""
 	    echo $ac_n "checking for ELF""... $ac_c" 1>&6
-echo "configure:2249: checking for ELF" >&5
+echo "configure:2247: checking for ELF" >&5
 	    cat > conftest.$ac_ext <<EOF
-#line 2251 "configure"
+#line 2249 "configure"
 #include "confdefs.h"
 
 #ifdef __ELF__
@@ -2277,15 +2275,15 @@
 	    # Not available on all versions:  check for include file.
 	    ac_safe=`echo "dlfcn.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for dlfcn.h""... $ac_c" 1>&6
-echo "configure:2281: checking for dlfcn.h" >&5
+echo "configure:2279: checking for dlfcn.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 2284 "configure"
+#line 2282 "configure"
 #include "confdefs.h"
 #include <dlfcn.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2289: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:2287: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -2309,9 +2307,9 @@
 		CC_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}'
 		LD_SEARCH_FLAGS='-rpath ${LIB_RUNTIME_DIR}'
 		echo $ac_n "checking for ELF""... $ac_c" 1>&6
-echo "configure:2313: checking for ELF" >&5
+echo "configure:2311: checking for ELF" >&5
 		cat > conftest.$ac_ext <<EOF
-#line 2315 "configure"
+#line 2313 "configure"
 #include "confdefs.h"
 
 #ifdef __ELF__
@@ -2635,17 +2633,17 @@
 	    # that don't grok the -Bexport option.  Test that it does.
 	    hold_ldflags=$LDFLAGS
 	    echo $ac_n "checking for ld accepts -Bexport flag""... $ac_c" 1>&6
-echo "configure:2639: checking for ld accepts -Bexport flag" >&5
+echo "configure:2637: checking for ld accepts -Bexport flag" >&5
 	    LDFLAGS="${LDFLAGS} -Wl,-Bexport"
 	    cat > conftest.$ac_ext <<EOF
-#line 2642 "configure"
+#line 2640 "configure"
 #include "confdefs.h"
 
 int main() {
 int i;
 ; return 0; }
 EOF
-if { (eval echo configure:2649: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2647: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   found=yes
 else
@@ -2983,16 +2981,6 @@
 fi
 
 
-
-# Check whether --with-curses or --without-curses was given.
-if test "${with_curses+set}" = set; then
-  withval="$with_curses"
-  :
-else
-  with_curses=yes
-fi
-
-
 # Check whether --with-python or --without-python was given.
 if test "${with_python+set}" = set; then
   withval="$with_python"
@@ -3398,7 +3386,7 @@
 # Done checking fortran
 
 echo $ac_n "checking for additional include dirs""... $ac_c" 1>&6
-echo "configure:3402: checking for additional include dirs" >&5
+echo "configure:3390: checking for additional include dirs" >&5
 case "$with_includes" in
 y | ye | yes | n | no)
 	{ echo "configure: error: *** You must supply a directory to list --with-includes." 1>&2; exit 1; }
@@ -3421,7 +3409,7 @@
 # With libs option
 
 echo $ac_n "checking for additional library dirs""... $ac_c" 1>&6
-echo "configure:3425: checking for additional library dirs" >&5
+echo "configure:3413: checking for additional library dirs" >&5
 case "$with_libs" in
 y | ye | yes | n | no)
 	{ echo "configure: error: *** You must supply a directory list to --with-libs." 1>&2; exit 1; }
@@ -3455,7 +3443,7 @@
 # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
 # ./install, which can be erroneously created by make from ./install.sh.
 echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
-echo "configure:3459: checking for a BSD compatible install" >&5
+echo "configure:3447: checking for a BSD compatible install" >&5
 if test -z "$INSTALL"; then
 
   IFS="${IFS= 	}"; ac_save_IFS="$IFS"; IFS=":"
@@ -3508,7 +3496,7 @@
 # Extract the first word of "flex", so it can be a program name with args.
 set dummy flex; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:3512: checking for $ac_word" >&5
+echo "configure:3500: checking for $ac_word" >&5
 
 if test -n "$LEX"; then
   ac_cv_prog_LEX="$LEX" # Let the user override the test.
@@ -3539,13 +3527,13 @@
   *) ac_lib=l ;;
   esac
   echo $ac_n "checking for yywrap in -l$ac_lib""... $ac_c" 1>&6
-echo "configure:3543: checking for yywrap in -l$ac_lib" >&5
+echo "configure:3531: checking for yywrap in -l$ac_lib" >&5
 ac_lib_var=`echo $ac_lib'_'yywrap | sed 'y%./+-%__p_%'`
 
 ac_save_LIBS="$LIBS"
 LIBS="-l$ac_lib  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 3549 "configure"
+#line 3537 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -3556,7 +3544,7 @@
 yywrap()
 ; return 0; }
 EOF
-if { (eval echo configure:3560: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3548: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -3581,7 +3569,7 @@
     # Extract the first word of "lex", so it can be a program name with args.
 set dummy lex; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:3585: checking for $ac_word" >&5
+echo "configure:3573: checking for $ac_word" >&5
 
 case "$LEXPATH" in
   /*)
@@ -3621,7 +3609,7 @@
 # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:3625: checking for $ac_word" >&5
+echo "configure:3613: checking for $ac_word" >&5
 
 if test -n "$YACC"; then
   ac_cv_prog_YACC="$YACC" # Let the user override the test.
@@ -3652,7 +3640,7 @@
     # Extract the first word of "yacc", so it can be a program name with args.
 set dummy yacc; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:3656: checking for $ac_word" >&5
+echo "configure:3644: checking for $ac_word" >&5
 
 case "$YACCPATH" in
   /*)
@@ -3690,7 +3678,7 @@
 # Extract the first word of "ranlib", so it can be a program name with args.
 set dummy ranlib; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:3694: checking for $ac_word" >&5
+echo "configure:3682: checking for $ac_word" >&5
 
 if test -n "$RANLIB"; then
   ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
@@ -3719,7 +3707,7 @@
 # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:3723: checking for $ac_word" >&5
+echo "configure:3711: checking for $ac_word" >&5
 
 if test -n "$AR"; then
   ac_cv_prog_AR="$AR" # Let the user override the test.
@@ -3750,7 +3738,7 @@
 # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:3754: checking for $ac_word" >&5
+echo "configure:3742: checking for $ac_word" >&5
 
 if test -n "$ENV"; then
   ac_cv_prog_ENV="$ENV" # Let the user override the test.
@@ -3779,7 +3767,7 @@
 # Extract the first word of "perl", so it can be a program name with args.
 set dummy perl; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:3783: checking for $ac_word" >&5
+echo "configure:3771: checking for $ac_word" >&5
 
 case "$PERL" in
   /*)
@@ -3810,10 +3798,10 @@
 fi
   
 echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6
-echo "configure:3814: checking for ANSI C header files" >&5
+echo "configure:3802: checking for ANSI C header files" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 3817 "configure"
+#line 3805 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 #include <stdarg.h>
@@ -3821,7 +3809,7 @@
 #include <float.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:3825: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:3813: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -3838,7 +3826,7 @@
 if test $ac_cv_header_stdc = yes; then
   # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
 cat > conftest.$ac_ext <<EOF
-#line 3842 "configure"
+#line 3830 "configure"
 #include "confdefs.h"
 #include <string.h>
 EOF
@@ -3856,7 +3844,7 @@
 if test $ac_cv_header_stdc = yes; then
   # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
 cat > conftest.$ac_ext <<EOF
-#line 3860 "configure"
+#line 3848 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 EOF
@@ -3877,7 +3865,7 @@
   :
 else
   cat > conftest.$ac_ext <<EOF
-#line 3881 "configure"
+#line 3869 "configure"
 #include "confdefs.h"
 #include <ctype.h>
 #define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
@@ -3888,7 +3876,7 @@
 exit (0); }
 
 EOF
-if { (eval echo configure:3892: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:3880: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   :
 else
@@ -3915,15 +3903,15 @@
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:3919: checking for $ac_hdr" >&5
+echo "configure:3907: checking for $ac_hdr" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 3922 "configure"
+#line 3910 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:3927: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:3915: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -3952,15 +3940,15 @@
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:3956: checking for $ac_hdr" >&5
+echo "configure:3944: checking for $ac_hdr" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 3959 "configure"
+#line 3947 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:3964: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:3952: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -3989,15 +3977,15 @@
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:3993: checking for $ac_hdr" >&5
+echo "configure:3981: checking for $ac_hdr" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 3996 "configure"
+#line 3984 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:4001: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:3989: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -4026,15 +4014,15 @@
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:4030: checking for $ac_hdr" >&5
+echo "configure:4018: checking for $ac_hdr" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 4033 "configure"
+#line 4021 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:4038: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:4026: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -4063,15 +4051,15 @@
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:4067: checking for $ac_hdr" >&5
+echo "configure:4055: checking for $ac_hdr" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 4070 "configure"
+#line 4058 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:4075: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:4063: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -4097,10 +4085,10 @@
 done
 
 echo $ac_n "checking whether time.h and sys/time.h may both be included""... $ac_c" 1>&6
-echo "configure:4101: checking whether time.h and sys/time.h may both be included" >&5
+echo "configure:4089: checking whether time.h and sys/time.h may both be included" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 4104 "configure"
+#line 4092 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <sys/time.h>
@@ -4109,7 +4097,7 @@
 struct tm *tp;
 ; return 0; }
 EOF
-if { (eval echo configure:4113: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:4101: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_header_time=yes
 else
@@ -4129,10 +4117,10 @@
 fi
 
 echo $ac_n "checking for off_t""... $ac_c" 1>&6
-echo "configure:4133: checking for off_t" >&5
+echo "configure:4121: checking for off_t" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 4136 "configure"
+#line 4124 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #if STDC_HEADERS
@@ -4159,10 +4147,10 @@
 fi
 
 echo $ac_n "checking for uid_t in sys/types.h""... $ac_c" 1>&6
-echo "configure:4163: checking for uid_t in sys/types.h" >&5
+echo "configure:4151: checking for uid_t in sys/types.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 4166 "configure"
+#line 4154 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 EOF
@@ -4190,10 +4178,10 @@
 fi
 
 echo $ac_n "checking return type of signal handlers""... $ac_c" 1>&6
-echo "configure:4194: checking return type of signal handlers" >&5
+echo "configure:4182: checking return type of signal handlers" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 4197 "configure"
+#line 4185 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <signal.h>
@@ -4210,7 +4198,7 @@
 int i;
 ; return 0; }
 EOF
-if { (eval echo configure:4214: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:4202: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_type_signal=void
 else
@@ -4228,10 +4216,10 @@
 
 
 echo $ac_n "checking for Cygwin environment""... $ac_c" 1>&6
-echo "configure:4232: checking for Cygwin environment" >&5
+echo "configure:4220: checking for Cygwin environment" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 4235 "configure"
+#line 4223 "configure"
 #include "confdefs.h"
 
 int main() {
@@ -4242,7 +4230,7 @@
 return __CYGWIN__;
 ; return 0; }
 EOF
-if { (eval echo configure:4246: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:4234: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_cygwin=yes
 else
@@ -4260,10 +4248,10 @@
 for ac_func in ftime gethostname gettimeofday lseek nice time uname
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:4264: checking for $ac_func" >&5
+echo "configure:4252: checking for $ac_func" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 4267 "configure"
+#line 4255 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -4286,7 +4274,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:4290: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4278: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -4312,10 +4300,10 @@
 for ac_func in seteuid setpriority setreuid setruid
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:4316: checking for $ac_func" >&5
+echo "configure:4304: checking for $ac_func" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 4319 "configure"
+#line 4307 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -4338,7 +4326,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:4342: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4330: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -4364,10 +4352,10 @@
 for ac_func in drand48
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:4368: checking for $ac_func" >&5
+echo "configure:4356: checking for $ac_func" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 4371 "configure"
+#line 4359 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -4390,7 +4378,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:4394: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4382: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -4416,10 +4404,10 @@
 for ac_func in putenv setenv
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:4420: checking for $ac_func" >&5
+echo "configure:4408: checking for $ac_func" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 4423 "configure"
+#line 4411 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -4442,7 +4430,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:4446: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4434: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -4468,10 +4456,10 @@
 for ac_func in nanosleep
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:4472: checking for $ac_func" >&5
+echo "configure:4460: checking for $ac_func" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 4475 "configure"
+#line 4463 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -4494,7 +4482,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:4498: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4486: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -4519,13 +4507,13 @@
 
 if test "$cross_compiling" != "yes" ; then
 echo $ac_n "checking whether setpgrp takes no argument""... $ac_c" 1>&6
-echo "configure:4523: checking whether setpgrp takes no argument" >&5
+echo "configure:4511: checking whether setpgrp takes no argument" >&5
 
 if test "$cross_compiling" = yes; then
   { echo "configure: error: cannot check setpgrp if cross compiling" 1>&2; exit 1; }
 else
   cat > conftest.$ac_ext <<EOF
-#line 4529 "configure"
+#line 4517 "configure"
 #include "confdefs.h"
 
 #ifdef HAVE_UNISTD_H
@@ -4545,7 +4533,7 @@
 }
 
 EOF
-if { (eval echo configure:4549: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:4537: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   ac_cv_func_setpgrp_void=no
 else
@@ -4573,16 +4561,16 @@
 fi
 
 echo $ac_n "checking for long long int""... $ac_c" 1>&6
-echo "configure:4577: checking for long long int" >&5
+echo "configure:4565: checking for long long int" >&5
 cat > conftest.$ac_ext <<EOF
-#line 4579 "configure"
+#line 4567 "configure"
 #include "confdefs.h"
 
 int main() {
 long long int x;
 ; return 0; }
 EOF
-if { (eval echo configure:4586: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:4574: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   
 echo "$ac_t""yes" 1>&6
@@ -4602,7 +4590,7 @@
 rm -f conftest*
 
 echo $ac_n "checking for W11""... $ac_c" 1>&6
-echo "configure:4606: checking for W11" >&5
+echo "configure:4594: checking for W11" >&5
 case "$enable_w11" in
 	yes|no)	echo "$ac_t"""$enable_w11"" 1>&6	;;
 	*)	{ echo "configure: error: *** You must answer yes or no." 1>&2; exit 1; }	;;
@@ -4630,7 +4618,7 @@
 # Uses ac_ vars as temps to allow command line to override cache and checks.
 # --without-x overrides everything else, but does not touch the cache.
 echo $ac_n "checking for X""... $ac_c" 1>&6
-echo "configure:4634: checking for X" >&5
+echo "configure:4622: checking for X" >&5
 
 # Check whether --with-x or --without-x was given.
 if test "${with_x+set}" = set; then
@@ -4690,12 +4678,12 @@
 
   # First, try using that file with no special directory specified.
 cat > conftest.$ac_ext <<EOF
-#line 4694 "configure"
+#line 4682 "configure"
 #include "confdefs.h"
 #include <$x_direct_test_include>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:4699: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:4687: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -4764,14 +4752,14 @@
   ac_save_LIBS="$LIBS"
   LIBS="-l$x_direct_test_library $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 4768 "configure"
+#line 4756 "configure"
 #include "confdefs.h"
 
 int main() {
 ${x_direct_test_function}()
 ; return 0; }
 EOF
-if { (eval echo configure:4775: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4763: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   LIBS="$ac_save_LIBS"
 # We can link X programs with no special library path.
@@ -4876,17 +4864,17 @@
     case "`(uname -sr) 2>/dev/null`" in
     "SunOS 5"*)
       echo $ac_n "checking whether -R must be followed by a space""... $ac_c" 1>&6
-echo "configure:4880: checking whether -R must be followed by a space" >&5
+echo "configure:4868: checking whether -R must be followed by a space" >&5
       ac_xsave_LIBS="$LIBS"; LIBS="$LIBS -R$x_libraries"
       cat > conftest.$ac_ext <<EOF
-#line 4883 "configure"
+#line 4871 "configure"
 #include "confdefs.h"
 
 int main() {
 
 ; return 0; }
 EOF
-if { (eval echo configure:4890: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4878: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   ac_R_nospace=yes
 else
@@ -4902,14 +4890,14 @@
       else
 	LIBS="$ac_xsave_LIBS -R $x_libraries"
 	cat > conftest.$ac_ext <<EOF
-#line 4906 "configure"
+#line 4894 "configure"
 #include "confdefs.h"
 
 int main() {
 
 ; return 0; }
 EOF
-if { (eval echo configure:4913: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4901: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   ac_R_space=yes
 else
@@ -4941,13 +4929,13 @@
     # libraries were built with DECnet support.  And karl at cs.umb.edu says
     # the Alpha needs dnet_stub (dnet does not exist).
     echo $ac_n "checking for dnet_ntoa in -ldnet""... $ac_c" 1>&6
-echo "configure:4945: checking for dnet_ntoa in -ldnet" >&5
+echo "configure:4933: checking for dnet_ntoa in -ldnet" >&5
 ac_lib_var=`echo dnet'_'dnet_ntoa | sed 'y%./+-%__p_%'`
 
 ac_save_LIBS="$LIBS"
 LIBS="-ldnet  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 4951 "configure"
+#line 4939 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -4958,7 +4946,7 @@
 dnet_ntoa()
 ; return 0; }
 EOF
-if { (eval echo configure:4962: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4950: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -4979,13 +4967,13 @@
 
     if test $ac_cv_lib_dnet_dnet_ntoa = no; then
       echo $ac_n "checking for dnet_ntoa in -ldnet_stub""... $ac_c" 1>&6
-echo "configure:4983: checking for dnet_ntoa in -ldnet_stub" >&5
+echo "configure:4971: checking for dnet_ntoa in -ldnet_stub" >&5
 ac_lib_var=`echo dnet_stub'_'dnet_ntoa | sed 'y%./+-%__p_%'`
 
 ac_save_LIBS="$LIBS"
 LIBS="-ldnet_stub  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 4989 "configure"
+#line 4977 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -4996,7 +4984,7 @@
 dnet_ntoa()
 ; return 0; }
 EOF
-if { (eval echo configure:5000: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4988: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -5024,10 +5012,10 @@
     # The nsl library prevents programs from opening the X display
     # on Irix 5.2, according to dickey at clark.net.
     echo $ac_n "checking for gethostbyname""... $ac_c" 1>&6
-echo "configure:5028: checking for gethostbyname" >&5
+echo "configure:5016: checking for gethostbyname" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 5031 "configure"
+#line 5019 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char gethostbyname(); below.  */
@@ -5050,7 +5038,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:5054: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5042: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_gethostbyname=yes"
 else
@@ -5070,13 +5058,13 @@
 
     if test $ac_cv_func_gethostbyname = no; then
       echo $ac_n "checking for gethostbyname in -lnsl""... $ac_c" 1>&6
-echo "configure:5074: checking for gethostbyname in -lnsl" >&5
+echo "configure:5062: checking for gethostbyname in -lnsl" >&5
 ac_lib_var=`echo nsl'_'gethostbyname | sed 'y%./+-%__p_%'`
 
 ac_save_LIBS="$LIBS"
 LIBS="-lnsl  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 5080 "configure"
+#line 5068 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -5087,7 +5075,7 @@
 gethostbyname()
 ; return 0; }
 EOF
-if { (eval echo configure:5091: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5079: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -5116,10 +5104,10 @@
     # -lsocket must be given before -lnsl if both are needed.
     # We assume that if connect needs -lnsl, so does gethostbyname.
     echo $ac_n "checking for connect""... $ac_c" 1>&6
-echo "configure:5120: checking for connect" >&5
+echo "configure:5108: checking for connect" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 5123 "configure"
+#line 5111 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char connect(); below.  */
@@ -5142,7 +5130,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:5146: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5134: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_connect=yes"
 else
@@ -5162,13 +5150,13 @@
 
     if test $ac_cv_func_connect = no; then
       echo $ac_n "checking for connect in -lsocket""... $ac_c" 1>&6
-echo "configure:5166: checking for connect in -lsocket" >&5
+echo "configure:5154: checking for connect in -lsocket" >&5
 ac_lib_var=`echo socket'_'connect | sed 'y%./+-%__p_%'`
 
 ac_save_LIBS="$LIBS"
 LIBS="-lsocket $X_EXTRA_LIBS $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 5172 "configure"
+#line 5160 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -5179,7 +5167,7 @@
 connect()
 ; return 0; }
 EOF
-if { (eval echo configure:5183: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5171: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -5202,10 +5190,10 @@
 
     # gomez at mi.uni-erlangen.de says -lposix is necessary on A/UX.
     echo $ac_n "checking for remove""... $ac_c" 1>&6
-echo "configure:5206: checking for remove" >&5
+echo "configure:5194: checking for remove" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 5209 "configure"
+#line 5197 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char remove(); below.  */
@@ -5228,7 +5216,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:5232: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5220: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_remove=yes"
 else
@@ -5248,13 +5236,13 @@
 
     if test $ac_cv_func_remove = no; then
       echo $ac_n "checking for remove in -lposix""... $ac_c" 1>&6
-echo "configure:5252: checking for remove in -lposix" >&5
+echo "configure:5240: checking for remove in -lposix" >&5
 ac_lib_var=`echo posix'_'remove | sed 'y%./+-%__p_%'`
 
 ac_save_LIBS="$LIBS"
 LIBS="-lposix  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 5258 "configure"
+#line 5246 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -5265,7 +5253,7 @@
 remove()
 ; return 0; }
 EOF
-if { (eval echo configure:5269: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5257: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -5288,10 +5276,10 @@
 
     # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay.
     echo $ac_n "checking for shmat""... $ac_c" 1>&6
-echo "configure:5292: checking for shmat" >&5
+echo "configure:5280: checking for shmat" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 5295 "configure"
+#line 5283 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char shmat(); below.  */
@@ -5314,7 +5302,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:5318: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5306: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_shmat=yes"
 else
@@ -5334,13 +5322,13 @@
 
     if test $ac_cv_func_shmat = no; then
       echo $ac_n "checking for shmat in -lipc""... $ac_c" 1>&6
-echo "configure:5338: checking for shmat in -lipc" >&5
+echo "configure:5326: checking for shmat in -lipc" >&5
 ac_lib_var=`echo ipc'_'shmat | sed 'y%./+-%__p_%'`
 
 ac_save_LIBS="$LIBS"
 LIBS="-lipc  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 5344 "configure"
+#line 5332 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -5351,7 +5339,7 @@
 shmat()
 ; return 0; }
 EOF
-if { (eval echo configure:5355: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5343: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -5383,13 +5371,13 @@
   # libraries we check for below, so use a different variable.
   #  --interran at uluru.Stanford.EDU, kb at cs.umb.edu.
   echo $ac_n "checking for IceConnectionNumber in -lICE""... $ac_c" 1>&6
-echo "configure:5387: checking for IceConnectionNumber in -lICE" >&5
+echo "configure:5375: checking for IceConnectionNumber in -lICE" >&5
 ac_lib_var=`echo ICE'_'IceConnectionNumber | sed 'y%./+-%__p_%'`
 
 ac_save_LIBS="$LIBS"
 LIBS="-lICE $X_EXTRA_LIBS $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 5393 "configure"
+#line 5381 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -5400,7 +5388,7 @@
 IceConnectionNumber()
 ; return 0; }
 EOF
-if { (eval echo configure:5404: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5392: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -5434,411 +5422,18 @@
 
 
 
-# Enable Curses option
-
-
-echo $ac_n "checking whether to use Curses""... $ac_c" 1>&6
-echo "configure:5442: checking whether to use Curses" >&5
-echo "$ac_t"""$with_curses"" 1>&6
-case "$with_curses" in
-	"no")	USE_CURSES=	;;
-	"yes")	USE_CURSES="1"	;;
-	*)	{ echo "configure: error: *** You must answer yes or no." 1>&2; exit 1; }	;;
-esac
-
-
-
-if test -n "$USE_CURSES"; then
-
-
-ac_save_cppflags="$CPPFLAGS"
-CPPFLAGS=" $CPPFLAGS"
-for ac_hdr in curses.h
-do
-ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
-echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:5461: checking for $ac_hdr" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 5464 "configure"
-#include "confdefs.h"
-#include <$ac_hdr>
-EOF
-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:5469: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
-if test -z "$ac_err"; then
-  rm -rf conftest*
-  eval "ac_cv_header_$ac_safe=yes"
-else
-  echo "$ac_err" >&5
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_header_$ac_safe=no"
-fi
-rm -f conftest*
-if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-    ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'`
-  cat >> confdefs.h <<EOF
-#define $ac_tr_hdr 1
-EOF
- 
-else
-  echo "$ac_t""no" 1>&6
-{ echo "configure: error: *** Unable to locate curses includes." 1>&2; exit 1; }
-
-fi
-done
-
-CPPFLAGS=$ac_save_cppflags
-
-
-echo $ac_n "checking curses.h WINDOW structure component""... $ac_c" 1>&6
-echo "configure:5500: checking curses.h WINDOW structure component" >&5
-CURSES_MAXY=NONE
-cat > conftest.$ac_ext <<EOF
-#line 5503 "configure"
-#include "confdefs.h"
-
-#include <curses.h>
-  
-int main() {
-WINDOW w; w.maxy = 0;
-; return 0; }
-EOF
-if { (eval echo configure:5512: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-  rm -rf conftest*
-  CURSES_MAXY=maxy
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-fi
-rm -f conftest*
-cat > conftest.$ac_ext <<EOF
-#line 5521 "configure"
-#include "confdefs.h"
-
-#include <curses.h>
-  
-int main() {
-WINDOW w; w._maxy = 0;
-; return 0; }
-EOF
-if { (eval echo configure:5530: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-  rm -rf conftest*
-  CURSES_MAXY=_maxy
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-fi
-rm -f conftest*
-cat >> confdefs.h <<EOF
-#define CURSES_MAXY $CURSES_MAXY
-EOF
-
-
-echo "$ac_t""$CURSES_MAXY" 1>&6
-
-echo $ac_n "checking for initscr in -lncurses""... $ac_c" 1>&6
-echo "configure:5546: checking for initscr in -lncurses" >&5
-ac_lib_var=`echo ncurses'_'initscr | sed 'y%./+-%__p_%'`
-
-ac_save_LIBS="$LIBS"
-LIBS="-lncurses  $LIBS"
-cat > conftest.$ac_ext <<EOF
-#line 5552 "configure"
-#include "confdefs.h"
-/* Override any gcc2 internal prototype to avoid an error.  */
-/* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
-char initscr();
-
-int main() {
-initscr()
-; return 0; }
-EOF
-if { (eval echo configure:5563: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  eval "ac_cv_lib_$ac_lib_var=yes"
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_lib_$ac_lib_var=no"
-fi
-rm -f conftest*
-LIBS="$ac_save_LIBS"
-
-if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-  CURSESLIB=-lncurses
-else
-  echo "$ac_t""no" 1>&6
-
-echo $ac_n "checking for initscr in -lcurses""... $ac_c" 1>&6
-echo "configure:5582: checking for initscr in -lcurses" >&5
-ac_lib_var=`echo curses'_'initscr | sed 'y%./+-%__p_%'`
-
-ac_save_LIBS="$LIBS"
-LIBS="-lcurses  $LIBS"
-cat > conftest.$ac_ext <<EOF
-#line 5588 "configure"
-#include "confdefs.h"
-/* Override any gcc2 internal prototype to avoid an error.  */
-/* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
-char initscr();
-
-int main() {
-initscr()
-; return 0; }
-EOF
-if { (eval echo configure:5599: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  eval "ac_cv_lib_$ac_lib_var=yes"
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_lib_$ac_lib_var=no"
-fi
-rm -f conftest*
-LIBS="$ac_save_LIBS"
-
-if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-  CURSESLIB=-lcurses
-else
-  echo "$ac_t""no" 1>&6
-
-    { echo "configure: error: *** Unable to locate curses library." 1>&2; exit 1; }
-    CURSESLIB=
-
-fi
-
-fi
-
-
-
-
-echo $ac_n "checking for keypad in -lncurses""... $ac_c" 1>&6
-echo "configure:5628: checking for keypad in -lncurses" >&5
-ac_lib_var=`echo ncurses'_'keypad | sed 'y%./+-%__p_%'`
-
-ac_save_LIBS="$LIBS"
-LIBS="-lncurses  $LIBS"
-cat > conftest.$ac_ext <<EOF
-#line 5634 "configure"
-#include "confdefs.h"
-/* Override any gcc2 internal prototype to avoid an error.  */
-/* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
-char keypad();
-
-int main() {
-keypad()
-; return 0; }
-EOF
-if { (eval echo configure:5645: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  eval "ac_cv_lib_$ac_lib_var=yes"
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_lib_$ac_lib_var=no"
-fi
-rm -f conftest*
-LIBS="$ac_save_LIBS"
-
-if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-  cat >> confdefs.h <<\EOF
-#define HAVE_KEYPAD 1
-EOF
-
-else
-  echo "$ac_t""no" 1>&6
-
-echo $ac_n "checking for keypad in -lcurses""... $ac_c" 1>&6
-echo "configure:5667: checking for keypad in -lcurses" >&5
-ac_lib_var=`echo curses'_'keypad | sed 'y%./+-%__p_%'`
-
-ac_save_LIBS="$LIBS"
-LIBS="-lcurses  $LIBS"
-cat > conftest.$ac_ext <<EOF
-#line 5673 "configure"
-#include "confdefs.h"
-/* Override any gcc2 internal prototype to avoid an error.  */
-/* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
-char keypad();
-
-int main() {
-keypad()
-; return 0; }
-EOF
-if { (eval echo configure:5684: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  eval "ac_cv_lib_$ac_lib_var=yes"
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_lib_$ac_lib_var=no"
-fi
-rm -f conftest*
-LIBS="$ac_save_LIBS"
-
-if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-  cat >> confdefs.h <<\EOF
-#define HAVE_KEYPAD 1
-EOF
-
-else
-  echo "$ac_t""no" 1>&6
-
-
-fi
-
-fi
-
-
-fi # $USE_CURSES
-
-echo $ac_n "checking for gtty in -lcompat""... $ac_c" 1>&6
-echo "configure:5714: checking for gtty in -lcompat" >&5
-ac_lib_var=`echo compat'_'gtty | sed 'y%./+-%__p_%'`
-
-ac_save_LIBS="$LIBS"
-LIBS="-lcompat  $LIBS"
-cat > conftest.$ac_ext <<EOF
-#line 5720 "configure"
-#include "confdefs.h"
-/* Override any gcc2 internal prototype to avoid an error.  */
-/* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
-char gtty();
-
-int main() {
-gtty()
-; return 0; }
-EOF
-if { (eval echo configure:5731: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  eval "ac_cv_lib_$ac_lib_var=yes"
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_lib_$ac_lib_var=no"
-fi
-rm -f conftest*
-LIBS="$ac_save_LIBS"
-
-if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-  COMPATLIB=-lcompat
-else
-  echo "$ac_t""no" 1>&6
-
-echo $ac_n "checking for gtty in -lbsd-compat""... $ac_c" 1>&6
-echo "configure:5750: checking for gtty in -lbsd-compat" >&5
-ac_lib_var=`echo bsd-compat'_'gtty | sed 'y%./+-%__p_%'`
-
-ac_save_LIBS="$LIBS"
-LIBS="-lbsd-compat  $LIBS"
-cat > conftest.$ac_ext <<EOF
-#line 5756 "configure"
-#include "confdefs.h"
-/* Override any gcc2 internal prototype to avoid an error.  */
-/* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
-char gtty();
-
-int main() {
-gtty()
-; return 0; }
-EOF
-if { (eval echo configure:5767: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  eval "ac_cv_lib_$ac_lib_var=yes"
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_lib_$ac_lib_var=no"
-fi
-rm -f conftest*
-LIBS="$ac_save_LIBS"
-
-if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-  COMPATLIB=-lbsd-compat
-else
-  echo "$ac_t""no" 1>&6
-
-echo $ac_n "checking for gtty in -lbsd""... $ac_c" 1>&6
-echo "configure:5786: checking for gtty in -lbsd" >&5
-ac_lib_var=`echo bsd'_'gtty | sed 'y%./+-%__p_%'`
-
-ac_save_LIBS="$LIBS"
-LIBS="-lbsd  $LIBS"
-cat > conftest.$ac_ext <<EOF
-#line 5792 "configure"
-#include "confdefs.h"
-/* Override any gcc2 internal prototype to avoid an error.  */
-/* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
-char gtty();
-
-int main() {
-gtty()
-; return 0; }
-EOF
-if { (eval echo configure:5803: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  eval "ac_cv_lib_$ac_lib_var=yes"
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_lib_$ac_lib_var=no"
-fi
-rm -f conftest*
-LIBS="$ac_save_LIBS"
-
-if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-  COMPATLIB=-lbsd
-else
-  echo "$ac_t""no" 1>&6
-
-    COMPATLIB=
-
-fi
-
-fi
-
-fi
-
-
-
 # Note that some systems (FreeBSD for example) need an extra library for
 # cuserid
 ac_save_libs="$LIBS"
 LIBS=""
 
 echo $ac_n "checking for library containing cuserid""... $ac_c" 1>&6
-echo "configure:5837: checking for library containing cuserid" >&5
+echo "configure:5432: checking for library containing cuserid" >&5
 
 ac_func_search_save_LIBS="$LIBS"
 ac_cv_search_cuserid="no"
 cat > conftest.$ac_ext <<EOF
-#line 5842 "configure"
+#line 5437 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -5849,7 +5444,7 @@
 cuserid()
 ; return 0; }
 EOF
-if { (eval echo configure:5853: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5448: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   ac_cv_search_cuserid="none required"
 else
@@ -5860,7 +5455,7 @@
 test "$ac_cv_search_cuserid" = "no" && for i in compat; do
 LIBS="-l$i  $ac_func_search_save_LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 5864 "configure"
+#line 5459 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -5871,7 +5466,7 @@
 cuserid()
 ; return 0; }
 EOF
-if { (eval echo configure:5875: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5470: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   ac_cv_search_cuserid="-l$i"
 break
@@ -5897,10 +5492,10 @@
 # Note: -lxdr -liberty -lws2_32 is for MinGW
 
 echo $ac_n "checking for xdrmem_create""... $ac_c" 1>&6
-echo "configure:5901: checking for xdrmem_create" >&5
+echo "configure:5496: checking for xdrmem_create" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 5904 "configure"
+#line 5499 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char xdrmem_create(); below.  */
@@ -5923,7 +5518,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:5927: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5522: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_xdrmem_create=yes"
 else
@@ -5941,13 +5536,13 @@
   echo "$ac_t""no" 1>&6
 
 echo $ac_n "checking for xdrmem_create in -lsun""... $ac_c" 1>&6
-echo "configure:5945: checking for xdrmem_create in -lsun" >&5
+echo "configure:5540: checking for xdrmem_create in -lsun" >&5
 ac_lib_var=`echo sun'_'xdrmem_create | sed 'y%./+-%__p_%'`
 
 ac_save_LIBS="$LIBS"
 LIBS="-lsun  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 5951 "configure"
+#line 5546 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -5958,7 +5553,7 @@
 xdrmem_create()
 ; return 0; }
 EOF
-if { (eval echo configure:5962: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5557: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -5977,13 +5572,13 @@
   echo "$ac_t""no" 1>&6
 
 echo $ac_n "checking for xdrmem_create in -lnsl""... $ac_c" 1>&6
-echo "configure:5981: checking for xdrmem_create in -lnsl" >&5
+echo "configure:5576: checking for xdrmem_create in -lnsl" >&5
 ac_lib_var=`echo nsl'_'xdrmem_create | sed 'y%./+-%__p_%'`
 
 ac_save_LIBS="$LIBS"
 LIBS="-lnsl  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 5987 "configure"
+#line 5582 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -5994,7 +5589,7 @@
 xdrmem_create()
 ; return 0; }
 EOF
-if { (eval echo configure:5998: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5593: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -6013,13 +5608,13 @@
   echo "$ac_t""no" 1>&6
 
 echo $ac_n "checking for xdrmem_create in -lrpclib""... $ac_c" 1>&6
-echo "configure:6017: checking for xdrmem_create in -lrpclib" >&5
+echo "configure:5612: checking for xdrmem_create in -lrpclib" >&5
 ac_lib_var=`echo rpclib'_'xdrmem_create | sed 'y%./+-%__p_%'`
 
 ac_save_LIBS="$LIBS"
 LIBS="-lrpclib  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 6023 "configure"
+#line 5618 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -6030,7 +5625,7 @@
 xdrmem_create()
 ; return 0; }
 EOF
-if { (eval echo configure:6034: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5629: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -6049,13 +5644,13 @@
   echo "$ac_t""no" 1>&6
 
 echo $ac_n "checking for xdrmem_create in -lxdr""... $ac_c" 1>&6
-echo "configure:6053: checking for xdrmem_create in -lxdr" >&5
+echo "configure:5648: checking for xdrmem_create in -lxdr" >&5
 ac_lib_var=`echo xdr'_'xdrmem_create | sed 'y%./+-%__p_%'`
 
 ac_save_LIBS="$LIBS"
 LIBS="-lxdr -liberty -lws2_32  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 6059 "configure"
+#line 5654 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -6066,7 +5661,7 @@
 xdrmem_create()
 ; return 0; }
 EOF
-if { (eval echo configure:6070: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5665: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -6100,10 +5695,10 @@
 for ac_func in asprintf
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:6104: checking for $ac_func" >&5
+echo "configure:5699: checking for $ac_func" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 6107 "configure"
+#line 5702 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -6126,7 +5721,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:6130: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5725: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -6153,10 +5748,10 @@
 
 # Test if mathlib needs -lm flag or is included with libc
 echo $ac_n "checking for atan""... $ac_c" 1>&6
-echo "configure:6157: checking for atan" >&5
+echo "configure:5752: checking for atan" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 6160 "configure"
+#line 5755 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char atan(); below.  */
@@ -6179,7 +5774,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:6183: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5778: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_atan=yes"
 else
@@ -6197,13 +5792,13 @@
   echo "$ac_t""no" 1>&6
 
 echo $ac_n "checking for atan in -lm""... $ac_c" 1>&6
-echo "configure:6201: checking for atan in -lm" >&5
+echo "configure:5796: checking for atan in -lm" >&5
 ac_lib_var=`echo m'_'atan | sed 'y%./+-%__p_%'`
 
 ac_save_LIBS="$LIBS"
 LIBS="-lm  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 6207 "configure"
+#line 5802 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -6214,7 +5809,7 @@
 atan()
 ; return 0; }
 EOF
-if { (eval echo configure:6218: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5813: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -6241,10 +5836,10 @@
 
 
 echo $ac_n "checking for dlsym""... $ac_c" 1>&6
-echo "configure:6245: checking for dlsym" >&5
+echo "configure:5840: checking for dlsym" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 6248 "configure"
+#line 5843 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char dlsym(); below.  */
@@ -6267,7 +5862,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:6271: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5866: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_dlsym=yes"
 else
@@ -6285,13 +5880,13 @@
   echo "$ac_t""no" 1>&6
 
 echo $ac_n "checking for dlsym in -ldl""... $ac_c" 1>&6
-echo "configure:6289: checking for dlsym in -ldl" >&5
+echo "configure:5884: checking for dlsym in -ldl" >&5
 ac_lib_var=`echo dl'_'dlsym | sed 'y%./+-%__p_%'`
 
 ac_save_LIBS="$LIBS"
 LIBS="-ldl  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 6295 "configure"
+#line 5890 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -6302,7 +5897,7 @@
 dlsym()
 ; return 0; }
 EOF
-if { (eval echo configure:6306: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5901: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -6329,10 +5924,10 @@
 
 
 echo $ac_n "checking for iconv""... $ac_c" 1>&6
-echo "configure:6333: checking for iconv" >&5
+echo "configure:5928: checking for iconv" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 6336 "configure"
+#line 5931 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char iconv(); below.  */
@@ -6355,7 +5950,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:6359: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5954: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_iconv=yes"
 else
@@ -6373,13 +5968,13 @@
   echo "$ac_t""no" 1>&6
 
 echo $ac_n "checking for iconv in -liconv""... $ac_c" 1>&6
-echo "configure:6377: checking for iconv in -liconv" >&5
+echo "configure:5972: checking for iconv in -liconv" >&5
 ac_lib_var=`echo iconv'_'iconv | sed 'y%./+-%__p_%'`
 
 ac_save_LIBS="$LIBS"
 LIBS="-liconv  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 6383 "configure"
+#line 5978 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -6390,7 +5985,7 @@
 iconv()
 ; return 0; }
 EOF
-if { (eval echo configure:6394: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5989: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -6409,13 +6004,13 @@
   echo "$ac_t""no" 1>&6
 
 echo $ac_n "checking for iconv in -lgiconv""... $ac_c" 1>&6
-echo "configure:6413: checking for iconv in -lgiconv" >&5
+echo "configure:6008: checking for iconv in -lgiconv" >&5
 ac_lib_var=`echo giconv'_'iconv | sed 'y%./+-%__p_%'`
 
 ac_save_LIBS="$LIBS"
 LIBS="-lgiconv  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 6419 "configure"
+#line 6014 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -6426,7 +6021,7 @@
 iconv()
 ; return 0; }
 EOF
-if { (eval echo configure:6430: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6025: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -6445,10 +6040,10 @@
   echo "$ac_t""no" 1>&6
 
 echo $ac_n "checking for libiconv""... $ac_c" 1>&6
-echo "configure:6449: checking for libiconv" >&5
+echo "configure:6044: checking for libiconv" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 6452 "configure"
+#line 6047 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char libiconv(); below.  */
@@ -6471,7 +6066,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:6475: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6070: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_libiconv=yes"
 else
@@ -6489,13 +6084,13 @@
   echo "$ac_t""no" 1>&6
 
 echo $ac_n "checking for libiconv in -liconv""... $ac_c" 1>&6
-echo "configure:6493: checking for libiconv in -liconv" >&5
+echo "configure:6088: checking for libiconv in -liconv" >&5
 ac_lib_var=`echo iconv'_'libiconv | sed 'y%./+-%__p_%'`
 
 ac_save_LIBS="$LIBS"
 LIBS="-liconv  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 6499 "configure"
+#line 6094 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -6506,7 +6101,7 @@
 libiconv()
 ; return 0; }
 EOF
-if { (eval echo configure:6510: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6105: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -6525,13 +6120,13 @@
   echo "$ac_t""no" 1>&6
 
 echo $ac_n "checking for libiconv in -lgiconv""... $ac_c" 1>&6
-echo "configure:6529: checking for libiconv in -lgiconv" >&5
+echo "configure:6124: checking for libiconv in -lgiconv" >&5
 ac_lib_var=`echo giconv'_'libiconv | sed 'y%./+-%__p_%'`
 
 ac_save_LIBS="$LIBS"
 LIBS="-lgiconv  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 6535 "configure"
+#line 6130 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -6542,7 +6137,7 @@
 libiconv()
 ; return 0; }
 EOF
-if { (eval echo configure:6546: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6141: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -6579,10 +6174,10 @@
 
 have_socket=1
 echo $ac_n "checking for socket""... $ac_c" 1>&6
-echo "configure:6583: checking for socket" >&5
+echo "configure:6178: checking for socket" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 6586 "configure"
+#line 6181 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char socket(); below.  */
@@ -6605,7 +6200,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:6609: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6204: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_socket=yes"
 else
@@ -6623,13 +6218,13 @@
   echo "$ac_t""no" 1>&6
 
 echo $ac_n "checking for socket in -lsocket""... $ac_c" 1>&6
-echo "configure:6627: checking for socket in -lsocket" >&5
+echo "configure:6222: checking for socket in -lsocket" >&5
 ac_lib_var=`echo socket'_'socket | sed 'y%./+-%__p_%'`
 
 ac_save_LIBS="$LIBS"
 LIBS="-lsocket  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 6633 "configure"
+#line 6228 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -6640,7 +6235,7 @@
 socket()
 ; return 0; }
 EOF
-if { (eval echo configure:6644: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6239: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -6688,7 +6283,7 @@
 
 
 echo $ac_n "checking for location of zlib includes""... $ac_c" 1>&6
-echo "configure:6692: checking for location of zlib includes" >&5
+echo "configure:6287: checking for location of zlib includes" >&5
 case "$with_zlib_includes" in
 y | ye | yes | n | no)
 	{ echo "configure: error: *** You must supply a directory to --with-zlib-includes." 1>&2; exit 1; }
@@ -6714,15 +6309,15 @@
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:6718: checking for $ac_hdr" >&5
+echo "configure:6313: checking for $ac_hdr" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 6721 "configure"
+#line 6316 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:6726: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:6321: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -6756,7 +6351,7 @@
 
 
 echo $ac_n "checking for location of zlib library""... $ac_c" 1>&6
-echo "configure:6760: checking for location of zlib library" >&5
+echo "configure:6355: checking for location of zlib library" >&5
 case "$with_zlib_libs" in
 y | ye | yes | n | no)
 	{ echo "configure: error: *** You must supply a directory to --with-zlib-libs." 1>&2; exit 1; }
@@ -6781,13 +6376,13 @@
 
 
 echo $ac_n "checking for deflate in -lz""... $ac_c" 1>&6
-echo "configure:6785: checking for deflate in -lz" >&5
+echo "configure:6380: checking for deflate in -lz" >&5
 ac_lib_var=`echo z'_'deflate | sed 'y%./+-%__p_%'`
 
 ac_save_LIBS="$LIBS"
 LIBS="-lz  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 6791 "configure"
+#line 6386 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -6798,7 +6393,7 @@
 deflate()
 ; return 0; }
 EOF
-if { (eval echo configure:6802: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6397: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -6846,7 +6441,7 @@
 
 
 echo $ac_n "checking for location of External PROJ.4 includes""... $ac_c" 1>&6
-echo "configure:6850: checking for location of External PROJ.4 includes" >&5
+echo "configure:6445: checking for location of External PROJ.4 includes" >&5
 case "$with_proj_includes" in
 y | ye | yes | n | no)
 	{ echo "configure: error: *** You must supply a directory to --with-proj-includes." 1>&2; exit 1; }
@@ -6872,15 +6467,15 @@
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:6876: checking for $ac_hdr" >&5
+echo "configure:6471: checking for $ac_hdr" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 6879 "configure"
+#line 6474 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:6884: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:6479: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -6917,7 +6512,7 @@
 else
     
 echo $ac_n "checking External PROJ.4 version""... $ac_c" 1>&6
-echo "configure:6921: checking External PROJ.4 version" >&5
+echo "configure:6516: checking External PROJ.4 version" >&5
 ac_save_cppflags="$CPPFLAGS"
 CPPFLAGS="$PROJINC $CPPFLAGS"
 if test "$cross_compiling" = yes; then
@@ -6925,7 +6520,7 @@
         echo "$ac_t""unknown (cross-compiling)" 1>&6 
 else
   cat > conftest.$ac_ext <<EOF
-#line 6929 "configure"
+#line 6524 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -6937,7 +6532,7 @@
 }
     
 EOF
-if { (eval echo configure:6941: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:6536: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
      proj_ver=`cat conftestdata`
         echo "$ac_t""$proj_ver" 1>&6
@@ -6962,7 +6557,7 @@
 
 
 echo $ac_n "checking for location of External PROJ.4 library""... $ac_c" 1>&6
-echo "configure:6966: checking for location of External PROJ.4 library" >&5
+echo "configure:6561: checking for location of External PROJ.4 library" >&5
 case "$with_proj_libs" in
 y | ye | yes | n | no)
 	{ echo "configure: error: *** You must supply a directory to --with-proj-libs." 1>&2; exit 1; }
@@ -6987,13 +6582,13 @@
 
 
 echo $ac_n "checking for pj_get_def in -lproj""... $ac_c" 1>&6
-echo "configure:6991: checking for pj_get_def in -lproj" >&5
+echo "configure:6586: checking for pj_get_def in -lproj" >&5
 ac_lib_var=`echo proj'_'pj_get_def | sed 'y%./+-%__p_%'`
 
 ac_save_LIBS="$LIBS"
 LIBS="-lproj  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 6997 "configure"
+#line 6592 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -7004,7 +6599,7 @@
 pj_get_def()
 ; return 0; }
 EOF
-if { (eval echo configure:7008: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6603: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -7038,7 +6633,7 @@
 
 
 echo $ac_n "checking for location of External PROJ.4 data files""... $ac_c" 1>&6
-echo "configure:7042: checking for location of External PROJ.4 data files" >&5
+echo "configure:6637: checking for location of External PROJ.4 data files" >&5
 case "$with_proj_share" in
 y | ye | yes | n | no)
         { echo "configure: error: *** You must supply a directory to --with-proj-share." 1>&2; exit 1; }
@@ -7062,14 +6657,14 @@
 # LOC_CHECK_SHARE does not work when cross compiling
 if test "$cross_compiling" = "yes" ; then
     echo $ac_n "checking for epsg""... $ac_c" 1>&6
-echo "configure:7066: checking for epsg" >&5
+echo "configure:6661: checking for epsg" >&5
     echo "$ac_t""unknown (cross-compiling)" 1>&6
 else
     
 
 ac_safe=`echo "$PROJSHARE/epsg" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $PROJSHARE/epsg""... $ac_c" 1>&6
-echo "configure:7073: checking for $PROJSHARE/epsg" >&5
+echo "configure:6668: checking for $PROJSHARE/epsg" >&5
 
 if test "$cross_compiling" = yes; then
     { echo "configure: error: Cannot check for file existence when cross compiling" 1>&2; exit 1; }
@@ -7101,7 +6696,7 @@
 # Extract the first word of "nad2bin", so it can be a program name with args.
 set dummy nad2bin; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:7105: checking for $ac_word" >&5
+echo "configure:6700: checking for $ac_word" >&5
 
 case "$NAD2BIN" in
   /*)
@@ -7141,7 +6736,7 @@
 
 
 echo $ac_n "checking whether to use Readline""... $ac_c" 1>&6
-echo "configure:7145: checking whether to use Readline" >&5
+echo "configure:6740: checking whether to use Readline" >&5
 echo "$ac_t"""$with_readline"" 1>&6
 case "$with_readline" in
 	"no")	USE_READLINE=	;;
@@ -7162,7 +6757,7 @@
 
 
 echo $ac_n "checking for location of Readline includes""... $ac_c" 1>&6
-echo "configure:7166: checking for location of Readline includes" >&5
+echo "configure:6761: checking for location of Readline includes" >&5
 case "$with_readline_includes" in
 y | ye | yes | n | no)
 	{ echo "configure: error: *** You must supply a directory to --with-readline-includes." 1>&2; exit 1; }
@@ -7188,15 +6783,15 @@
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:7192: checking for $ac_hdr" >&5
+echo "configure:6787: checking for $ac_hdr" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 7195 "configure"
+#line 6790 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:7200: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:6795: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -7232,15 +6827,15 @@
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:7236: checking for $ac_hdr" >&5
+echo "configure:6831: checking for $ac_hdr" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 7239 "configure"
+#line 6834 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:7244: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:6839: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -7274,7 +6869,7 @@
 
 
 echo $ac_n "checking for location of Readline library""... $ac_c" 1>&6
-echo "configure:7278: checking for location of Readline library" >&5
+echo "configure:6873: checking for location of Readline library" >&5
 case "$with_readline_libs" in
 y | ye | yes | n | no)
 	{ echo "configure: error: *** You must supply a directory to --with-readline-libs." 1>&2; exit 1; }
@@ -7299,13 +6894,13 @@
 
 
 echo $ac_n "checking for readline in -lreadline""... $ac_c" 1>&6
-echo "configure:7303: checking for readline in -lreadline" >&5
+echo "configure:6898: checking for readline in -lreadline" >&5
 ac_lib_var=`echo readline'_'readline | sed 'y%./+-%__p_%'`
 
 ac_save_LIBS="$LIBS"
 LIBS="-lreadline  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 7309 "configure"
+#line 6904 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -7316,7 +6911,7 @@
 readline()
 ; return 0; }
 EOF
-if { (eval echo configure:7320: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6915: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -7351,13 +6946,13 @@
 
 
 echo $ac_n "checking for add_history in -lhistory""... $ac_c" 1>&6
-echo "configure:7355: checking for add_history in -lhistory" >&5
+echo "configure:6950: checking for add_history in -lhistory" >&5
 ac_lib_var=`echo history'_'add_history | sed 'y%./+-%__p_%'`
 
 ac_save_LIBS="$LIBS"
 LIBS="-lhistory  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 7361 "configure"
+#line 6956 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -7368,7 +6963,7 @@
 add_history()
 ; return 0; }
 EOF
-if { (eval echo configure:7372: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6967: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -7411,7 +7006,7 @@
 
 
 echo $ac_n "checking whether to use JPEG""... $ac_c" 1>&6
-echo "configure:7415: checking whether to use JPEG" >&5
+echo "configure:7010: checking whether to use JPEG" >&5
 echo "$ac_t"""$with_jpeg"" 1>&6
 case "$with_jpeg" in
 	"no")	USE_JPEG=	;;
@@ -7431,7 +7026,7 @@
 
 
 echo $ac_n "checking for location of JPEG includes""... $ac_c" 1>&6
-echo "configure:7435: checking for location of JPEG includes" >&5
+echo "configure:7030: checking for location of JPEG includes" >&5
 case "$with_jpeg_includes" in
 y | ye | yes | n | no)
 	{ echo "configure: error: *** You must supply a directory to --with-jpeg-includes." 1>&2; exit 1; }
@@ -7457,15 +7052,15 @@
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:7461: checking for $ac_hdr" >&5
+echo "configure:7056: checking for $ac_hdr" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 7464 "configure"
+#line 7059 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:7469: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:7064: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -7499,7 +7094,7 @@
 
 
 echo $ac_n "checking for location of JPEG library""... $ac_c" 1>&6
-echo "configure:7503: checking for location of JPEG library" >&5
+echo "configure:7098: checking for location of JPEG library" >&5
 case "$with_jpeg_libs" in
 y | ye | yes | n | no)
 	{ echo "configure: error: *** You must supply a directory to --with-jpeg-libs." 1>&2; exit 1; }
@@ -7526,13 +7121,13 @@
 
 
 echo $ac_n "checking for jpeg_start_compress in -ljpeg""... $ac_c" 1>&6
-echo "configure:7530: checking for jpeg_start_compress in -ljpeg" >&5
+echo "configure:7125: checking for jpeg_start_compress in -ljpeg" >&5
 ac_lib_var=`echo jpeg'_'jpeg_start_compress | sed 'y%./+-%__p_%'`
 
 ac_save_LIBS="$LIBS"
 LIBS="-ljpeg  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 7536 "configure"
+#line 7131 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -7543,7 +7138,7 @@
 jpeg_start_compress()
 ; return 0; }
 EOF
-if { (eval echo configure:7547: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7142: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -7562,13 +7157,13 @@
   echo "$ac_t""no" 1>&6
 
 echo $ac_n "checking for jpeg_start_compress in -ljpeg""... $ac_c" 1>&6
-echo "configure:7566: checking for jpeg_start_compress in -ljpeg" >&5
+echo "configure:7161: checking for jpeg_start_compress in -ljpeg" >&5
 ac_lib_var=`echo jpeg'_'jpeg_start_compress | sed 'y%./+-%__p_%'`
 
 ac_save_LIBS="$LIBS"
 LIBS="-ljpeg $ZLIB $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 7572 "configure"
+#line 7167 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -7579,7 +7174,7 @@
 jpeg_start_compress()
 ; return 0; }
 EOF
-if { (eval echo configure:7583: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7178: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -7628,7 +7223,7 @@
 # GDAL option
 
 echo $ac_n "checking whether to use GDAL""... $ac_c" 1>&6
-echo "configure:7632: checking whether to use GDAL" >&5
+echo "configure:7227: checking whether to use GDAL" >&5
 
 if test "`basename xx/$with_gdal`" = "gdal-config" ; then
   GDAL_CONFIG="$with_gdal"
@@ -7641,7 +7236,7 @@
   # Extract the first word of "gdal-config", so it can be a program name with args.
 set dummy gdal-config; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:7645: checking for $ac_word" >&5
+echo "configure:7240: checking for $ac_word" >&5
 
 case "$GDAL_CONFIG" in
   /*)
@@ -7701,14 +7296,14 @@
   LIBS="$LIBS $GDAL_LIBS"
   CFLAGS="$CFLAGS $GDAL_CFLAGS"
   cat > conftest.$ac_ext <<EOF
-#line 7705 "configure"
+#line 7300 "configure"
 #include "confdefs.h"
 #include <gdal.h>
 int main() {
 GDALOpen("foo", GA_ReadOnly);
 ; return 0; }
 EOF
-if { (eval echo configure:7712: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7307: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   :
 else
   echo "configure: failed program was:" >&5
@@ -7717,14 +7312,14 @@
   
   LIBS="$LIBS $GDAL_DEP_LIBS"
   cat > conftest.$ac_ext <<EOF
-#line 7721 "configure"
+#line 7316 "configure"
 #include "confdefs.h"
 #include <gdal.h>
 int main() {
 GDALOpen("foo", GA_ReadOnly);
 ; return 0; }
 EOF
-if { (eval echo configure:7728: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7323: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   GDAL_LIBS="$GDAL_LIBS $GDAL_DEP_LIBS"
 else
@@ -7752,7 +7347,7 @@
 
 
 echo $ac_n "checking whether to use TIFF""... $ac_c" 1>&6
-echo "configure:7756: checking whether to use TIFF" >&5
+echo "configure:7351: checking whether to use TIFF" >&5
 echo "$ac_t"""$with_tiff"" 1>&6
 case "$with_tiff" in
 	"no")	USE_TIFF=	;;
@@ -7772,7 +7367,7 @@
 
 
 echo $ac_n "checking for location of TIFF includes""... $ac_c" 1>&6
-echo "configure:7776: checking for location of TIFF includes" >&5
+echo "configure:7371: checking for location of TIFF includes" >&5
 case "$with_tiff_includes" in
 y | ye | yes | n | no)
 	{ echo "configure: error: *** You must supply a directory to --with-tiff-includes." 1>&2; exit 1; }
@@ -7798,15 +7393,15 @@
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:7802: checking for $ac_hdr" >&5
+echo "configure:7397: checking for $ac_hdr" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 7805 "configure"
+#line 7400 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:7810: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:7405: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -7840,7 +7435,7 @@
 
 
 echo $ac_n "checking for location of TIFF library""... $ac_c" 1>&6
-echo "configure:7844: checking for location of TIFF library" >&5
+echo "configure:7439: checking for location of TIFF library" >&5
 case "$with_tiff_libs" in
 y | ye | yes | n | no)
 	{ echo "configure: error: *** You must supply a directory to --with-tiff-libs." 1>&2; exit 1; }
@@ -7871,13 +7466,13 @@
 
 
 echo $ac_n "checking for TIFFOpen in -ltiff""... $ac_c" 1>&6
-echo "configure:7875: checking for TIFFOpen in -ltiff" >&5
+echo "configure:7470: checking for TIFFOpen in -ltiff" >&5
 ac_lib_var=`echo tiff'_'TIFFOpen | sed 'y%./+-%__p_%'`
 
 ac_save_LIBS="$LIBS"
 LIBS="-ltiff  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 7881 "configure"
+#line 7476 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -7888,7 +7483,7 @@
 TIFFOpen()
 ; return 0; }
 EOF
-if { (eval echo configure:7892: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7487: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -7907,13 +7502,13 @@
   echo "$ac_t""no" 1>&6
 
 echo $ac_n "checking for TIFFOpen in -ltiff""... $ac_c" 1>&6
-echo "configure:7911: checking for TIFFOpen in -ltiff" >&5
+echo "configure:7506: checking for TIFFOpen in -ltiff" >&5
 ac_lib_var=`echo tiff'_'TIFFOpen | sed 'y%./+-%__p_%'`
 
 ac_save_LIBS="$LIBS"
 LIBS="-ltiff $MATHLIB $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 7917 "configure"
+#line 7512 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -7924,7 +7519,7 @@
 TIFFOpen()
 ; return 0; }
 EOF
-if { (eval echo configure:7928: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7523: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -7943,13 +7538,13 @@
   echo "$ac_t""no" 1>&6
 
 echo $ac_n "checking for TIFFOpen in -ltiff""... $ac_c" 1>&6
-echo "configure:7947: checking for TIFFOpen in -ltiff" >&5
+echo "configure:7542: checking for TIFFOpen in -ltiff" >&5
 ac_lib_var=`echo tiff'_'TIFFOpen | sed 'y%./+-%__p_%'`
 
 ac_save_LIBS="$LIBS"
 LIBS="-ltiff $ZLIB $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 7953 "configure"
+#line 7548 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -7960,7 +7555,7 @@
 TIFFOpen()
 ; return 0; }
 EOF
-if { (eval echo configure:7964: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7559: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -7979,13 +7574,13 @@
   echo "$ac_t""no" 1>&6
 
 echo $ac_n "checking for TIFFOpen in -ltiff""... $ac_c" 1>&6
-echo "configure:7983: checking for TIFFOpen in -ltiff" >&5
+echo "configure:7578: checking for TIFFOpen in -ltiff" >&5
 ac_lib_var=`echo tiff'_'TIFFOpen | sed 'y%./+-%__p_%'`
 
 ac_save_LIBS="$LIBS"
 LIBS="-ltiff $ZLIB $MATHLIB $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 7989 "configure"
+#line 7584 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -7996,7 +7591,7 @@
 TIFFOpen()
 ; return 0; }
 EOF
-if { (eval echo configure:8000: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7595: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -8015,13 +7610,13 @@
   echo "$ac_t""no" 1>&6
 
 echo $ac_n "checking for TIFFOpen in -ltiff""... $ac_c" 1>&6
-echo "configure:8019: checking for TIFFOpen in -ltiff" >&5
+echo "configure:7614: checking for TIFFOpen in -ltiff" >&5
 ac_lib_var=`echo tiff'_'TIFFOpen | sed 'y%./+-%__p_%'`
 
 ac_save_LIBS="$LIBS"
 LIBS="-ltiff $JPEGLIBPATH $JPEGLIB $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 8025 "configure"
+#line 7620 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -8032,7 +7627,7 @@
 TIFFOpen()
 ; return 0; }
 EOF
-if { (eval echo configure:8036: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7631: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -8051,13 +7646,13 @@
   echo "$ac_t""no" 1>&6
 
 echo $ac_n "checking for TIFFOpen in -ltiff""... $ac_c" 1>&6
-echo "configure:8055: checking for TIFFOpen in -ltiff" >&5
+echo "configure:7650: checking for TIFFOpen in -ltiff" >&5
 ac_lib_var=`echo tiff'_'TIFFOpen | sed 'y%./+-%__p_%'`
 
 ac_save_LIBS="$LIBS"
 LIBS="-ltiff $JPEGLIBPATH $JPEGLIB $MATHLIB $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 8061 "configure"
+#line 7656 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -8068,7 +7663,7 @@
 TIFFOpen()
 ; return 0; }
 EOF
-if { (eval echo configure:8072: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7667: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -8087,13 +7682,13 @@
   echo "$ac_t""no" 1>&6
 
 echo $ac_n "checking for TIFFOpen in -ltiff""... $ac_c" 1>&6
-echo "configure:8091: checking for TIFFOpen in -ltiff" >&5
+echo "configure:7686: checking for TIFFOpen in -ltiff" >&5
 ac_lib_var=`echo tiff'_'TIFFOpen | sed 'y%./+-%__p_%'`
 
 ac_save_LIBS="$LIBS"
 LIBS="-ltiff $JPEGLIBPATH $JPEGLIB $ZLIB $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 8097 "configure"
+#line 7692 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -8104,7 +7699,7 @@
 TIFFOpen()
 ; return 0; }
 EOF
-if { (eval echo configure:8108: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7703: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -8123,13 +7718,13 @@
   echo "$ac_t""no" 1>&6
 
 echo $ac_n "checking for TIFFOpen in -ltiff""... $ac_c" 1>&6
-echo "configure:8127: checking for TIFFOpen in -ltiff" >&5
+echo "configure:7722: checking for TIFFOpen in -ltiff" >&5
 ac_lib_var=`echo tiff'_'TIFFOpen | sed 'y%./+-%__p_%'`
 
 ac_save_LIBS="$LIBS"
 LIBS="-ltiff $JPEGLIBPATH $JPEGLIB $ZLIB $MATHLIB $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 8133 "configure"
+#line 7728 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -8140,7 +7735,7 @@
 TIFFOpen()
 ; return 0; }
 EOF
-if { (eval echo configure:8144: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7739: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -8238,7 +7833,7 @@
 
 
 echo $ac_n "checking whether to use PNG""... $ac_c" 1>&6
-echo "configure:8242: checking whether to use PNG" >&5
+echo "configure:7837: checking whether to use PNG" >&5
 echo "$ac_t"""$with_png"" 1>&6
 case "$with_png" in
 	"no")	USE_PNG=	;;
@@ -8257,7 +7852,7 @@
 
 
 echo $ac_n "checking for location of PNG includes""... $ac_c" 1>&6
-echo "configure:8261: checking for location of PNG includes" >&5
+echo "configure:7856: checking for location of PNG includes" >&5
 case "$with_png_includes" in
 y | ye | yes | n | no)
 	{ echo "configure: error: *** You must supply a directory to --with-png-includes." 1>&2; exit 1; }
@@ -8283,15 +7878,15 @@
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:8287: checking for $ac_hdr" >&5
+echo "configure:7882: checking for $ac_hdr" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 8290 "configure"
+#line 7885 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:8295: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:7890: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -8325,7 +7920,7 @@
 
 
 echo $ac_n "checking for location of PNG library""... $ac_c" 1>&6
-echo "configure:8329: checking for location of PNG library" >&5
+echo "configure:7924: checking for location of PNG library" >&5
 case "$with_png_libs" in
 y | ye | yes | n | no)
 	{ echo "configure: error: *** You must supply a directory to --with-png-libs." 1>&2; exit 1; }
@@ -8350,13 +7945,13 @@
 
 
 echo $ac_n "checking for png_read_image in -lpng""... $ac_c" 1>&6
-echo "configure:8354: checking for png_read_image in -lpng" >&5
+echo "configure:7949: checking for png_read_image in -lpng" >&5
 ac_lib_var=`echo png'_'png_read_image | sed 'y%./+-%__p_%'`
 
 ac_save_LIBS="$LIBS"
 LIBS="-lpng $ZLIB $MATHLIB $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 8360 "configure"
+#line 7955 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -8367,7 +7962,7 @@
 png_read_image()
 ; return 0; }
 EOF
-if { (eval echo configure:8371: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7966: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -8409,7 +8004,7 @@
 
 
 echo $ac_n "checking whether to use Tcl/Tk""... $ac_c" 1>&6
-echo "configure:8413: checking whether to use Tcl/Tk" >&5
+echo "configure:8008: checking whether to use Tcl/Tk" >&5
 echo "$ac_t"""$with_tcltk"" 1>&6
 case "$with_tcltk" in
 	"no")	USE_TCLTK=	;;
@@ -8429,7 +8024,7 @@
 
 
 echo $ac_n "checking for location of Tcl/Tk includes""... $ac_c" 1>&6
-echo "configure:8433: checking for location of Tcl/Tk includes" >&5
+echo "configure:8028: checking for location of Tcl/Tk includes" >&5
 case "$with_tcltk_includes" in
 y | ye | yes | n | no)
 	{ echo "configure: error: *** You must supply a directory to --with-tcltk-includes." 1>&2; exit 1; }
@@ -8455,15 +8050,15 @@
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:8459: checking for $ac_hdr" >&5
+echo "configure:8054: checking for $ac_hdr" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 8462 "configure"
+#line 8057 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:8467: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:8062: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -8500,15 +8095,15 @@
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:8504: checking for $ac_hdr" >&5
+echo "configure:8099: checking for $ac_hdr" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 8507 "configure"
+#line 8102 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:8512: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:8107: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -8542,7 +8137,7 @@
 
 
 echo $ac_n "checking Tcl version""... $ac_c" 1>&6
-echo "configure:8546: checking Tcl version" >&5
+echo "configure:8141: checking Tcl version" >&5
 ac_save_cppflags="$CPPFLAGS"
 CPPFLAGS="$TCLINCDIR $CPPFLAGS"
 if test "$cross_compiling" = yes; then
@@ -8550,7 +8145,7 @@
     echo "$ac_t""unknown (cross-compiling)" 1>&6 
 else
   cat > conftest.$ac_ext <<EOF
-#line 8554 "configure"
+#line 8149 "configure"
 #include "confdefs.h"
 
 #include <stdio.h> 
@@ -8562,7 +8157,7 @@
 }
 
 EOF
-if { (eval echo configure:8566: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:8161: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
      tcl_ver=`cat conftestdata`
     echo "$ac_t""$tcl_ver" 1>&6
@@ -8580,7 +8175,7 @@
 
 
 echo $ac_n "checking Tk version""... $ac_c" 1>&6
-echo "configure:8584: checking Tk version" >&5
+echo "configure:8179: checking Tk version" >&5
 ac_save_cppflags="$CPPFLAGS"
 CPPFLAGS="$TCLINCDIR $X_CFLAGS $CPPFLAGS"
 if test "$cross_compiling" = yes; then
@@ -8588,7 +8183,7 @@
     echo "$ac_t""unknown (cross-compiling)" 1>&6 
 else
   cat > conftest.$ac_ext <<EOF
-#line 8592 "configure"
+#line 8187 "configure"
 #include "confdefs.h"
 
 #include <stdio.h> 
@@ -8600,7 +8195,7 @@
 }
 
 EOF
-if { (eval echo configure:8604: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:8199: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
      tk_ver=`cat conftestdata`
     echo "$ac_t""$tk_ver" 1>&6
@@ -8629,7 +8224,7 @@
 
 
 echo $ac_n "checking for location of Tcl/Tk library""... $ac_c" 1>&6
-echo "configure:8633: checking for location of Tcl/Tk library" >&5
+echo "configure:8228: checking for location of Tcl/Tk library" >&5
 case "$with_tcltk_libs" in
 y | ye | yes | n | no)
 	{ echo "configure: error: *** You must supply a directory to --with-tcltk-libs." 1>&2; exit 1; }
@@ -8659,13 +8254,13 @@
 
 
 echo $ac_n "checking for Tcl_Init in -ltcl""... $ac_c" 1>&6
-echo "configure:8663: checking for Tcl_Init in -ltcl" >&5
+echo "configure:8258: checking for Tcl_Init in -ltcl" >&5
 ac_lib_var=`echo tcl'_'Tcl_Init | sed 'y%./+-%__p_%'`
 
 ac_save_LIBS="$LIBS"
 LIBS="-ltcl $MATHLIB $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 8669 "configure"
+#line 8264 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -8676,7 +8271,7 @@
 Tcl_Init()
 ; return 0; }
 EOF
-if { (eval echo configure:8680: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8275: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -8695,13 +8290,13 @@
   echo "$ac_t""no" 1>&6
 
 echo $ac_n "checking for Tcl_Init in -ltcl""... $ac_c" 1>&6
-echo "configure:8699: checking for Tcl_Init in -ltcl" >&5
+echo "configure:8294: checking for Tcl_Init in -ltcl" >&5
 ac_lib_var=`echo tcl'_'Tcl_Init | sed 'y%./+-%__p_%'`
 
 ac_save_LIBS="$LIBS"
 LIBS="-ltcl $MATHLIB $DLLIB $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 8705 "configure"
+#line 8300 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -8712,7 +8307,7 @@
 Tcl_Init()
 ; return 0; }
 EOF
-if { (eval echo configure:8716: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8311: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -8739,13 +8334,13 @@
 
 
 echo $ac_n "checking for Tcl_Init in -ltcl$tcltk_ver""... $ac_c" 1>&6
-echo "configure:8743: checking for Tcl_Init in -ltcl$tcltk_ver" >&5
+echo "configure:8338: checking for Tcl_Init in -ltcl$tcltk_ver" >&5
 ac_lib_var=`echo tcl$tcltk_ver'_'Tcl_Init | sed 'y%./+-%__p_%'`
 
 ac_save_LIBS="$LIBS"
 LIBS="-ltcl$tcltk_ver $MATHLIB $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 8749 "configure"
+#line 8344 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -8756,7 +8351,7 @@
 Tcl_Init()
 ; return 0; }
 EOF
-if { (eval echo configure:8760: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8355: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -8775,13 +8370,13 @@
   echo "$ac_t""no" 1>&6
 
 echo $ac_n "checking for Tcl_Init in -ltcl$tcltk_ver""... $ac_c" 1>&6
-echo "configure:8779: checking for Tcl_Init in -ltcl$tcltk_ver" >&5
+echo "configure:8374: checking for Tcl_Init in -ltcl$tcltk_ver" >&5
 ac_lib_var=`echo tcl$tcltk_ver'_'Tcl_Init | sed 'y%./+-%__p_%'`
 
 ac_save_LIBS="$LIBS"
 LIBS="-ltcl$tcltk_ver $MATHLIB $DLLIB $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 8785 "configure"
+#line 8380 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -8792,7 +8387,7 @@
 Tcl_Init()
 ; return 0; }
 EOF
-if { (eval echo configure:8796: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8391: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -8819,13 +8414,13 @@
 
 
 echo $ac_n "checking for Tcl_Init in -ltcl$tcltk_ver2""... $ac_c" 1>&6
-echo "configure:8823: checking for Tcl_Init in -ltcl$tcltk_ver2" >&5
+echo "configure:8418: checking for Tcl_Init in -ltcl$tcltk_ver2" >&5
 ac_lib_var=`echo tcl$tcltk_ver2'_'Tcl_Init | sed 'y%./+-%__p_%'`
 
 ac_save_LIBS="$LIBS"
 LIBS="-ltcl$tcltk_ver2 $MATHLIB $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 8829 "configure"
+#line 8424 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -8836,7 +8431,7 @@
 Tcl_Init()
 ; return 0; }
 EOF
-if { (eval echo configure:8840: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8435: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -8855,13 +8450,13 @@
   echo "$ac_t""no" 1>&6
 
 echo $ac_n "checking for Tcl_Init in -ltcl$tcltk_ver2""... $ac_c" 1>&6
-echo "configure:8859: checking for Tcl_Init in -ltcl$tcltk_ver2" >&5
+echo "configure:8454: checking for Tcl_Init in -ltcl$tcltk_ver2" >&5
 ac_lib_var=`echo tcl$tcltk_ver2'_'Tcl_Init | sed 'y%./+-%__p_%'`
 
 ac_save_LIBS="$LIBS"
 LIBS="-ltcl$tcltk_ver2 $MATHLIB $DLLIB $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 8865 "configure"
+#line 8460 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -8872,7 +8467,7 @@
 Tcl_Init()
 ; return 0; }
 EOF
-if { (eval echo configure:8876: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8471: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -8950,13 +8545,13 @@
 
 
 echo $ac_n "checking for Tk_MainWindow in -ltk""... $ac_c" 1>&6
-echo "configure:8954: checking for Tk_MainWindow in -ltk" >&5
+echo "configure:8549: checking for Tk_MainWindow in -ltk" >&5
 ac_lib_var=`echo tk'_'Tk_MainWindow | sed 'y%./+-%__p_%'`
 
 ac_save_LIBS="$LIBS"
 LIBS="-ltk $TCLLIB $MATHLIB $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 8960 "configure"
+#line 8555 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -8967,7 +8562,7 @@
 Tk_MainWindow()
 ; return 0; }
 EOF
-if { (eval echo configure:8971: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8566: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -8986,13 +8581,13 @@
   echo "$ac_t""no" 1>&6
 
 echo $ac_n "checking for Tk_MainWindow in -ltk""... $ac_c" 1>&6
-echo "configure:8990: checking for Tk_MainWindow in -ltk" >&5
+echo "configure:8585: checking for Tk_MainWindow in -ltk" >&5
 ac_lib_var=`echo tk'_'Tk_MainWindow | sed 'y%./+-%__p_%'`
 
 ac_save_LIBS="$LIBS"
 LIBS="-ltk $TCLLIB $MATHLIB $X_LIBS $X_PRE_LIBS -lX11 $X_EXTRA_LIBS $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 8996 "configure"
+#line 8591 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -9003,7 +8598,7 @@
 Tk_MainWindow()
 ; return 0; }
 EOF
-if { (eval echo configure:9007: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8602: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -9030,13 +8625,13 @@
 
 
 echo $ac_n "checking for Tk_MainWindow in -ltk$tcltk_ver""... $ac_c" 1>&6
-echo "configure:9034: checking for Tk_MainWindow in -ltk$tcltk_ver" >&5
+echo "configure:8629: checking for Tk_MainWindow in -ltk$tcltk_ver" >&5
 ac_lib_var=`echo tk$tcltk_ver'_'Tk_MainWindow | sed 'y%./+-%__p_%'`
 
 ac_save_LIBS="$LIBS"
 LIBS="-ltk$tcltk_ver $TCLLIB $MATHLIB $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 9040 "configure"
+#line 8635 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -9047,7 +8642,7 @@
 Tk_MainWindow()
 ; return 0; }
 EOF
-if { (eval echo configure:9051: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8646: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -9066,13 +8661,13 @@
   echo "$ac_t""no" 1>&6
 
 echo $ac_n "checking for Tk_MainWindow in -ltk$tcltk_ver""... $ac_c" 1>&6
-echo "configure:9070: checking for Tk_MainWindow in -ltk$tcltk_ver" >&5
+echo "configure:8665: checking for Tk_MainWindow in -ltk$tcltk_ver" >&5
 ac_lib_var=`echo tk$tcltk_ver'_'Tk_MainWindow | sed 'y%./+-%__p_%'`
 
 ac_save_LIBS="$LIBS"
 LIBS="-ltk$tcltk_ver $TCLLIB $MATHLIB $X_LIBS $X_PRE_LIBS -lX11 $X_EXTRA_LIBS $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 9076 "configure"
+#line 8671 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -9083,7 +8678,7 @@
 Tk_MainWindow()
 ; return 0; }
 EOF
-if { (eval echo configure:9087: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8682: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -9110,13 +8705,13 @@
 
 
 echo $ac_n "checking for Tk_MainWindow in -ltk$tcltk_ver2""... $ac_c" 1>&6
-echo "configure:9114: checking for Tk_MainWindow in -ltk$tcltk_ver2" >&5
+echo "configure:8709: checking for Tk_MainWindow in -ltk$tcltk_ver2" >&5
 ac_lib_var=`echo tk$tcltk_ver2'_'Tk_MainWindow | sed 'y%./+-%__p_%'`
 
 ac_save_LIBS="$LIBS"
 LIBS="-ltk$tcltk_ver2 $TCLLIB $MATHLIB $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 9120 "configure"
+#line 8715 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -9127,7 +8722,7 @@
 Tk_MainWindow()
 ; return 0; }
 EOF
-if { (eval echo configure:9131: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8726: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -9146,13 +8741,13 @@
   echo "$ac_t""no" 1>&6
 
 echo $ac_n "checking for Tk_MainWindow in -ltk$tcltk_ver2""... $ac_c" 1>&6
-echo "configure:9150: checking for Tk_MainWindow in -ltk$tcltk_ver2" >&5
+echo "configure:8745: checking for Tk_MainWindow in -ltk$tcltk_ver2" >&5
 ac_lib_var=`echo tk$tcltk_ver2'_'Tk_MainWindow | sed 'y%./+-%__p_%'`
 
 ac_save_LIBS="$LIBS"
 LIBS="-ltk$tcltk_ver2 $TCLLIB $MATHLIB $X_LIBS $X_PRE_LIBS -lX11 $X_EXTRA_LIBS $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 9156 "configure"
+#line 8751 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -9163,7 +8758,7 @@
 Tk_MainWindow()
 ; return 0; }
 EOF
-if { (eval echo configure:9167: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8762: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -9255,7 +8850,7 @@
 
 
 echo $ac_n "checking whether to use PostgreSQL""... $ac_c" 1>&6
-echo "configure:9259: checking whether to use PostgreSQL" >&5
+echo "configure:8854: checking whether to use PostgreSQL" >&5
 echo "$ac_t"""$with_postgres"" 1>&6
 case "$with_postgres" in
 	"no")	USE_POSTGRES=	;;
@@ -9282,7 +8877,7 @@
 
 
 echo $ac_n "checking for location of PostgreSQL includes""... $ac_c" 1>&6
-echo "configure:9286: checking for location of PostgreSQL includes" >&5
+echo "configure:8881: checking for location of PostgreSQL includes" >&5
 case "$with_postgres_includes" in
 y | ye | yes | n | no)
 	{ echo "configure: error: *** You must supply a directory to --with-postgres-includes." 1>&2; exit 1; }
@@ -9308,15 +8903,15 @@
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:9312: checking for $ac_hdr" >&5
+echo "configure:8907: checking for $ac_hdr" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 9315 "configure"
+#line 8910 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:9320: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:8915: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -9354,7 +8949,7 @@
 
 
 echo $ac_n "checking for location of PostgreSQL library""... $ac_c" 1>&6
-echo "configure:9358: checking for location of PostgreSQL library" >&5
+echo "configure:8953: checking for location of PostgreSQL library" >&5
 case "$with_postgres_libs" in
 y | ye | yes | n | no)
 	{ echo "configure: error: *** You must supply a directory to --with-postgres-libs." 1>&2; exit 1; }
@@ -9383,13 +8978,13 @@
 
 
 echo $ac_n "checking for PQsetdbLogin in -lpq""... $ac_c" 1>&6
-echo "configure:9387: checking for PQsetdbLogin in -lpq" >&5
+echo "configure:8982: checking for PQsetdbLogin in -lpq" >&5
 ac_lib_var=`echo pq'_'PQsetdbLogin | sed 'y%./+-%__p_%'`
 
 ac_save_LIBS="$LIBS"
 LIBS="-lpq  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 9393 "configure"
+#line 8988 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -9400,7 +8995,7 @@
 PQsetdbLogin()
 ; return 0; }
 EOF
-if { (eval echo configure:9404: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8999: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -9419,13 +9014,13 @@
   echo "$ac_t""no" 1>&6
 
 echo $ac_n "checking for PQsetdbLogin in -lpq""... $ac_c" 1>&6
-echo "configure:9423: checking for PQsetdbLogin in -lpq" >&5
+echo "configure:9018: checking for PQsetdbLogin in -lpq" >&5
 ac_lib_var=`echo pq'_'PQsetdbLogin | sed 'y%./+-%__p_%'`
 
 ac_save_LIBS="$LIBS"
 LIBS="-lpq -lssl -lcrypto $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 9429 "configure"
+#line 9024 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -9436,7 +9031,7 @@
 PQsetdbLogin()
 ; return 0; }
 EOF
-if { (eval echo configure:9440: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9035: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -9455,13 +9050,13 @@
   echo "$ac_t""no" 1>&6
 
 echo $ac_n "checking for PQsetdbLogin in -lpq""... $ac_c" 1>&6
-echo "configure:9459: checking for PQsetdbLogin in -lpq" >&5
+echo "configure:9054: checking for PQsetdbLogin in -lpq" >&5
 ac_lib_var=`echo pq'_'PQsetdbLogin | sed 'y%./+-%__p_%'`
 
 ac_save_LIBS="$LIBS"
 LIBS="-lpq -lcrypt $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 9465 "configure"
+#line 9060 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -9472,7 +9067,7 @@
 PQsetdbLogin()
 ; return 0; }
 EOF
-if { (eval echo configure:9476: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9071: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -9491,13 +9086,13 @@
   echo "$ac_t""no" 1>&6
 
 echo $ac_n "checking for PQsetdbLogin in -lpq""... $ac_c" 1>&6
-echo "configure:9495: checking for PQsetdbLogin in -lpq" >&5
+echo "configure:9090: checking for PQsetdbLogin in -lpq" >&5
 ac_lib_var=`echo pq'_'PQsetdbLogin | sed 'y%./+-%__p_%'`
 
 ac_save_LIBS="$LIBS"
 LIBS="-lpq -lcrypt -lssl -lcrypto $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 9501 "configure"
+#line 9096 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -9508,7 +9103,7 @@
 PQsetdbLogin()
 ; return 0; }
 EOF
-if { (eval echo configure:9512: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9107: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -9565,13 +9160,13 @@
 ac_save_ldflags="$LDFLAGS"
 LDFLAGS="$LDFLAGS $PQLIBPATH"
 echo $ac_n "checking for PQcmdTuples in -lpq""... $ac_c" 1>&6
-echo "configure:9569: checking for PQcmdTuples in -lpq" >&5
+echo "configure:9164: checking for PQcmdTuples in -lpq" >&5
 ac_lib_var=`echo pq'_'PQcmdTuples | sed 'y%./+-%__p_%'`
 
 ac_save_LIBS="$LIBS"
 LIBS="-lpq  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 9575 "configure"
+#line 9170 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -9582,7 +9177,7 @@
 PQcmdTuples()
 ; return 0; }
 EOF
-if { (eval echo configure:9586: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9181: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -9604,13 +9199,13 @@
   echo "$ac_t""no" 1>&6
 
 echo $ac_n "checking for PQcmdTuples in -lpq""... $ac_c" 1>&6
-echo "configure:9608: checking for PQcmdTuples in -lpq" >&5
+echo "configure:9203: checking for PQcmdTuples in -lpq" >&5
 ac_lib_var=`echo pq'_'PQcmdTuples | sed 'y%./+-%__p_%'`
 
 ac_save_LIBS="$LIBS"
 LIBS="-lpq -lcrypt $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 9614 "configure"
+#line 9209 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -9621,7 +9216,7 @@
 PQcmdTuples()
 ; return 0; }
 EOF
-if { (eval echo configure:9625: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9220: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -9664,7 +9259,7 @@
 
 
 echo $ac_n "checking whether to use MySQL""... $ac_c" 1>&6
-echo "configure:9668: checking whether to use MySQL" >&5
+echo "configure:9263: checking whether to use MySQL" >&5
 echo "$ac_t"""$with_mysql"" 1>&6
 case "$with_mysql" in
 	"no")	USE_MYSQL=	;;
@@ -9684,7 +9279,7 @@
 
 
 echo $ac_n "checking for location of MySQL includes""... $ac_c" 1>&6
-echo "configure:9688: checking for location of MySQL includes" >&5
+echo "configure:9283: checking for location of MySQL includes" >&5
 case "$with_mysql_includes" in
 y | ye | yes | n | no)
 	{ echo "configure: error: *** You must supply a directory to --with-mysql-includes." 1>&2; exit 1; }
@@ -9710,15 +9305,15 @@
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:9714: checking for $ac_hdr" >&5
+echo "configure:9309: checking for $ac_hdr" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 9717 "configure"
+#line 9312 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:9722: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:9317: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -9755,7 +9350,7 @@
 
   
 echo $ac_n "checking for location of MySQL library""... $ac_c" 1>&6
-echo "configure:9759: checking for location of MySQL library" >&5
+echo "configure:9354: checking for location of MySQL library" >&5
 case "$with_mysql_libs" in
 y | ye | yes | n | no)
 	{ echo "configure: error: *** You must supply a directory to --with-mysql-libs." 1>&2; exit 1; }
@@ -9786,13 +9381,13 @@
 
 
 echo $ac_n "checking for mysql_query in -lmysqlclient""... $ac_c" 1>&6
-echo "configure:9790: checking for mysql_query in -lmysqlclient" >&5
+echo "configure:9385: checking for mysql_query in -lmysqlclient" >&5
 ac_lib_var=`echo mysqlclient'_'mysql_query | sed 'y%./+-%__p_%'`
 
 ac_save_LIBS="$LIBS"
 LIBS="-lmysqlclient  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 9796 "configure"
+#line 9391 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -9803,7 +9398,7 @@
 mysql_query()
 ; return 0; }
 EOF
-if { (eval echo configure:9807: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9402: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -9822,13 +9417,13 @@
   echo "$ac_t""no" 1>&6
 
 echo $ac_n "checking for mysql_query in -lmysqlclient""... $ac_c" 1>&6
-echo "configure:9826: checking for mysql_query in -lmysqlclient" >&5
+echo "configure:9421: checking for mysql_query in -lmysqlclient" >&5
 ac_lib_var=`echo mysqlclient'_'mysql_query | sed 'y%./+-%__p_%'`
 
 ac_save_LIBS="$LIBS"
 LIBS="-lmysqlclient $MATHLIB $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 9832 "configure"
+#line 9427 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -9839,7 +9434,7 @@
 mysql_query()
 ; return 0; }
 EOF
-if { (eval echo configure:9843: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9438: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -9858,13 +9453,13 @@
   echo "$ac_t""no" 1>&6
 
 echo $ac_n "checking for mysql_query in -lmysqlclient""... $ac_c" 1>&6
-echo "configure:9862: checking for mysql_query in -lmysqlclient" >&5
+echo "configure:9457: checking for mysql_query in -lmysqlclient" >&5
 ac_lib_var=`echo mysqlclient'_'mysql_query | sed 'y%./+-%__p_%'`
 
 ac_save_LIBS="$LIBS"
 LIBS="-lmysqlclient $SOCKLIB $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 9868 "configure"
+#line 9463 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -9875,7 +9470,7 @@
 mysql_query()
 ; return 0; }
 EOF
-if { (eval echo configure:9879: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9474: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -9894,13 +9489,13 @@
   echo "$ac_t""no" 1>&6
 
 echo $ac_n "checking for mysql_query in -lmysqlclient""... $ac_c" 1>&6
-echo "configure:9898: checking for mysql_query in -lmysqlclient" >&5
+echo "configure:9493: checking for mysql_query in -lmysqlclient" >&5
 ac_lib_var=`echo mysqlclient'_'mysql_query | sed 'y%./+-%__p_%'`
 
 ac_save_LIBS="$LIBS"
 LIBS="-lmysqlclient $SOCKLIB $MATHLIB $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 9904 "configure"
+#line 9499 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -9911,7 +9506,7 @@
 mysql_query()
 ; return 0; }
 EOF
-if { (eval echo configure:9915: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9510: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -9930,13 +9525,13 @@
   echo "$ac_t""no" 1>&6
 
 echo $ac_n "checking for mysql_query in -lmysqlclient""... $ac_c" 1>&6
-echo "configure:9934: checking for mysql_query in -lmysqlclient" >&5
+echo "configure:9529: checking for mysql_query in -lmysqlclient" >&5
 ac_lib_var=`echo mysqlclient'_'mysql_query | sed 'y%./+-%__p_%'`
 
 ac_save_LIBS="$LIBS"
 LIBS="-lmysqlclient $ZLIB $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 9940 "configure"
+#line 9535 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -9947,7 +9542,7 @@
 mysql_query()
 ; return 0; }
 EOF
-if { (eval echo configure:9951: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9546: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -9966,13 +9561,13 @@
   echo "$ac_t""no" 1>&6
 
 echo $ac_n "checking for mysql_query in -lmysqlclient""... $ac_c" 1>&6
-echo "configure:9970: checking for mysql_query in -lmysqlclient" >&5
+echo "configure:9565: checking for mysql_query in -lmysqlclient" >&5
 ac_lib_var=`echo mysqlclient'_'mysql_query | sed 'y%./+-%__p_%'`
 
 ac_save_LIBS="$LIBS"
 LIBS="-lmysqlclient $ZLIB $MATHLIB $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 9976 "configure"
+#line 9571 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -9983,7 +9578,7 @@
 mysql_query()
 ; return 0; }
 EOF
-if { (eval echo configure:9987: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9582: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -10002,13 +9597,13 @@
   echo "$ac_t""no" 1>&6
 
 echo $ac_n "checking for mysql_query in -lmysqlclient""... $ac_c" 1>&6
-echo "configure:10006: checking for mysql_query in -lmysqlclient" >&5
+echo "configure:9601: checking for mysql_query in -lmysqlclient" >&5
 ac_lib_var=`echo mysqlclient'_'mysql_query | sed 'y%./+-%__p_%'`
 
 ac_save_LIBS="$LIBS"
 LIBS="-lmysqlclient $ZLIB $SOCKLIB $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 10012 "configure"
+#line 9607 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -10019,7 +9614,7 @@
 mysql_query()
 ; return 0; }
 EOF
-if { (eval echo configure:10023: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9618: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -10038,13 +9633,13 @@
   echo "$ac_t""no" 1>&6
 
 echo $ac_n "checking for mysql_query in -lmysqlclient""... $ac_c" 1>&6
-echo "configure:10042: checking for mysql_query in -lmysqlclient" >&5
+echo "configure:9637: checking for mysql_query in -lmysqlclient" >&5
 ac_lib_var=`echo mysqlclient'_'mysql_query | sed 'y%./+-%__p_%'`
 
 ac_save_LIBS="$LIBS"
 LIBS="-lmysqlclient $ZLIB $SOCKLIB $MATHLIB $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 10048 "configure"
+#line 9643 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -10055,7 +9650,7 @@
 mysql_query()
 ; return 0; }
 EOF
-if { (eval echo configure:10059: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9654: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -10145,7 +9740,7 @@
   # Extract the first word of "mysql_config", so it can be a program name with args.
 set dummy mysql_config; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:10149: checking for $ac_word" >&5
+echo "configure:9744: checking for $ac_word" >&5
 
 case "$MYSQLD_CONFIG" in
   /*)
@@ -10186,10 +9781,10 @@
 
     LIBS="$MYSQLDLIB $LIBS"
     echo $ac_n "checking for mysql_server_init""... $ac_c" 1>&6
-echo "configure:10190: checking for mysql_server_init" >&5
+echo "configure:9785: checking for mysql_server_init" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 10193 "configure"
+#line 9788 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char mysql_server_init(); below.  */
@@ -10212,7 +9807,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:10216: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9811: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_mysql_server_init=yes"
 else
@@ -10250,7 +9845,7 @@
 
 
 echo $ac_n "checking whether to use SQLite""... $ac_c" 1>&6
-echo "configure:10254: checking whether to use SQLite" >&5
+echo "configure:9849: checking whether to use SQLite" >&5
 echo "$ac_t"""$with_sqlite"" 1>&6
 case "$with_sqlite" in
 	"no")	USE_SQLITE=	;;
@@ -10270,7 +9865,7 @@
 
 
 echo $ac_n "checking for location of SQLite includes""... $ac_c" 1>&6
-echo "configure:10274: checking for location of SQLite includes" >&5
+echo "configure:9869: checking for location of SQLite includes" >&5
 case "$with_sqlite_includes" in
 y | ye | yes | n | no)
 	{ echo "configure: error: *** You must supply a directory to --with-sqlite-includes." 1>&2; exit 1; }
@@ -10296,15 +9891,15 @@
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:10300: checking for $ac_hdr" >&5
+echo "configure:9895: checking for $ac_hdr" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 10303 "configure"
+#line 9898 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:10308: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:9903: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -10347,7 +9942,7 @@
 
 
 echo $ac_n "checking for location of SQLite library""... $ac_c" 1>&6
-echo "configure:10351: checking for location of SQLite library" >&5
+echo "configure:9946: checking for location of SQLite library" >&5
 case "$with_sqlite_libs" in
 y | ye | yes | n | no)
 	{ echo "configure: error: *** You must supply a directory to --with-sqlite-libs." 1>&2; exit 1; }
@@ -10374,13 +9969,13 @@
 
 
 echo $ac_n "checking for sqlite3_open in -lsqlite3""... $ac_c" 1>&6
-echo "configure:10378: checking for sqlite3_open in -lsqlite3" >&5
+echo "configure:9973: checking for sqlite3_open in -lsqlite3" >&5
 ac_lib_var=`echo sqlite3'_'sqlite3_open | sed 'y%./+-%__p_%'`
 
 ac_save_LIBS="$LIBS"
 LIBS="-lsqlite3  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 10384 "configure"
+#line 9979 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -10391,7 +9986,7 @@
 sqlite3_open()
 ; return 0; }
 EOF
-if { (eval echo configure:10395: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9990: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -10410,13 +10005,13 @@
   echo "$ac_t""no" 1>&6
 
 echo $ac_n "checking for sqlite3_open in -lsqlite3""... $ac_c" 1>&6
-echo "configure:10414: checking for sqlite3_open in -lsqlite3" >&5
+echo "configure:10009: checking for sqlite3_open in -lsqlite3" >&5
 ac_lib_var=`echo sqlite3'_'sqlite3_open | sed 'y%./+-%__p_%'`
 
 ac_save_LIBS="$LIBS"
 LIBS="-lsqlite3 $MATHLIB $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 10420 "configure"
+#line 10015 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -10427,7 +10022,7 @@
 sqlite3_open()
 ; return 0; }
 EOF
-if { (eval echo configure:10431: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10026: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -10480,7 +10075,7 @@
 
 
 echo $ac_n "checking whether to use FFMPEG""... $ac_c" 1>&6
-echo "configure:10484: checking whether to use FFMPEG" >&5
+echo "configure:10079: checking whether to use FFMPEG" >&5
 echo "$ac_t"""$with_ffmpeg"" 1>&6
 case "$with_ffmpeg" in
 	"no")	USE_FFMPEG=	;;
@@ -10500,7 +10095,7 @@
 
 
 echo $ac_n "checking for location of FFMPEG includes""... $ac_c" 1>&6
-echo "configure:10504: checking for location of FFMPEG includes" >&5
+echo "configure:10099: checking for location of FFMPEG includes" >&5
 case "$with_ffmpeg_includes" in
 y | ye | yes | n | no)
 	{ echo "configure: error: *** You must supply a directory to --with-ffmpeg-includes." 1>&2; exit 1; }
@@ -10526,15 +10121,15 @@
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:10530: checking for $ac_hdr" >&5
+echo "configure:10125: checking for $ac_hdr" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 10533 "configure"
+#line 10128 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:10538: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:10133: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -10570,15 +10165,15 @@
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:10574: checking for $ac_hdr" >&5
+echo "configure:10169: checking for $ac_hdr" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 10577 "configure"
+#line 10172 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:10582: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:10177: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -10614,15 +10209,15 @@
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:10618: checking for $ac_hdr" >&5
+echo "configure:10213: checking for $ac_hdr" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 10621 "configure"
+#line 10216 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:10626: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:10221: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -10665,7 +10260,7 @@
 
 
 echo $ac_n "checking for location of FFMPEG library""... $ac_c" 1>&6
-echo "configure:10669: checking for location of FFMPEG library" >&5
+echo "configure:10264: checking for location of FFMPEG library" >&5
 case "$with_ffmpeg_libs" in
 y | ye | yes | n | no)
 	{ echo "configure: error: *** You must supply a directory to --with-ffmpeg-libs." 1>&2; exit 1; }
@@ -10692,13 +10287,13 @@
 
 
 echo $ac_n "checking for av_free in -lavutil""... $ac_c" 1>&6
-echo "configure:10696: checking for av_free in -lavutil" >&5
+echo "configure:10291: checking for av_free in -lavutil" >&5
 ac_lib_var=`echo avutil'_'av_free | sed 'y%./+-%__p_%'`
 
 ac_save_LIBS="$LIBS"
 LIBS="-lavutil  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 10702 "configure"
+#line 10297 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -10709,7 +10304,7 @@
 av_free()
 ; return 0; }
 EOF
-if { (eval echo configure:10713: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10308: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -10728,13 +10323,13 @@
   echo "$ac_t""no" 1>&6
 
 echo $ac_n "checking for av_free in -lavutil""... $ac_c" 1>&6
-echo "configure:10732: checking for av_free in -lavutil" >&5
+echo "configure:10327: checking for av_free in -lavutil" >&5
 ac_lib_var=`echo avutil'_'av_free | sed 'y%./+-%__p_%'`
 
 ac_save_LIBS="$LIBS"
 LIBS="-lavutil $MATHLIB $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 10738 "configure"
+#line 10333 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -10745,7 +10340,7 @@
 av_free()
 ; return 0; }
 EOF
-if { (eval echo configure:10749: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10344: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -10790,13 +10385,13 @@
 
 
 echo $ac_n "checking for avcodec_init in -lavcodec""... $ac_c" 1>&6
-echo "configure:10794: checking for avcodec_init in -lavcodec" >&5
+echo "configure:10389: checking for avcodec_init in -lavcodec" >&5
 ac_lib_var=`echo avcodec'_'avcodec_init | sed 'y%./+-%__p_%'`
 
 ac_save_LIBS="$LIBS"
 LIBS="-lavcodec $FFMPEGLIB  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 10800 "configure"
+#line 10395 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -10807,7 +10402,7 @@
 avcodec_init()
 ; return 0; }
 EOF
-if { (eval echo configure:10811: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10406: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -10826,13 +10421,13 @@
   echo "$ac_t""no" 1>&6
 
 echo $ac_n "checking for avcodec_init in -lavcodec""... $ac_c" 1>&6
-echo "configure:10830: checking for avcodec_init in -lavcodec" >&5
+echo "configure:10425: checking for avcodec_init in -lavcodec" >&5
 ac_lib_var=`echo avcodec'_'avcodec_init | sed 'y%./+-%__p_%'`
 
 ac_save_LIBS="$LIBS"
 LIBS="-lavcodec $FFMPEGLIB $MATHLIB $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 10836 "configure"
+#line 10431 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -10843,7 +10438,7 @@
 avcodec_init()
 ; return 0; }
 EOF
-if { (eval echo configure:10847: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10442: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -10888,13 +10483,13 @@
 
 
 echo $ac_n "checking for av_set_parameters in -lavformat""... $ac_c" 1>&6
-echo "configure:10892: checking for av_set_parameters in -lavformat" >&5
+echo "configure:10487: checking for av_set_parameters in -lavformat" >&5
 ac_lib_var=`echo avformat'_'av_set_parameters | sed 'y%./+-%__p_%'`
 
 ac_save_LIBS="$LIBS"
 LIBS="-lavformat $FFMPEGLIB  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 10898 "configure"
+#line 10493 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -10905,7 +10500,7 @@
 av_set_parameters()
 ; return 0; }
 EOF
-if { (eval echo configure:10909: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10504: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -10924,13 +10519,13 @@
   echo "$ac_t""no" 1>&6
 
 echo $ac_n "checking for av_set_parameters in -lavformat""... $ac_c" 1>&6
-echo "configure:10928: checking for av_set_parameters in -lavformat" >&5
+echo "configure:10523: checking for av_set_parameters in -lavformat" >&5
 ac_lib_var=`echo avformat'_'av_set_parameters | sed 'y%./+-%__p_%'`
 
 ac_save_LIBS="$LIBS"
 LIBS="-lavformat $FFMPEGLIB $MATHLIB $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 10934 "configure"
+#line 10529 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -10941,7 +10536,7 @@
 av_set_parameters()
 ; return 0; }
 EOF
-if { (eval echo configure:10945: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10540: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -11001,7 +10596,7 @@
 OPENGL_WINDOWS=
 
 echo $ac_n "checking whether to use OpenGL""... $ac_c" 1>&6
-echo "configure:11005: checking whether to use OpenGL" >&5
+echo "configure:10600: checking whether to use OpenGL" >&5
 echo "$ac_t"""$with_opengl"" 1>&6
 case "$with_opengl" in
 	n|no)
@@ -11035,7 +10630,7 @@
 
 
 echo $ac_n "checking for location of OpenGL includes""... $ac_c" 1>&6
-echo "configure:11039: checking for location of OpenGL includes" >&5
+echo "configure:10634: checking for location of OpenGL includes" >&5
 case "$with_opengl_includes" in
 y | ye | yes | n | no)
 	{ echo "configure: error: *** You must supply a directory to --with-opengl-includes." 1>&2; exit 1; }
@@ -11061,15 +10656,15 @@
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:11065: checking for $ac_hdr" >&5
+echo "configure:10660: checking for $ac_hdr" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 11068 "configure"
+#line 10663 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:11073: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:10668: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -11103,7 +10698,7 @@
 
 
 echo $ac_n "checking for location of OpenGL library""... $ac_c" 1>&6
-echo "configure:11107: checking for location of OpenGL library" >&5
+echo "configure:10702: checking for location of OpenGL library" >&5
 case "$with_opengl_libs" in
 y | ye | yes | n | no)
 	{ echo "configure: error: *** You must supply a directory to --with-opengl-libs." 1>&2; exit 1; }
@@ -11132,13 +10727,13 @@
 
 
 echo $ac_n "checking for glBegin in -lGL""... $ac_c" 1>&6
-echo "configure:11136: checking for glBegin in -lGL" >&5
+echo "configure:10731: checking for glBegin in -lGL" >&5
 ac_lib_var=`echo GL'_'glBegin | sed 'y%./+-%__p_%'`
 
 ac_save_LIBS="$LIBS"
 LIBS="-lGL $X_LIBS $X_PRE_LIBS -lX11 $X_EXTRA_LIBS $MATHLIB  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 11142 "configure"
+#line 10737 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -11149,7 +10744,7 @@
 glBegin()
 ; return 0; }
 EOF
-if { (eval echo configure:11153: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10748: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -11168,13 +10763,13 @@
   echo "$ac_t""no" 1>&6
 
 echo $ac_n "checking for glBegin in -lGL""... $ac_c" 1>&6
-echo "configure:11172: checking for glBegin in -lGL" >&5
+echo "configure:10767: checking for glBegin in -lGL" >&5
 ac_lib_var=`echo GL'_'glBegin | sed 'y%./+-%__p_%'`
 
 ac_save_LIBS="$LIBS"
 LIBS="-lGL $X_LIBS $X_PRE_LIBS -lX11 $X_EXTRA_LIBS $MATHLIB -lXext $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 11178 "configure"
+#line 10773 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -11185,7 +10780,7 @@
 glBegin()
 ; return 0; }
 EOF
-if { (eval echo configure:11189: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10784: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -11204,13 +10799,13 @@
   echo "$ac_t""no" 1>&6
 
 echo $ac_n "checking for glBegin in -lGL""... $ac_c" 1>&6
-echo "configure:11208: checking for glBegin in -lGL" >&5
+echo "configure:10803: checking for glBegin in -lGL" >&5
 ac_lib_var=`echo GL'_'glBegin | sed 'y%./+-%__p_%'`
 
 ac_save_LIBS="$LIBS"
 LIBS="-lGL $X_LIBS $X_PRE_LIBS -lX11 $X_EXTRA_LIBS $MATHLIB -lpthread $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 11214 "configure"
+#line 10809 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -11221,7 +10816,7 @@
 glBegin()
 ; return 0; }
 EOF
-if { (eval echo configure:11225: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10820: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -11240,13 +10835,13 @@
   echo "$ac_t""no" 1>&6
 
 echo $ac_n "checking for glBegin in -lGL""... $ac_c" 1>&6
-echo "configure:11244: checking for glBegin in -lGL" >&5
+echo "configure:10839: checking for glBegin in -lGL" >&5
 ac_lib_var=`echo GL'_'glBegin | sed 'y%./+-%__p_%'`
 
 ac_save_LIBS="$LIBS"
 LIBS="-lGL $X_LIBS $X_PRE_LIBS -lX11 $X_EXTRA_LIBS $MATHLIB -lpthread -lXext $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 11250 "configure"
+#line 10845 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -11257,7 +10852,7 @@
 glBegin()
 ; return 0; }
 EOF
-if { (eval echo configure:11261: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10856: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -11319,13 +10914,13 @@
 
 
 echo $ac_n "checking for gluBeginCurve in -lGLU""... $ac_c" 1>&6
-echo "configure:11323: checking for gluBeginCurve in -lGLU" >&5
+echo "configure:10918: checking for gluBeginCurve in -lGLU" >&5
 ac_lib_var=`echo GLU'_'gluBeginCurve | sed 'y%./+-%__p_%'`
 
 ac_save_LIBS="$LIBS"
 LIBS="-lGLU $OPENGLLIB $X_LIBS $X_PRE_LIBS -lX11 $X_EXTRA_LIBS $MATHLIB  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 11329 "configure"
+#line 10924 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -11336,7 +10931,7 @@
 gluBeginCurve()
 ; return 0; }
 EOF
-if { (eval echo configure:11340: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10935: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -11355,13 +10950,13 @@
   echo "$ac_t""no" 1>&6
 
 echo $ac_n "checking for gluBeginCurve in -lGLU""... $ac_c" 1>&6
-echo "configure:11359: checking for gluBeginCurve in -lGLU" >&5
+echo "configure:10954: checking for gluBeginCurve in -lGLU" >&5
 ac_lib_var=`echo GLU'_'gluBeginCurve | sed 'y%./+-%__p_%'`
 
 ac_save_LIBS="$LIBS"
 LIBS="-lGLU $OPENGLLIB $X_LIBS $X_PRE_LIBS -lX11 $X_EXTRA_LIBS $MATHLIB -lstdc++ $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 11365 "configure"
+#line 10960 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -11372,7 +10967,7 @@
 gluBeginCurve()
 ; return 0; }
 EOF
-if { (eval echo configure:11376: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10971: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -11419,10 +11014,10 @@
 LIBS=" $OPENGLLIB $LIBS"
 LDFLAGS=" $LDFLAGS"
 echo $ac_n "checking for glXCreatePbuffer""... $ac_c" 1>&6
-echo "configure:11423: checking for glXCreatePbuffer" >&5
+echo "configure:11018: checking for glXCreatePbuffer" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 11426 "configure"
+#line 11021 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char glXCreatePbuffer(); below.  */
@@ -11445,7 +11040,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:11449: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11044: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_glXCreatePbuffer=yes"
 else
@@ -11482,10 +11077,10 @@
 LIBS=" $OPENGLLIB $LIBS"
 LDFLAGS=" $LDFLAGS"
 echo $ac_n "checking for glXCreateGLXPixmap""... $ac_c" 1>&6
-echo "configure:11486: checking for glXCreateGLXPixmap" >&5
+echo "configure:11081: checking for glXCreateGLXPixmap" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 11489 "configure"
+#line 11084 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char glXCreateGLXPixmap(); below.  */
@@ -11508,7 +11103,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:11512: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11107: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_glXCreateGLXPixmap=yes"
 else
@@ -11551,7 +11146,7 @@
 
 
 echo $ac_n "checking for location of OpenGL framework""... $ac_c" 1>&6
-echo "configure:11555: checking for location of OpenGL framework" >&5
+echo "configure:11150: checking for location of OpenGL framework" >&5
 case "$with_opengl_framework" in
 y | ye | yes | n | no)
 	{ echo "configure: error: *** You must supply a directory to --with-opengl-framework." 1>&2; exit 1; }
@@ -11575,15 +11170,15 @@
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:11579: checking for $ac_hdr" >&5
+echo "configure:11174: checking for $ac_hdr" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 11582 "configure"
+#line 11177 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:11587: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:11182: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -11619,10 +11214,10 @@
 LIBS="-framework OpenGL -framework AGL -framework ApplicationServices  $LIBS"
 LDFLAGS="$OPENGLPATH $LDFLAGS"
 echo $ac_n "checking for glBegin""... $ac_c" 1>&6
-echo "configure:11623: checking for glBegin" >&5
+echo "configure:11218: checking for glBegin" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 11626 "configure"
+#line 11221 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char glBegin(); below.  */
@@ -11645,7 +11240,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:11649: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11244: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_glBegin=yes"
 else
@@ -11682,10 +11277,10 @@
 LIBS=" $OPENGLLIB $LIBS"
 LDFLAGS="$OPENGLPATH $LDFLAGS"
 echo $ac_n "checking for gluBeginCurve""... $ac_c" 1>&6
-echo "configure:11686: checking for gluBeginCurve" >&5
+echo "configure:11281: checking for gluBeginCurve" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 11689 "configure"
+#line 11284 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char gluBeginCurve(); below.  */
@@ -11708,7 +11303,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:11712: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11307: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_gluBeginCurve=yes"
 else
@@ -11756,7 +11351,7 @@
 
 
 echo $ac_n "checking for location of OpenGL includes""... $ac_c" 1>&6
-echo "configure:11760: checking for location of OpenGL includes" >&5
+echo "configure:11355: checking for location of OpenGL includes" >&5
 case "$with_opengl_includes" in
 y | ye | yes | n | no)
 	{ echo "configure: error: *** You must supply a directory to --with-opengl-includes." 1>&2; exit 1; }
@@ -11782,15 +11377,15 @@
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:11786: checking for $ac_hdr" >&5
+echo "configure:11381: checking for $ac_hdr" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 11789 "configure"
+#line 11384 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:11794: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:11389: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -11824,7 +11419,7 @@
 
 
 echo $ac_n "checking for location of OpenGL library""... $ac_c" 1>&6
-echo "configure:11828: checking for location of OpenGL library" >&5
+echo "configure:11423: checking for location of OpenGL library" >&5
 case "$with_opengl_libs" in
 y | ye | yes | n | no)
 	{ echo "configure: error: *** You must supply a directory to --with-opengl-libs." 1>&2; exit 1; }
@@ -11849,18 +11444,18 @@
 ac_save_ldflags="$LDFLAGS"
 ac_save_libs="$LIBS"
 echo $ac_n "checking for OpenGL library""... $ac_c" 1>&6
-echo "configure:11853: checking for OpenGL library" >&5
+echo "configure:11448: checking for OpenGL library" >&5
 LDFLAGS="$OPENGL_LIB_PATH $LDFLAGS"
 LIBS="-lopengl32  "
 cat > conftest.$ac_ext <<EOF
-#line 11857 "configure"
+#line 11452 "configure"
 #include "confdefs.h"
 #include <GL/gl.h>
 int main() {
 glEnd();
 ; return 0; }
 EOF
-if { (eval echo configure:11864: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11459: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   
 echo "$ac_t""found" 1>&6
@@ -11884,18 +11479,18 @@
 ac_save_ldflags="$LDFLAGS"
 ac_save_libs="$LIBS"
 echo $ac_n "checking for GLU library""... $ac_c" 1>&6
-echo "configure:11888: checking for GLU library" >&5
+echo "configure:11483: checking for GLU library" >&5
 LDFLAGS="$OPENGL_LIB_PATH $LDFLAGS"
 LIBS="-lglu32 $OPENGLLIB "
 cat > conftest.$ac_ext <<EOF
-#line 11892 "configure"
+#line 11487 "configure"
 #include "confdefs.h"
 #include <GL/glu.h>
 int main() {
 gluNewQuadric();
 ; return 0; }
 EOF
-if { (eval echo configure:11899: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11494: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   
 echo "$ac_t""found" 1>&6
@@ -11944,7 +11539,7 @@
 
 
 echo $ac_n "checking whether to use ODBC""... $ac_c" 1>&6
-echo "configure:11948: checking whether to use ODBC" >&5
+echo "configure:11543: checking whether to use ODBC" >&5
 echo "$ac_t"""$with_odbc"" 1>&6
 case "$with_odbc" in
 	"no")	USE_ODBC=	;;
@@ -11963,7 +11558,7 @@
 
 
 echo $ac_n "checking for location of ODBC includes""... $ac_c" 1>&6
-echo "configure:11967: checking for location of ODBC includes" >&5
+echo "configure:11562: checking for location of ODBC includes" >&5
 case "$with_odbc_includes" in
 y | ye | yes | n | no)
 	{ echo "configure: error: *** You must supply a directory to --with-odbc-includes." 1>&2; exit 1; }
@@ -11989,15 +11584,15 @@
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:11993: checking for $ac_hdr" >&5
+echo "configure:11588: checking for $ac_hdr" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 11996 "configure"
+#line 11591 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:12001: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:11596: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -12031,7 +11626,7 @@
 
 
 echo $ac_n "checking for location of ODBC library""... $ac_c" 1>&6
-echo "configure:12035: checking for location of ODBC library" >&5
+echo "configure:11630: checking for location of ODBC library" >&5
 case "$with_odbc_libs" in
 y | ye | yes | n | no)
 	{ echo "configure: error: *** You must supply a directory to --with-odbc-libs." 1>&2; exit 1; }
@@ -12056,13 +11651,13 @@
 
 
 echo $ac_n "checking for SQLConnect in -lodbc""... $ac_c" 1>&6
-echo "configure:12060: checking for SQLConnect in -lodbc" >&5
+echo "configure:11655: checking for SQLConnect in -lodbc" >&5
 ac_lib_var=`echo odbc'_'SQLConnect | sed 'y%./+-%__p_%'`
 
 ac_save_LIBS="$LIBS"
 LIBS="-lodbc $ICONVLIB  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 12066 "configure"
+#line 11661 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -12073,7 +11668,7 @@
 SQLConnect()
 ; return 0; }
 EOF
-if { (eval echo configure:12077: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11672: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -12098,13 +11693,13 @@
 
 
 echo $ac_n "checking for SQLConnect in -liodbc""... $ac_c" 1>&6
-echo "configure:12102: checking for SQLConnect in -liodbc" >&5
+echo "configure:11697: checking for SQLConnect in -liodbc" >&5
 ac_lib_var=`echo iodbc'_'SQLConnect | sed 'y%./+-%__p_%'`
 
 ac_save_LIBS="$LIBS"
 LIBS="-liodbc  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 12108 "configure"
+#line 11703 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -12115,7 +11710,7 @@
 SQLConnect()
 ; return 0; }
 EOF
-if { (eval echo configure:12119: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11714: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -12140,11 +11735,11 @@
 ac_save_ldflags="$LDFLAGS"
 ac_save_libs="$LIBS"
 echo $ac_n "checking for ODBC library""... $ac_c" 1>&6
-echo "configure:12144: checking for ODBC library" >&5
+echo "configure:11739: checking for ODBC library" >&5
 LDFLAGS="$ODBCLIB $LDFLAGS"
 LIBS="-lodbc32  "
 cat > conftest.$ac_ext <<EOF
-#line 12148 "configure"
+#line 11743 "configure"
 #include "confdefs.h"
 #include <windows.h>
 #include <sql.h>
@@ -12152,7 +11747,7 @@
 SQLAllocEnv((SQLHENV *)0);
 ; return 0; }
 EOF
-if { (eval echo configure:12156: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11751: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   
 echo "$ac_t""found" 1>&6
@@ -12201,7 +11796,7 @@
 
 
 echo $ac_n "checking whether to use FFTW""... $ac_c" 1>&6
-echo "configure:12205: checking whether to use FFTW" >&5
+echo "configure:11800: checking whether to use FFTW" >&5
 echo "$ac_t"""$with_fftw"" 1>&6
 case "$with_fftw" in
 	"no")	USE_FFTW=	;;
@@ -12220,7 +11815,7 @@
 
 
 echo $ac_n "checking for location of FFTW includes""... $ac_c" 1>&6
-echo "configure:12224: checking for location of FFTW includes" >&5
+echo "configure:11819: checking for location of FFTW includes" >&5
 case "$with_fftw_includes" in
 y | ye | yes | n | no)
 	{ echo "configure: error: *** You must supply a directory to --with-fftw-includes." 1>&2; exit 1; }
@@ -12246,15 +11841,15 @@
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:12250: checking for $ac_hdr" >&5
+echo "configure:11845: checking for $ac_hdr" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 12253 "configure"
+#line 11848 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:12258: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:11853: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -12282,15 +11877,15 @@
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:12286: checking for $ac_hdr" >&5
+echo "configure:11881: checking for $ac_hdr" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 12289 "configure"
+#line 11884 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:12294: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:11889: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -12318,15 +11913,15 @@
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:12322: checking for $ac_hdr" >&5
+echo "configure:11917: checking for $ac_hdr" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 12325 "configure"
+#line 11920 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:12330: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:11925: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -12372,7 +11967,7 @@
 
 
 echo $ac_n "checking for location of FFTW library""... $ac_c" 1>&6
-echo "configure:12376: checking for location of FFTW library" >&5
+echo "configure:11971: checking for location of FFTW library" >&5
 case "$with_fftw_libs" in
 y | ye | yes | n | no)
 	{ echo "configure: error: *** You must supply a directory to --with-fftw-libs." 1>&2; exit 1; }
@@ -12397,13 +11992,13 @@
 
 
 echo $ac_n "checking for fftw_execute in -lfftw3""... $ac_c" 1>&6
-echo "configure:12401: checking for fftw_execute in -lfftw3" >&5
+echo "configure:11996: checking for fftw_execute in -lfftw3" >&5
 ac_lib_var=`echo fftw3'_'fftw_execute | sed 'y%./+-%__p_%'`
 
 ac_save_LIBS="$LIBS"
 LIBS="-lfftw3 $MATHLIB $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 12407 "configure"
+#line 12002 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -12414,7 +12009,7 @@
 fftw_execute()
 ; return 0; }
 EOF
-if { (eval echo configure:12418: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:12013: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -12439,13 +12034,13 @@
 
 
 echo $ac_n "checking for fftwnd_one in -lfftw""... $ac_c" 1>&6
-echo "configure:12443: checking for fftwnd_one in -lfftw" >&5
+echo "configure:12038: checking for fftwnd_one in -lfftw" >&5
 ac_lib_var=`echo fftw'_'fftwnd_one | sed 'y%./+-%__p_%'`
 
 ac_save_LIBS="$LIBS"
 LIBS="-lfftw $MATHLIB $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 12449 "configure"
+#line 12044 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -12456,7 +12051,7 @@
 fftwnd_one()
 ; return 0; }
 EOF
-if { (eval echo configure:12460: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:12055: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -12481,13 +12076,13 @@
 
 
 echo $ac_n "checking for fftwnd_one in -ldfftw""... $ac_c" 1>&6
-echo "configure:12485: checking for fftwnd_one in -ldfftw" >&5
+echo "configure:12080: checking for fftwnd_one in -ldfftw" >&5
 ac_lib_var=`echo dfftw'_'fftwnd_one | sed 'y%./+-%__p_%'`
 
 ac_save_LIBS="$LIBS"
 LIBS="-ldfftw $MATHLIB $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 12491 "configure"
+#line 12086 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -12498,7 +12093,7 @@
 fftwnd_one()
 ; return 0; }
 EOF
-if { (eval echo configure:12502: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:12097: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -12555,7 +12150,7 @@
 
 
 echo $ac_n "checking whether to use BLAS""... $ac_c" 1>&6
-echo "configure:12559: checking whether to use BLAS" >&5
+echo "configure:12154: checking whether to use BLAS" >&5
 echo "$ac_t"""$with_blas"" 1>&6
 case "$with_blas" in
 	"no")	USE_BLAS=	;;
@@ -12576,7 +12171,7 @@
 
 
 echo $ac_n "checking for location of BLAS includes""... $ac_c" 1>&6
-echo "configure:12580: checking for location of BLAS includes" >&5
+echo "configure:12175: checking for location of BLAS includes" >&5
 case "$with_blas_includes" in
 y | ye | yes | n | no)
 	{ echo "configure: error: *** You must supply a directory to --with-blas-includes." 1>&2; exit 1; }
@@ -12596,7 +12191,7 @@
 
 
 echo $ac_n "checking for location of BLAS library""... $ac_c" 1>&6
-echo "configure:12600: checking for location of BLAS library" >&5
+echo "configure:12195: checking for location of BLAS library" >&5
 case "$with_blas_libs" in
 y | ye | yes | n | no)
 	{ echo "configure: error: *** You must supply a directory to --with-blas-libs." 1>&2; exit 1; }
@@ -12622,15 +12217,15 @@
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:12626: checking for $ac_hdr" >&5
+echo "configure:12221: checking for $ac_hdr" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 12629 "configure"
+#line 12224 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:12634: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:12229: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -12665,13 +12260,13 @@
 
 
 echo $ac_n "checking for dnrm2_ in -lblas""... $ac_c" 1>&6
-echo "configure:12669: checking for dnrm2_ in -lblas" >&5
+echo "configure:12264: checking for dnrm2_ in -lblas" >&5
 ac_lib_var=`echo blas'_'dnrm2_ | sed 'y%./+-%__p_%'`
 
 ac_save_LIBS="$LIBS"
 LIBS="-lblas $MATHLIB  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 12675 "configure"
+#line 12270 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -12682,7 +12277,7 @@
 dnrm2_()
 ; return 0; }
 EOF
-if { (eval echo configure:12686: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:12281: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -12701,13 +12296,13 @@
   echo "$ac_t""no" 1>&6
 
 echo $ac_n "checking for dnrm2_ in -lblas""... $ac_c" 1>&6
-echo "configure:12705: checking for dnrm2_ in -lblas" >&5
+echo "configure:12300: checking for dnrm2_ in -lblas" >&5
 ac_lib_var=`echo blas'_'dnrm2_ | sed 'y%./+-%__p_%'`
 
 ac_save_LIBS="$LIBS"
 LIBS="-lblas $MATHLIB -lg2c $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 12711 "configure"
+#line 12306 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -12718,7 +12313,7 @@
 dnrm2_()
 ; return 0; }
 EOF
-if { (eval echo configure:12722: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:12317: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -12762,13 +12357,13 @@
 save_LDFLAGS="$LDFLAGS"
 LDFLAGS="$BLASLIB $LDFLAGS"
 echo $ac_n "checking for ATL_xerbla in -latlas""... $ac_c" 1>&6
-echo "configure:12766: checking for ATL_xerbla in -latlas" >&5
+echo "configure:12361: checking for ATL_xerbla in -latlas" >&5
 ac_lib_var=`echo atlas'_'ATL_xerbla | sed 'y%./+-%__p_%'`
 
 ac_save_LIBS="$LIBS"
 LIBS="-latlas  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 12772 "configure"
+#line 12367 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -12779,7 +12374,7 @@
 ATL_xerbla()
 ; return 0; }
 EOF
-if { (eval echo configure:12783: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:12378: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -12794,13 +12389,13 @@
 if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
   echo "$ac_t""yes" 1>&6
   echo $ac_n "checking for sgemm_ in -lf77blas""... $ac_c" 1>&6
-echo "configure:12798: checking for sgemm_ in -lf77blas" >&5
+echo "configure:12393: checking for sgemm_ in -lf77blas" >&5
 ac_lib_var=`echo f77blas'_'sgemm_ | sed 'y%./+-%__p_%'`
 
 ac_save_LIBS="$LIBS"
 LIBS="-lf77blas -latlas $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 12804 "configure"
+#line 12399 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -12811,7 +12406,7 @@
 sgemm_()
 ; return 0; }
 EOF
-if { (eval echo configure:12815: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:12410: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -12826,13 +12421,13 @@
 if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
   echo "$ac_t""yes" 1>&6
   echo $ac_n "checking for cblas_dgemm in -lcblas""... $ac_c" 1>&6
-echo "configure:12830: checking for cblas_dgemm in -lcblas" >&5
+echo "configure:12425: checking for cblas_dgemm in -lcblas" >&5
 ac_lib_var=`echo cblas'_'cblas_dgemm | sed 'y%./+-%__p_%'`
 
 ac_save_LIBS="$LIBS"
 LIBS="-lcblas -lf77blas -latlas $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 12836 "configure"
+#line 12431 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -12843,7 +12438,7 @@
 cblas_dgemm()
 ; return 0; }
 EOF
-if { (eval echo configure:12847: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:12442: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -12888,16 +12483,16 @@
 	save_LIBS="$LIBS"
 	LIBS="$vlib_flags $LIBS"
 	echo $ac_n "checking for sgemm in $vlib_flags""... $ac_c" 1>&6
-echo "configure:12892: checking for sgemm in $vlib_flags" >&5
+echo "configure:12487: checking for sgemm in $vlib_flags" >&5
 	cat > conftest.$ac_ext <<EOF
-#line 12894 "configure"
+#line 12489 "configure"
 #include "confdefs.h"
 
 int main() {
 sgemm
 ; return 0; }
 EOF
-if { (eval echo configure:12901: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:12496: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   blas_ok=yes; BLASLIB="$vlib_flags"
 else
@@ -12915,13 +12510,13 @@
 # BLAS in PhiPACK libraries? (requires generic BLAS, too)
 if test $blas_ok = no; then
 	echo $ac_n "checking for sgemm_ in -lblas""... $ac_c" 1>&6
-echo "configure:12919: checking for sgemm_ in -lblas" >&5
+echo "configure:12514: checking for sgemm_ in -lblas" >&5
 ac_lib_var=`echo blas'_'sgemm_ | sed 'y%./+-%__p_%'`
 
 ac_save_LIBS="$LIBS"
 LIBS="-lblas  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 12925 "configure"
+#line 12520 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -12932,7 +12527,7 @@
 sgemm_()
 ; return 0; }
 EOF
-if { (eval echo configure:12936: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:12531: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -12947,13 +12542,13 @@
 if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
   echo "$ac_t""yes" 1>&6
   echo $ac_n "checking for dgemm_ in -ldgemm""... $ac_c" 1>&6
-echo "configure:12951: checking for dgemm_ in -ldgemm" >&5
+echo "configure:12546: checking for dgemm_ in -ldgemm" >&5
 ac_lib_var=`echo dgemm'_'dgemm_ | sed 'y%./+-%__p_%'`
 
 ac_save_LIBS="$LIBS"
 LIBS="-ldgemm -lblas $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 12957 "configure"
+#line 12552 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -12964,7 +12559,7 @@
 dgemm_()
 ; return 0; }
 EOF
-if { (eval echo configure:12968: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:12563: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -12979,13 +12574,13 @@
 if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
   echo "$ac_t""yes" 1>&6
   echo $ac_n "checking for sgemm_ in -lsgemm""... $ac_c" 1>&6
-echo "configure:12983: checking for sgemm_ in -lsgemm" >&5
+echo "configure:12578: checking for sgemm_ in -lsgemm" >&5
 ac_lib_var=`echo sgemm'_'sgemm_ | sed 'y%./+-%__p_%'`
 
 ac_save_LIBS="$LIBS"
 LIBS="-lsgemm -lblas $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 12989 "configure"
+#line 12584 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -12996,7 +12591,7 @@
 sgemm_()
 ; return 0; }
 EOF
-if { (eval echo configure:13000: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:12595: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -13030,13 +12625,13 @@
 if test $blas_ok = no; then
 	if test "x$GCC" != xyes; then # only works with Sun CC
 		echo $ac_n "checking for acosp in -lsunmath""... $ac_c" 1>&6
-echo "configure:13034: checking for acosp in -lsunmath" >&5
+echo "configure:12629: checking for acosp in -lsunmath" >&5
 ac_lib_var=`echo sunmath'_'acosp | sed 'y%./+-%__p_%'`
 
 ac_save_LIBS="$LIBS"
 LIBS="-lsunmath  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 13040 "configure"
+#line 12635 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -13047,7 +12642,7 @@
 acosp()
 ; return 0; }
 EOF
-if { (eval echo configure:13051: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:12646: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -13062,13 +12657,13 @@
 if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
   echo "$ac_t""yes" 1>&6
   echo $ac_n "checking for sgemm_ in -lsunperf""... $ac_c" 1>&6
-echo "configure:13066: checking for sgemm_ in -lsunperf" >&5
+echo "configure:12661: checking for sgemm_ in -lsunperf" >&5
 ac_lib_var=`echo sunperf'_'sgemm_ | sed 'y%./+-%__p_%'`
 
 ac_save_LIBS="$LIBS"
 LIBS="-lsunperf -lsunmath $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 13072 "configure"
+#line 12667 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -13079,7 +12674,7 @@
 sgemm_()
 ; return 0; }
 EOF
-if { (eval echo configure:13083: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:12678: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -13109,13 +12704,13 @@
 # Generic BLAS library
 if test $blas_ok = no; then
 	echo $ac_n "checking for sgemm_ in -lblas""... $ac_c" 1>&6
-echo "configure:13113: checking for sgemm_ in -lblas" >&5
+echo "configure:12708: checking for sgemm_ in -lblas" >&5
 ac_lib_var=`echo blas'_'sgemm_ | sed 'y%./+-%__p_%'`
 
 ac_save_LIBS="$LIBS"
 LIBS="-lblas  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 13119 "configure"
+#line 12714 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -13126,7 +12721,7 @@
 sgemm_()
 ; return 0; }
 EOF
-if { (eval echo configure:13130: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:12725: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -13165,7 +12760,7 @@
 
 
 echo $ac_n "checking whether to use LAPACK""... $ac_c" 1>&6
-echo "configure:13169: checking whether to use LAPACK" >&5
+echo "configure:12764: checking whether to use LAPACK" >&5
 echo "$ac_t"""$with_lapack"" 1>&6
 case "$with_lapack" in
 	"no")	USE_LAPACK=	;;
@@ -13190,7 +12785,7 @@
 
 
 echo $ac_n "checking for location of LAPACK includes""... $ac_c" 1>&6
-echo "configure:13194: checking for location of LAPACK includes" >&5
+echo "configure:12789: checking for location of LAPACK includes" >&5
 case "$with_lapack_includes" in
 y | ye | yes | n | no)
 	{ echo "configure: error: *** You must supply a directory to --with-lapack-includes." 1>&2; exit 1; }
@@ -13210,7 +12805,7 @@
 
 
 echo $ac_n "checking for location of LAPACK library""... $ac_c" 1>&6
-echo "configure:13214: checking for location of LAPACK library" >&5
+echo "configure:12809: checking for location of LAPACK library" >&5
 case "$with_lapack_libs" in
 y | ye | yes | n | no)
 	{ echo "configure: error: *** You must supply a directory to --with-lapack-libs." 1>&2; exit 1; }
@@ -13236,15 +12831,15 @@
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:13240: checking for $ac_hdr" >&5
+echo "configure:12835: checking for $ac_hdr" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 13243 "configure"
+#line 12838 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:13248: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:12843: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -13276,10 +12871,10 @@
 	save_LIBS="$LIBS"; LIBS="$LIBS $BLASLIB $MATHLIB $FLIBS"
 	save_LDFLAGS="$LDFLAGS"; LDFLAGS="$LAPACKLIB $LDFLAGS"
 	echo $ac_n "checking for dsegv_""... $ac_c" 1>&6
-echo "configure:13280: checking for dsegv_" >&5
+echo "configure:12875: checking for dsegv_" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 13283 "configure"
+#line 12878 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char dsegv_(); below.  */
@@ -13302,7 +12897,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:13306: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:12901: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_dsegv_=yes"
 else
@@ -13329,13 +12924,13 @@
 	save_libs="$LIBS"; LIBS="$BLASLIB $MATHLIB $LIBS"
 	save_LDFLAGS="$LDFLAGS"; LDFLAGS="$LAPACKLIB $LDFLAGS"
 	echo $ac_n "checking for desgv_ in -llapack""... $ac_c" 1>&6
-echo "configure:13333: checking for desgv_ in -llapack" >&5
+echo "configure:12928: checking for desgv_ in -llapack" >&5
 ac_lib_var=`echo lapack'_'desgv_ | sed 'y%./+-%__p_%'`
 
 ac_save_LIBS="$LIBS"
 LIBS="-llapack $FLIBS $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 13339 "configure"
+#line 12934 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -13346,7 +12941,7 @@
 desgv_()
 ; return 0; }
 EOF
-if { (eval echo configure:13350: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:12945: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -13378,13 +12973,13 @@
 
 
 echo $ac_n "checking for dgesv_ in -llapack""... $ac_c" 1>&6
-echo "configure:13382: checking for dgesv_ in -llapack" >&5
+echo "configure:12977: checking for dgesv_ in -llapack" >&5
 ac_lib_var=`echo lapack'_'dgesv_ | sed 'y%./+-%__p_%'`
 
 ac_save_LIBS="$LIBS"
 LIBS="-llapack $BLASLIB $MATHLIB  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 13388 "configure"
+#line 12983 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -13395,7 +12990,7 @@
 dgesv_()
 ; return 0; }
 EOF
-if { (eval echo configure:13399: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:12994: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -13414,13 +13009,13 @@
   echo "$ac_t""no" 1>&6
 
 echo $ac_n "checking for dgesv_ in -llapack""... $ac_c" 1>&6
-echo "configure:13418: checking for dgesv_ in -llapack" >&5
+echo "configure:13013: checking for dgesv_ in -llapack" >&5
 ac_lib_var=`echo lapack'_'dgesv_ | sed 'y%./+-%__p_%'`
 
 ac_save_LIBS="$LIBS"
 LIBS="-llapack $BLASLIB $MATHLIB -lg2c $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 13424 "configure"
+#line 13019 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -13431,7 +13026,7 @@
 dgesv_()
 ; return 0; }
 EOF
-if { (eval echo configure:13435: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:13030: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -13487,7 +13082,7 @@
 
 
 echo $ac_n "checking whether to use Motif""... $ac_c" 1>&6
-echo "configure:13491: checking whether to use Motif" >&5
+echo "configure:13086: checking whether to use Motif" >&5
 echo "$ac_t"""$with_motif"" 1>&6
 case "$with_motif" in
 	"no")	USE_MOTIF=	;;
@@ -13506,7 +13101,7 @@
 
 
 echo $ac_n "checking for location of Motif includes""... $ac_c" 1>&6
-echo "configure:13510: checking for location of Motif includes" >&5
+echo "configure:13105: checking for location of Motif includes" >&5
 case "$with_motif_includes" in
 y | ye | yes | n | no)
 	{ echo "configure: error: *** You must supply a directory to --with-motif-includes." 1>&2; exit 1; }
@@ -13532,15 +13127,15 @@
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:13536: checking for $ac_hdr" >&5
+echo "configure:13131: checking for $ac_hdr" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 13539 "configure"
+#line 13134 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:13544: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:13139: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -13574,7 +13169,7 @@
 
 
 echo $ac_n "checking for location of Motif library""... $ac_c" 1>&6
-echo "configure:13578: checking for location of Motif library" >&5
+echo "configure:13173: checking for location of Motif library" >&5
 case "$with_motif_libs" in
 y | ye | yes | n | no)
 	{ echo "configure: error: *** You must supply a directory to --with-motif-libs." 1>&2; exit 1; }
@@ -13599,13 +13194,13 @@
 
 
 echo $ac_n "checking for XmStringCreate in -lXm""... $ac_c" 1>&6
-echo "configure:13603: checking for XmStringCreate in -lXm" >&5
+echo "configure:13198: checking for XmStringCreate in -lXm" >&5
 ac_lib_var=`echo Xm'_'XmStringCreate | sed 'y%./+-%__p_%'`
 
 ac_save_LIBS="$LIBS"
 LIBS="-lXm $X_LIBS -lXm -lXt $X_PRE_LIBS -lX11 $X_EXTRA_LIBS  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 13609 "configure"
+#line 13204 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -13616,7 +13211,7 @@
 XmStringCreate()
 ; return 0; }
 EOF
-if { (eval echo configure:13620: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:13215: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -13657,7 +13252,7 @@
 
 
 echo $ac_n "checking whether to use Cairo""... $ac_c" 1>&6
-echo "configure:13661: checking whether to use Cairo" >&5
+echo "configure:13256: checking whether to use Cairo" >&5
 echo "$ac_t"""$with_cairo"" 1>&6
 case "$with_cairo" in
 	"no")	USE_CAIRO=	;;
@@ -13683,15 +13278,15 @@
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:13687: checking for $ac_hdr" >&5
+echo "configure:13282: checking for $ac_hdr" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 13690 "configure"
+#line 13285 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:13695: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:13290: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -13731,10 +13326,10 @@
 LIBS=" $CAIROLIB $LIBS"
 LDFLAGS=" $LDFLAGS"
 echo $ac_n "checking for cairo_create""... $ac_c" 1>&6
-echo "configure:13735: checking for cairo_create" >&5
+echo "configure:13330: checking for cairo_create" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 13738 "configure"
+#line 13333 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char cairo_create(); below.  */
@@ -13757,7 +13352,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:13761: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:13356: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_cairo_create=yes"
 else
@@ -13798,7 +13393,7 @@
 
 
 echo $ac_n "checking whether to use GLw""... $ac_c" 1>&6
-echo "configure:13802: checking whether to use GLw" >&5
+echo "configure:13397: checking whether to use GLw" >&5
 echo "$ac_t"""$with_glw"" 1>&6
 case "$with_glw" in
 	"no")	USE_GLW=	;;
@@ -13817,7 +13412,7 @@
 
 
 echo $ac_n "checking for location of GLw includes""... $ac_c" 1>&6
-echo "configure:13821: checking for location of GLw includes" >&5
+echo "configure:13416: checking for location of GLw includes" >&5
 case "$with_glw_includes" in
 y | ye | yes | n | no)
 	{ echo "configure: error: *** You must supply a directory to --with-glw-includes." 1>&2; exit 1; }
@@ -13843,15 +13438,15 @@
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:13847: checking for $ac_hdr" >&5
+echo "configure:13442: checking for $ac_hdr" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 13850 "configure"
+#line 13445 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:13855: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:13450: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -13879,15 +13474,15 @@
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:13883: checking for $ac_hdr" >&5
+echo "configure:13478: checking for $ac_hdr" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 13886 "configure"
+#line 13481 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:13891: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:13486: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -13927,7 +13522,7 @@
 
 
 echo $ac_n "checking for location of GLw library""... $ac_c" 1>&6
-echo "configure:13931: checking for location of GLw library" >&5
+echo "configure:13526: checking for location of GLw library" >&5
 case "$with_glw_libs" in
 y | ye | yes | n | no)
 	{ echo "configure: error: *** You must supply a directory to --with-glw-libs." 1>&2; exit 1; }
@@ -13952,13 +13547,13 @@
 
 
 echo $ac_n "checking for GLwCreateMDrawingArea in -lGLw""... $ac_c" 1>&6
-echo "configure:13956: checking for GLwCreateMDrawingArea in -lGLw" >&5
+echo "configure:13551: checking for GLwCreateMDrawingArea in -lGLw" >&5
 ac_lib_var=`echo GLw'_'GLwCreateMDrawingArea | sed 'y%./+-%__p_%'`
 
 ac_save_LIBS="$LIBS"
 LIBS="-lGLw $X_LIBS $OPENGLLIB -lXm -lXt $X_PRE_LIBS -lX11 $X_EXTRA_LIBS $MATHLIB  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 13962 "configure"
+#line 13557 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -13969,7 +13564,7 @@
 GLwCreateMDrawingArea()
 ; return 0; }
 EOF
-if { (eval echo configure:13973: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:13568: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -13994,13 +13589,13 @@
 
 
 echo $ac_n "checking for GLwCreateM1DrawingArea in -lGLw""... $ac_c" 1>&6
-echo "configure:13998: checking for GLwCreateM1DrawingArea in -lGLw" >&5
+echo "configure:13593: checking for GLwCreateM1DrawingArea in -lGLw" >&5
 ac_lib_var=`echo GLw'_'GLwCreateM1DrawingArea | sed 'y%./+-%__p_%'`
 
 ac_save_LIBS="$LIBS"
 LIBS="-lGLw $X_LIBS $OPENGLLIB -lXm -lXt $X_PRE_LIBS -lX11 $X_EXTRA_LIBS $MATHLIB  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 14004 "configure"
+#line 13599 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -14011,7 +13606,7 @@
 GLwCreateM1DrawingArea()
 ; return 0; }
 EOF
-if { (eval echo configure:14015: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:13610: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -14036,13 +13631,13 @@
 
 
 echo $ac_n "checking for GLwCreateM2DrawingArea in -lGLw""... $ac_c" 1>&6
-echo "configure:14040: checking for GLwCreateM2DrawingArea in -lGLw" >&5
+echo "configure:13635: checking for GLwCreateM2DrawingArea in -lGLw" >&5
 ac_lib_var=`echo GLw'_'GLwCreateM2DrawingArea | sed 'y%./+-%__p_%'`
 
 ac_save_LIBS="$LIBS"
 LIBS="-lGLw $X_LIBS $OPENGLLIB -lXm -lXt $X_PRE_LIBS -lX11 $X_EXTRA_LIBS $MATHLIB  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 14046 "configure"
+#line 13641 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -14053,7 +13648,7 @@
 GLwCreateM2DrawingArea()
 ; return 0; }
 EOF
-if { (eval echo configure:14057: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:13652: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -14078,13 +13673,13 @@
 
 
 echo $ac_n "checking for GLwCreateMDrawingArea in -lGLwM""... $ac_c" 1>&6
-echo "configure:14082: checking for GLwCreateMDrawingArea in -lGLwM" >&5
+echo "configure:13677: checking for GLwCreateMDrawingArea in -lGLwM" >&5
 ac_lib_var=`echo GLwM'_'GLwCreateMDrawingArea | sed 'y%./+-%__p_%'`
 
 ac_save_LIBS="$LIBS"
 LIBS="-lGLwM $X_LIBS $OPENGLLIB -lXm -lXt $X_PRE_LIBS -lX11 $X_EXTRA_LIBS $MATHLIB  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 14088 "configure"
+#line 13683 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -14095,7 +13690,7 @@
 GLwCreateMDrawingArea()
 ; return 0; }
 EOF
-if { (eval echo configure:14099: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:13694: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -14120,13 +13715,13 @@
 
 
 echo $ac_n "checking for GLwCreateM1DrawingArea in -lGLwM""... $ac_c" 1>&6
-echo "configure:14124: checking for GLwCreateM1DrawingArea in -lGLwM" >&5
+echo "configure:13719: checking for GLwCreateM1DrawingArea in -lGLwM" >&5
 ac_lib_var=`echo GLwM'_'GLwCreateM1DrawingArea | sed 'y%./+-%__p_%'`
 
 ac_save_LIBS="$LIBS"
 LIBS="-lGLwM $X_LIBS $OPENGLLIB -lXm -lXt $X_PRE_LIBS -lX11 $X_EXTRA_LIBS $MATHLIB  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 14130 "configure"
+#line 13725 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -14137,7 +13732,7 @@
 GLwCreateM1DrawingArea()
 ; return 0; }
 EOF
-if { (eval echo configure:14141: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:13736: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -14162,13 +13757,13 @@
 
 
 echo $ac_n "checking for GLwCreateM2DrawingArea in -lGLwM""... $ac_c" 1>&6
-echo "configure:14166: checking for GLwCreateM2DrawingArea in -lGLwM" >&5
+echo "configure:13761: checking for GLwCreateM2DrawingArea in -lGLwM" >&5
 ac_lib_var=`echo GLwM'_'GLwCreateM2DrawingArea | sed 'y%./+-%__p_%'`
 
 ac_save_LIBS="$LIBS"
 LIBS="-lGLwM $X_LIBS $OPENGLLIB -lXm -lXt $X_PRE_LIBS -lX11 $X_EXTRA_LIBS $MATHLIB  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 14172 "configure"
+#line 13767 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -14179,7 +13774,7 @@
 GLwCreateM2DrawingArea()
 ; return 0; }
 EOF
-if { (eval echo configure:14183: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:13778: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -14206,13 +13801,13 @@
 
 
 echo $ac_n "checking for GLwCreateMDrawingArea in -lMesaGLw""... $ac_c" 1>&6
-echo "configure:14210: checking for GLwCreateMDrawingArea in -lMesaGLw" >&5
+echo "configure:13805: checking for GLwCreateMDrawingArea in -lMesaGLw" >&5
 ac_lib_var=`echo MesaGLw'_'GLwCreateMDrawingArea | sed 'y%./+-%__p_%'`
 
 ac_save_LIBS="$LIBS"
 LIBS="-lMesaGLw $X_LIBS $OPENGLLIB -lXm -lXt $X_PRE_LIBS -lX11 $X_EXTRA_LIBS $MATHLIB  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 14216 "configure"
+#line 13811 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -14223,7 +13818,7 @@
 GLwCreateMDrawingArea()
 ; return 0; }
 EOF
-if { (eval echo configure:14227: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:13822: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -14242,13 +13837,13 @@
   echo "$ac_t""no" 1>&6
 
 echo $ac_n "checking for GLwCreateMDrawingArea in -lMesaGLw""... $ac_c" 1>&6
-echo "configure:14246: checking for GLwCreateMDrawingArea in -lMesaGLw" >&5
+echo "configure:13841: checking for GLwCreateMDrawingArea in -lMesaGLw" >&5
 ac_lib_var=`echo MesaGLw'_'GLwCreateMDrawingArea | sed 'y%./+-%__p_%'`
 
 ac_save_LIBS="$LIBS"
 LIBS="-lMesaGLw $X_LIBS $OPENGLLIB -lXm -lXt $X_PRE_LIBS -lX11 $X_EXTRA_LIBS $MATHLIB $OPENGLULIB $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 14252 "configure"
+#line 13847 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -14259,7 +13854,7 @@
 GLwCreateMDrawingArea()
 ; return 0; }
 EOF
-if { (eval echo configure:14263: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:13858: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -14286,13 +13881,13 @@
 
 
 echo $ac_n "checking for GLwCreateMDrawingArea in -lMesaGLwM""... $ac_c" 1>&6
-echo "configure:14290: checking for GLwCreateMDrawingArea in -lMesaGLwM" >&5
+echo "configure:13885: checking for GLwCreateMDrawingArea in -lMesaGLwM" >&5
 ac_lib_var=`echo MesaGLwM'_'GLwCreateMDrawingArea | sed 'y%./+-%__p_%'`
 
 ac_save_LIBS="$LIBS"
 LIBS="-lMesaGLwM $X_LIBS $OPENGLLIB -lXm -lXt $X_PRE_LIBS -lX11 $X_EXTRA_LIBS $MATHLIB  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 14296 "configure"
+#line 13891 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -14303,7 +13898,7 @@
 GLwCreateMDrawingArea()
 ; return 0; }
 EOF
-if { (eval echo configure:14307: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:13902: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -14322,13 +13917,13 @@
   echo "$ac_t""no" 1>&6
 
 echo $ac_n "checking for GLwCreateMDrawingArea in -lMesaGLwM""... $ac_c" 1>&6
-echo "configure:14326: checking for GLwCreateMDrawingArea in -lMesaGLwM" >&5
+echo "configure:13921: checking for GLwCreateMDrawingArea in -lMesaGLwM" >&5
 ac_lib_var=`echo MesaGLwM'_'GLwCreateMDrawingArea | sed 'y%./+-%__p_%'`
 
 ac_save_LIBS="$LIBS"
 LIBS="-lMesaGLwM $X_LIBS $OPENGLLIB -lXm -lXt $X_PRE_LIBS -lX11 $X_EXTRA_LIBS $MATHLIB $OPENGLULIB $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 14332 "configure"
+#line 13927 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -14339,7 +13934,7 @@
 GLwCreateMDrawingArea()
 ; return 0; }
 EOF
-if { (eval echo configure:14343: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:13938: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -14452,7 +14047,7 @@
 
 
 echo $ac_n "checking whether to use FreeType""... $ac_c" 1>&6
-echo "configure:14456: checking whether to use FreeType" >&5
+echo "configure:14051: checking whether to use FreeType" >&5
 echo "$ac_t"""$with_freetype"" 1>&6
 case "$with_freetype" in
 	"no")	USE_FREETYPE=	;;
@@ -14471,7 +14066,7 @@
 
 
 echo $ac_n "checking for location of FreeType includes""... $ac_c" 1>&6
-echo "configure:14475: checking for location of FreeType includes" >&5
+echo "configure:14070: checking for location of FreeType includes" >&5
 case "$with_freetype_includes" in
 y | ye | yes | n | no)
 	{ echo "configure: error: *** You must supply a directory to --with-freetype-includes." 1>&2; exit 1; }
@@ -14497,15 +14092,15 @@
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:14501: checking for $ac_hdr" >&5
+echo "configure:14096: checking for $ac_hdr" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 14504 "configure"
+#line 14099 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:14509: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:14104: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -14539,7 +14134,7 @@
 
 
 echo $ac_n "checking for location of FreeType library""... $ac_c" 1>&6
-echo "configure:14543: checking for location of FreeType library" >&5
+echo "configure:14138: checking for location of FreeType library" >&5
 case "$with_freetype_libs" in
 y | ye | yes | n | no)
 	{ echo "configure: error: *** You must supply a directory to --with-freetype-libs." 1>&2; exit 1; }
@@ -14564,13 +14159,13 @@
 
 
 echo $ac_n "checking for FT_Init_FreeType in -lfreetype""... $ac_c" 1>&6
-echo "configure:14568: checking for FT_Init_FreeType in -lfreetype" >&5
+echo "configure:14163: checking for FT_Init_FreeType in -lfreetype" >&5
 ac_lib_var=`echo freetype'_'FT_Init_FreeType | sed 'y%./+-%__p_%'`
 
 ac_save_LIBS="$LIBS"
 LIBS="-lfreetype  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 14574 "configure"
+#line 14169 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -14581,7 +14176,7 @@
 FT_Init_FreeType()
 ; return 0; }
 EOF
-if { (eval echo configure:14585: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:14180: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -14622,7 +14217,7 @@
 
 
 echo $ac_n "checking whether to use NLS""... $ac_c" 1>&6
-echo "configure:14626: checking whether to use NLS" >&5
+echo "configure:14221: checking whether to use NLS" >&5
 echo "$ac_t"""$with_nls"" 1>&6
 case "$with_nls" in
 	"no")	USE_NLS=	;;
@@ -14642,10 +14237,10 @@
 
 
 echo $ac_n "checking for gettext""... $ac_c" 1>&6
-echo "configure:14646: checking for gettext" >&5
+echo "configure:14241: checking for gettext" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 14649 "configure"
+#line 14244 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char gettext(); below.  */
@@ -14668,7 +14263,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:14672: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:14267: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_gettext=yes"
 else
@@ -14686,13 +14281,13 @@
   echo "$ac_t""no" 1>&6
 
 echo $ac_n "checking for gettext in -lintl""... $ac_c" 1>&6
-echo "configure:14690: checking for gettext in -lintl" >&5
+echo "configure:14285: checking for gettext in -lintl" >&5
 ac_lib_var=`echo intl'_'gettext | sed 'y%./+-%__p_%'`
 
 ac_save_LIBS="$LIBS"
 LIBS="-lintl  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 14696 "configure"
+#line 14291 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -14703,7 +14298,7 @@
 gettext()
 ; return 0; }
 EOF
-if { (eval echo configure:14707: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:14302: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -14738,7 +14333,7 @@
  
 
 echo $ac_n "checking whether to use C++""... $ac_c" 1>&6
-echo "configure:14742: checking whether to use C++" >&5
+echo "configure:14337: checking whether to use C++" >&5
 echo "$ac_t"""$with_cxx"" 1>&6
 case "$with_cxx" in
 	"no")	USE_CXX=	;;
@@ -14754,7 +14349,7 @@
 # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:14758: checking for $ac_word" >&5
+echo "configure:14353: checking for $ac_word" >&5
 
 if test -n "$CXX"; then
   ac_cv_prog_CXX="$CXX" # Let the user override the test.
@@ -14783,7 +14378,7 @@
 
 
 echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works""... $ac_c" 1>&6
-echo "configure:14787: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5
+echo "configure:14382: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5
 
 ac_ext=C
 # CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
@@ -14794,12 +14389,12 @@
 
 cat > conftest.$ac_ext << EOF
 
-#line 14798 "configure"
+#line 14393 "configure"
 #include "confdefs.h"
 
 int main(){return(0);}
 EOF
-if { (eval echo configure:14803: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:14398: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   ac_cv_prog_cxx_works=yes
   # If we can't run a trivial program, we are probably using a cross compiler.
   if (./conftest; exit) 2>/dev/null; then
@@ -14825,19 +14420,19 @@
   { echo "configure: error: installation or configuration problem: C++ compiler cannot create executables." 1>&2; exit 1; }
 fi
 echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
-echo "configure:14829: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5
+echo "configure:14424: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5
 echo "$ac_t""$ac_cv_prog_cxx_cross" 1>&6
 cross_compiling=$ac_cv_prog_cxx_cross
 
 echo $ac_n "checking whether we are using GNU C++""... $ac_c" 1>&6
-echo "configure:14834: checking whether we are using GNU C++" >&5
+echo "configure:14429: checking whether we are using GNU C++" >&5
 
 cat > conftest.C <<EOF
 #ifdef __GNUC__
   yes;
 #endif
 EOF
-if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:14841: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
+if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:14436: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
   ac_cv_prog_gxx=yes
 else
   ac_cv_prog_gxx=no
@@ -14855,7 +14450,7 @@
 ac_save_CXXFLAGS="$CXXFLAGS"
 CXXFLAGS=
 echo $ac_n "checking whether ${CXX-g++} accepts -g""... $ac_c" 1>&6
-echo "configure:14859: checking whether ${CXX-g++} accepts -g" >&5
+echo "configure:14454: checking whether ${CXX-g++} accepts -g" >&5
 
 echo 'void f(){}' > conftest.cc
 if test -z "`${CXX-g++} -g -c conftest.cc 2>&1`"; then
@@ -14896,7 +14491,7 @@
 
 
 echo $ac_n "checking whether to use openDWG""... $ac_c" 1>&6
-echo "configure:14900: checking whether to use openDWG" >&5
+echo "configure:14495: checking whether to use openDWG" >&5
 echo "$ac_t"""$with_opendwg"" 1>&6
 case "$with_opendwg" in
 	"no")	USE_OPENDWG=	;;
@@ -14916,7 +14511,7 @@
 
 
 echo $ac_n "checking for location of openDGW includes""... $ac_c" 1>&6
-echo "configure:14920: checking for location of openDGW includes" >&5
+echo "configure:14515: checking for location of openDGW includes" >&5
 case "$with_opendwg_includes" in
 y | ye | yes | n | no)
 	{ echo "configure: error: *** You must supply a directory to --with-opendwg-includes." 1>&2; exit 1; }
@@ -14942,15 +14537,15 @@
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:14946: checking for $ac_hdr" >&5
+echo "configure:14541: checking for $ac_hdr" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 14949 "configure"
+#line 14544 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:14954: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:14549: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -14984,7 +14579,7 @@
 
 
 echo $ac_n "checking for location of openDWG library""... $ac_c" 1>&6
-echo "configure:14988: checking for location of openDWG library" >&5
+echo "configure:14583: checking for location of openDWG library" >&5
 case "$with_opendwg_libs" in
 y | ye | yes | n | no)
 	{ echo "configure: error: *** You must supply a directory to --with-opendwg-libs." 1>&2; exit 1; }
@@ -15031,7 +14626,7 @@
    if test "$enable_largefile" = yes; then
 
      echo $ac_n "checking for special C compiler options needed for large files""... $ac_c" 1>&6
-echo "configure:15035: checking for special C compiler options needed for large files" >&5
+echo "configure:14630: checking for special C compiler options needed for large files" >&5
 
 ac_cv_sys_largefile_CC=no
         largefile_cc_opt=""
@@ -15039,7 +14634,7 @@
 	  # IRIX 6.2 and later do not support large files by default,
 	  # so use the C compiler's -n32 option if that helps.
 	  cat > conftest.$ac_ext <<EOF
-#line 15043 "configure"
+#line 14638 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
     /* Check that off_t can represent 2**63 - 1 correctly.
@@ -15055,7 +14650,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:15059: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:14654: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   :
 else
   echo "configure: failed program was:" >&5
@@ -15064,7 +14659,7 @@
   ac_save_CC="${CC-cc}"
 	     CC="$CC -n32"
 	     cat > conftest.$ac_ext <<EOF
-#line 15068 "configure"
+#line 14663 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
     /* Check that off_t can represent 2**63 - 1 correctly.
@@ -15080,7 +14675,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:15084: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:14679: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_sys_largefile_CC=' -n32'
 else
@@ -15100,11 +14695,11 @@
      fi
 
      echo $ac_n "checking for _FILE_OFFSET_BITS value needed for large files""... $ac_c" 1>&6
-echo "configure:15104: checking for _FILE_OFFSET_BITS value needed for large files" >&5
+echo "configure:14699: checking for _FILE_OFFSET_BITS value needed for large files" >&5
 
 ac_cv_sys_file_offset_bits=no
       cat > conftest.$ac_ext <<EOF
-#line 15108 "configure"
+#line 14703 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
     /* Check that off_t can represent 2**63 - 1 correctly.
@@ -15120,14 +14715,14 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:15124: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:14719: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   :
 else
   echo "configure: failed program was:" >&5
   cat conftest.$ac_ext >&5
   rm -rf conftest*
   cat > conftest.$ac_ext <<EOF
-#line 15131 "configure"
+#line 14726 "configure"
 #include "confdefs.h"
 #define _FILE_OFFSET_BITS 64
 #include <sys/types.h>
@@ -15145,7 +14740,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:15149: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:14744: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_sys_file_offset_bits=64
 else
@@ -15164,11 +14759,11 @@
 
    fi
      echo $ac_n "checking for _LARGE_FILES value needed for large files""... $ac_c" 1>&6
-echo "configure:15168: checking for _LARGE_FILES value needed for large files" >&5
+echo "configure:14763: checking for _LARGE_FILES value needed for large files" >&5
 
 ac_cv_sys_large_files=no
       cat > conftest.$ac_ext <<EOF
-#line 15172 "configure"
+#line 14767 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
     /* Check that off_t can represent 2**63 - 1 correctly.
@@ -15184,14 +14779,14 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:15188: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:14783: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   :
 else
   echo "configure: failed program was:" >&5
   cat conftest.$ac_ext >&5
   rm -rf conftest*
   cat > conftest.$ac_ext <<EOF
-#line 15195 "configure"
+#line 14790 "configure"
 #include "confdefs.h"
 #define _LARGE_FILES 1
 #include <sys/types.h>
@@ -15209,7 +14804,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:15213: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:14808: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_sys_large_files=1
 else
@@ -15228,25 +14823,25 @@
 
    fi
      echo $ac_n "checking for _LARGEFILE_SOURCE value needed for large files""... $ac_c" 1>&6
-echo "configure:15232: checking for _LARGEFILE_SOURCE value needed for large files" >&5
+echo "configure:14827: checking for _LARGEFILE_SOURCE value needed for large files" >&5
 
 ac_cv_sys_largefile_source=no
       cat > conftest.$ac_ext <<EOF
-#line 15236 "configure"
+#line 14831 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int main() {
 return !fseeko;
 ; return 0; }
 EOF
-if { (eval echo configure:15243: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:14838: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   :
 else
   echo "configure: failed program was:" >&5
   cat conftest.$ac_ext >&5
   rm -rf conftest*
   cat > conftest.$ac_ext <<EOF
-#line 15250 "configure"
+#line 14845 "configure"
 #include "confdefs.h"
 #define _LARGEFILE_SOURCE 1
 #include <stdio.h>
@@ -15255,7 +14850,7 @@
 return !fseeko;
 ; return 0; }
 EOF
-if { (eval echo configure:15259: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:14854: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_sys_largefile_source=1
 else
@@ -15276,10 +14871,10 @@
    fi
   
 echo $ac_n "checking if system supports Large Files at all""... $ac_c" 1>&6
-echo "configure:15280: checking if system supports Large Files at all" >&5
+echo "configure:14875: checking if system supports Large Files at all" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 15283 "configure"
+#line 14878 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 #include <sys/types.h>
@@ -15311,7 +14906,7 @@
 #endif
 ; return 0; }
 EOF
-if { (eval echo configure:15315: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:14910: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_largefiles=yes
 else
@@ -15340,7 +14935,7 @@
 # Python check
 
 echo $ac_n "checking whether to use Python""... $ac_c" 1>&6
-echo "configure:15344: checking whether to use Python" >&5
+echo "configure:14939: checking whether to use Python" >&5
 
 PYTHONINC=
 PYTHONCFLAGS=
@@ -15360,7 +14955,7 @@
   # Extract the first word of "python-config", so it can be a program name with args.
 set dummy python-config; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:15364: checking for $ac_word" >&5
+echo "configure:14959: checking for $ac_word" >&5
 
 case "$PY_CONFIG" in
   /*)
@@ -15405,15 +15000,15 @@
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:15409: checking for $ac_hdr" >&5
+echo "configure:15004: checking for $ac_hdr" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 15412 "configure"
+#line 15007 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:15417: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:15012: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -15453,7 +15048,7 @@
   # Extract the first word of "swig", so it can be a program name with args.
 set dummy swig; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:15457: checking for $ac_word" >&5
+echo "configure:15052: checking for $ac_word" >&5
 
 case "$SWIG" in
   /*)
@@ -15499,7 +15094,7 @@
 # Enable wxWidgets support (for wxGUI)
 
 echo $ac_n "checking whether to use wxWidgets""... $ac_c" 1>&6
-echo "configure:15503: checking whether to use wxWidgets" >&5
+echo "configure:15098: checking whether to use wxWidgets" >&5
 
 WXVERSION=
 WXWIDGETSCXXFLAGS= 
@@ -15519,7 +15114,7 @@
   # Extract the first word of "wx-config", so it can be a program name with args.
 set dummy wx-config; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:15523: checking for $ac_word" >&5
+echo "configure:15118: checking for $ac_word" >&5
 
 case "$WX_CONFIG" in
   /*)
@@ -15567,7 +15162,7 @@
  REQWX="2.8.1"
 
  echo $ac_n "checking wxWidgets version""... $ac_c" 1>&6
-echo "configure:15571: checking wxWidgets version" >&5
+echo "configure:15166: checking wxWidgets version" >&5
  if WXVERSION=`"$WX_CONFIG" --version`; then
    echo "$ac_t""$WXVERSION" 1>&6
  else
@@ -15590,15 +15185,15 @@
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:15594: checking for $ac_hdr" >&5
+echo "configure:15189: checking for $ac_hdr" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 15597 "configure"
+#line 15192 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:15602: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:15197: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -15634,15 +15229,15 @@
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:15638: checking for $ac_hdr" >&5
+echo "configure:15233: checking for $ac_hdr" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 15641 "configure"
+#line 15236 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:15646: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:15241: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -15853,10 +15448,6 @@
 s%@XLIB@%$XLIB%g
 s%@XTLIB@%$XTLIB%g
 s%@USE_X11@%$USE_X11%g
-s%@CURSES_MAXY@%$CURSES_MAXY%g
-s%@CURSESLIB@%$CURSESLIB%g
-s%@USE_CURSES@%$USE_CURSES%g
-s%@COMPATLIB@%$COMPATLIB%g
 s%@DBMIEXTRALIB@%$DBMIEXTRALIB%g
 s%@XDRLIB@%$XDRLIB%g
 s%@HAVE_ASPRINTF@%$HAVE_ASPRINTF%g

Modified: grass/trunk/configure.in
===================================================================
--- grass/trunk/configure.in	2008-08-06 00:57:07 UTC (rev 32550)
+++ grass/trunk/configure.in	2008-08-06 03:28:21 UTC (rev 32551)
@@ -196,7 +196,6 @@
 LOC_ARG_WITH(nls, NLS, no)
 LOC_ARG_WITH(readline, Readline, no)
 LOC_ARG_WITH(opendwg, openDWG, no)
-LOC_ARG_WITH(curses, Curses, yes)
 AC_ARG_WITH(python,
 [  --with-python[=path/python-config] enable support for Python SWIG bindings (python-config with path, \
 e.g. '--with-python=/usr/bin/python2.5-config', default: no)],, with_python="no")
@@ -419,49 +418,6 @@
 AC_SUBST(XTLIB)
 AC_SUBST(USE_X11)
 
-# Enable Curses option
-
-LOC_CHECK_USE(curses,Curses,USE_CURSES)
-
-if test -n "$USE_CURSES"; then
-
-LOC_CHECK_INCLUDES(curses.h,curses,)
-
-AC_MSG_CHECKING(curses.h WINDOW structure component)
-CURSES_MAXY=NONE
-AC_TRY_COMPILE([
-#include <curses.h>
-  ],[WINDOW w; w.maxy = 0;],
-  CURSES_MAXY=maxy)
-AC_TRY_COMPILE([
-#include <curses.h>
-  ],[WINDOW w; w._maxy = 0;],
-  CURSES_MAXY=_maxy)
-AC_DEFINE_UNQUOTED(CURSES_MAXY,$CURSES_MAXY)
-AC_SUBST(CURSES_MAXY)
-AC_MSG_RESULT($CURSES_MAXY)
-
-AC_CHECK_LIB(ncurses, initscr, CURSESLIB=-lncurses, [
-AC_CHECK_LIB(curses, initscr, CURSESLIB=-lcurses, [
-    AC_MSG_ERROR([*** Unable to locate curses library.])
-    CURSESLIB=
-])])
-AC_SUBST(CURSESLIB)
-AC_SUBST(USE_CURSES)
-
-AC_CHECK_LIB(ncurses, keypad, [AC_DEFINE(HAVE_KEYPAD)], [
-AC_CHECK_LIB(curses, keypad, [AC_DEFINE(HAVE_KEYPAD)], [
-])])
-
-fi # $USE_CURSES
-
-AC_CHECK_LIB(compat, gtty, COMPATLIB=-lcompat, [
-AC_CHECK_LIB(bsd-compat, gtty, COMPATLIB=-lbsd-compat, [
-AC_CHECK_LIB(bsd, gtty, COMPATLIB=-lbsd, [
-    COMPATLIB=
-])])])
-AC_SUBST(COMPATLIB)
-
 # Note that some systems (FreeBSD for example) need an extra library for
 # cuserid
 ac_save_libs="$LIBS"

Modified: grass/trunk/db/db.login/main.c
===================================================================
--- grass/trunk/db/db.login/main.c	2008-08-06 00:57:07 UTC (rev 32550)
+++ grass/trunk/db/db.login/main.c	2008-08-06 03:28:21 UTC (rev 32551)
@@ -80,12 +80,13 @@
 #endif
 	    do {
 		fprintf(stderr,
-			_
-			("\nEnter database password for connection\n<%s:%s:user=%s>\n"),
+			_("\nEnter database password for connection\n<%s:%s:user=%s>\n"),
 			driver->answer, database->answer, user->answer);
 		fprintf(stderr, _("Hit RETURN to cancel request\n"));
 		fprintf(stderr, ">");
-	    } while (!G_gets(answer));
+		*answer = '\0';
+		G_getl(answer, sizeof(answer), stdin);
+	    } while (0);
 #ifdef HAVE_TERMIOS_H
 	    tcsetattr(STDIN_FILENO, TCSANOW, &tios);
 #endif

Modified: grass/trunk/general/Makefile
===================================================================
--- grass/trunk/general/Makefile	2008-08-06 00:57:07 UTC (rev 32550)
+++ grass/trunk/general/Makefile	2008-08-06 03:28:21 UTC (rev 32551)
@@ -3,7 +3,6 @@
 
 SUBDIRS = \
 	g.access \
-	g.ask \
 	g.dirseps \
 	g.filename \
 	g.findetc \

Deleted: grass/trunk/general/g.ask/Makefile
===================================================================
--- grass/trunk/general/g.ask/Makefile	2008-08-06 00:57:07 UTC (rev 32550)
+++ grass/trunk/general/g.ask/Makefile	2008-08-06 03:28:21 UTC (rev 32551)
@@ -1,11 +0,0 @@
-
-MODULE_TOPDIR = ../..
-
-PGM = g.ask
-
-LIBES     = $(GISLIB)
-DEPENDENCIES= $(GISDEP)
-
-include $(MODULE_TOPDIR)/include/Make/Module.make
-
-default: cmd

Deleted: grass/trunk/general/g.ask/description.html
===================================================================
--- grass/trunk/general/g.ask/description.html	2008-08-06 00:57:07 UTC (rev 32550)
+++ grass/trunk/general/g.ask/description.html	2008-08-06 03:28:21 UTC (rev 32551)
@@ -1,162 +0,0 @@
-<H2>DESCRIPTION</H2>
-
-<EM>g.ask</EM> is designed for shell scripts that need to
-prompt the user for the name of a data base file in the
-user's current GRASS location.  After <EM>g.ask</EM> is
-invoked with needed parameters, it will query the user for
-a file name of the specified <EM>type</EM> and
-<EM>element</EM>.  After the user responds to this query,
-the program will write four lines to the UNIX output file
-specified by <EM>unixfile</EM>.
-
-<!-- unused
-<H2>OPTIONS</H2>
-
-<H3>Parameters:</H3>
-
-
-<DL>
-
-
-<DT><B>type=</B><EM>name</EM> 
-
-<DD>The type of query.  Options for <EM>name</EM> are 
-<EM>old</EM>, <EM>new</EM>,
-<EM>any</EM>, and <EM>mapset</EM>;  their functions are given below.
-"New", "any", and "mapset" only look in the user's current mapset.
-
-<DL>
-<DD>
-<DT><B>old</B>
-<DD>For existing data files anywhere in the user's mapset search path.
-
-<DT><B>new</B> 
-
-<DD>Used to create a new file in the current mapset, which must not
-already exist there (if a file with this name exists there,
-it will not be overwritten).
-
-<DT><B>any</B> 
-
-<DD>Creates a file in the current mapset, which may or may not
-already exist there.  If a file with this name exists in the
-current mapset, it will be overwritten;
-if not, a new file with this name will be created.
-
-<DT><B>mapset</B> 
-
-<DD>For files that must exist in the current mapset
-The shell write wants the name of a file which exists
-in the user's current mapset.  This type would
-used instead of "old" if the file is to be modified.
-</DL>
-
-<DT><B>prompt=</B>"<EM>string</EM>" 
-
-<DD>The prompt to be displayed to the user.  If more than
-one word, the prompt should be enclosed within double
-quotes ("").
-
-<DT><B>element=</B><EM>name</EM> 
-
-<DD>The name of the GRASS data base element (i.e.,
-directory under a GRASS mapset) whose files are to be
-queried.
-
-<DT><B>desc=</B>"<EM>string</EM>" 
-
-<DD>A short description of the data base element which is
-meaningful to the user.  If description contains more than
-one word, it should be enclosed within double quotes ("").
-
-<DT><B>unixfile=</B><EM>name</EM> 
-
-<DD>The name of a UNIX file to store the user's response.
-See next section for what is written to this file and how
-it can be used by shell scripts.
-
-</DL>
--->
-
-<H2>OUTPUT</H2>
-
-Upon receiving the user's response to its request for a
-file name, <EM>g.ask</EM> writes four lines to the
-specified <EM>unixfile</EM>; this output file is placed in
-the user's current working directory, unless otherwise
-specified, and contains the following lines:
-
-
-<div class="code">
-<PRE>
-name='<EM>some_name</EM>'
-mapset='<EM>some_mapset</EM>'
-fullname='<EM>some_fullname</EM>'
-file='<EM>some_fullpath</EM>'
-</pre></div>
-
-<P>
-
-The output is <EM>/bin/sh</EM> commands to set the variable
-<EM>name</EM> to the file name specified by the user (of
-the <EM>element</EM> and <EM>type</EM> requested by
-<EM>g.ask</EM>), <EM>mapset</EM> to the GRASS mapset in
-which this file resides (or will be created),
-<EM>fullname</EM> is the name with the mapset embedded in
-it, and <EM>file</EM> to the full UNIX path name
-identifying this file.  These variables may be set in the
-<EM>/bin/sh</EM> as follows:
-
-<DL>
-<DD>
-<B>. unixfile</B>
-</DL>
-
-
-<P>
-
-The . is a shell command which means read the
-<EM>unixfile</EM> and execute the commands found there.  It
-is NOT part of the <EM>unixfile</EM> name and MUST be
-followed by a space.
-
-<H2>NOTES</H2>
-
-The user may choose to simply hit the return key and not enter a file name.
-If this happens the variables will be set as follows:
-
-
-<div class="code">
-<PRE>
-name=
-mapset=
-fullname=
-file=
-</pre></div>
-
-<P>
-
-The following is a way to test for this case:
-
-<div class="code">
-<PRE>
-if [ ! "$file" ]
-then
-	exit
-fi
-</PRE></div>
-
-<H2>SEE ALSO</H2>
-
-<EM><A HREF="d.ask.html">d.ask</A></EM>,
-<EM><A HREF="g.filename.html">g.filename</A></EM>,
-<EM><A HREF="g.findfile.html">g.findfile</A></EM>,
-<EM><A HREF="g.gisenv.html">g.gisenv</A></EM>,
-<EM><A HREF="g.parser.html">g.parser</A></EM>
-
-<H2>AUTHOR</H2>
-
-Michael Shapiro,
-U.S.Army Construction Engineering Research Laboratory
-
-<p><i>Last changed: $Date$</i>

Deleted: grass/trunk/general/g.ask/main.c
===================================================================
--- grass/trunk/general/g.ask/main.c	2008-08-06 00:57:07 UTC (rev 32550)
+++ grass/trunk/general/g.ask/main.c	2008-08-06 03:28:21 UTC (rev 32551)
@@ -1,124 +0,0 @@
-
-/****************************************************************************
- *
- * MODULE:       g.ask
- * AUTHOR(S):    Michael Shapiro CERL (original contributor)
- *               Markus Neteler <neteler itc.it>,
- *               Bernhard Reiter <bernhard intevation.de>, 
- *               Glynn Clements <glynn gclements.plus.com>,
- *               Jan-Oliver Wagner <jan intevation.de>
- * PURPOSE:      
- * COPYRIGHT:    (C) 1999-2006 by the GRASS Development Team
- *
- *               This program is free software under the GNU General Public
- *               License (>=v2). Read the file COPYING that comes with GRASS
- *               for details.
- *
- *****************************************************************************/
-#include <stdio.h>
-#include <string.h>
-#include <stdlib.h>
-#include <grass/gis.h>
-#include <grass/glocale.h>
-
-int main(int argc, char *argv[])
-{
-    char file[1024], name[40], *mapset;
-    char *prompt;
-    char *help[2];
-    FILE *fd;
-    struct GModule *module;
-    struct Option *opt1;
-    struct Option *opt2;
-    struct Option *opt3;
-    struct Option *opt4;
-    struct Option *opt5;
-
-    G_gisinit(argv[0]);
-
-    module = G_define_module();
-    module->keywords = _("general");
-    module->description =
-	"Prompts the user for the names of GRASS data base files.";
-
-    /* Define the different options */
-
-    opt1 = G_define_option();
-    opt1->key = "type";
-    opt1->type = TYPE_STRING;
-    opt1->required = YES;
-    opt1->description = "The type of query";
-    opt1->options = "old,new,any,mapset";
-
-    opt2 = G_define_option();
-    opt2->key = "prompt";
-    opt2->key_desc = "\"string\"";
-    opt2->type = TYPE_STRING;
-    opt2->required = NO;
-    opt2->description = "The prompt to be displayed to the user";
-
-    opt3 = G_define_option();
-    opt3->key = "element";
-    opt3->type = TYPE_STRING;
-    opt3->required = YES;
-    opt3->description = "The database element to be queried";
-
-    opt4 = G_define_option();
-    opt4->key = "desc";
-    opt4->key_desc = "\"string\"";
-    opt4->type = TYPE_STRING;
-    opt4->required = NO;
-    opt4->description = "A short description of the database element";
-
-    opt5 = G_define_option();
-    opt5->key = "unixfile";
-    opt5->type = TYPE_STRING;
-    opt5->required = YES;
-    opt5->description =
-	"The name of a unix file to store the user's response";
-
-    if (argc < 2) {		/* no interactive version allowed */
-	help[0] = argv[0];
-	help[1] = "help";
-	argv = help;
-	argc = 2;
-    }
-    if (G_parser(argc, argv) < 0)
-	exit(EXIT_FAILURE);
-
-    prompt = opt2->answer;
-
-    fd = fopen(opt5->answer, "w");
-    if (fd == NULL) {
-	fprintf(stderr, "%s - ", argv[0]);
-	perror(opt5->answer);
-	exit(EXIT_FAILURE);
-    }
-
-    if (strcmp(opt1->answer, "old") == 0)
-	mapset = G_ask_old(prompt, name, opt3->answer, opt4->answer);
-    else if (strcmp(opt1->answer, "new") == 0)
-	mapset = G_ask_new(prompt, name, opt3->answer, opt4->answer);
-    else if (strcmp(opt1->answer, "any") == 0)
-	mapset = G_ask_any(prompt, name, opt3->answer, opt4->answer, 0);
-    else if (strcmp(opt1->answer, "mapset") == 0)
-	mapset = G_ask_in_mapset(prompt, name, opt3->answer, opt4->answer);
-
-
-    if (mapset) {
-	fprintf(fd, "name='%s'\n", name);
-	fprintf(fd, "mapset='%s'\n", mapset);
-	fprintf(fd, "fullname='%s'\n", G_fully_qualified_name(name, mapset));
-	G__file_name(file, opt3->answer, name, mapset);
-	fprintf(fd, "file='%s'\n", file);
-	G__make_mapset_element(opt3->answer);
-    }
-    else {
-	fprintf(fd, "name=\n");
-	fprintf(fd, "mapset=\n");
-	fprintf(fd, "file=\n");
-    }
-
-    fclose(fd);
-    exit(EXIT_SUCCESS);
-}

Modified: grass/trunk/general/g.proj/datumtrans.c
===================================================================
--- grass/trunk/general/g.proj/datumtrans.c	2008-08-06 00:57:07 UTC (rev 32550)
+++ grass/trunk/general/g.proj/datumtrans.c	2008-08-06 03:28:21 UTC (rev 32551)
@@ -34,13 +34,10 @@
  * \param force       Force editing of parameters even if current co-ordinate
  *                    system already contains fully specified parameters.
  * 
- * \param interactive Interactively prompt user for parameters, ignoring
- *                    value of datumtrans variable.
- * 
  * \return            1 if a change was made, 0 if not.
  **/
 
-int set_datumtrans(int datumtrans, int force, int interactive)
+int set_datumtrans(int datumtrans, int force)
 {
     char *params, *datum = NULL;
     int paramsets, status;
@@ -81,15 +78,9 @@
 	struct Key_Value *temp_projinfo;
 	int i;
 
-	/* First of all obtain the new parameters either interactively
-	 * or through the supplied transform number index */
-	if (interactive) {
-	    /* Print to stderr here as the function call will also */
-	    fprintf(stderr, "Datum name: %s (%s)", dstruct.name,
-		    dstruct.longname);
-	    GPJ_ask_datum_params(datum, &chosenparams);
-	}
-	else {
+	/* First of all obtain the new parameters 
+	 * through the supplied transform number index */
+	{
 	    struct gpj_datum_transform_list *list;
 
 	    if (datumtrans > paramsets)

Modified: grass/trunk/general/g.proj/local_proto.h
===================================================================
--- grass/trunk/general/g.proj/local_proto.h	2008-08-06 00:57:07 UTC (rev 32550)
+++ grass/trunk/general/g.proj/local_proto.h	2008-08-06 03:28:21 UTC (rev 32551)
@@ -19,7 +19,7 @@
 void print_datuminfo(void);
 void print_proj4(int);
 void print_wkt(int, int);
-void create_location(char *, int);
+void create_location(char *);
 
 /* datumtrans.c */
-int set_datumtrans(int, int, int);
+int set_datumtrans(int, int);

Modified: grass/trunk/general/g.proj/main.c
===================================================================
--- grass/trunk/general/g.proj/main.c	2008-08-06 00:57:07 UTC (rev 32550)
+++ grass/trunk/general/g.proj/main.c	2008-08-06 03:28:21 UTC (rev 32551)
@@ -31,8 +31,7 @@
      *printwkt,			/* Print projection in WKT format           */
      *esristyle,		/* Use ESRI-style WKT format                */
      *dontprettify,		/* Print 'flat' output (no linebreaks)      */
-     *forcedatumtrans,		/* Force override of datumtrans parameters  */
-     *interprompt;		/* Enable interactive prompting             */
+     *forcedatumtrans;		/* Force override of datumtrans parameters  */
 
     struct Option *location,	/* Name of new location to create           */
      *inepsg,			/* EPSG projection code                     */
@@ -159,11 +158,6 @@
     location->guisection = "Create/Edit_Locations";
     location->description = _("Name of new location to create");
 
-    interprompt = G_define_flag();
-    interprompt->key = 'i';
-    interprompt->description =
-	_("Enable interactive prompting (for command-line use only)");
-
     if (G_parser(argc, argv))
 	exit(EXIT_FAILURE);
 
@@ -211,8 +205,7 @@
 	G_fatal_error(_("Projection files missing"));
 
     /* Set Datum Parameters if necessary or requested */
-    set_datumtrans(atoi(dtrans->answer), forcedatumtrans->answer,
-		   interprompt->answer);
+    set_datumtrans(atoi(dtrans->answer), forcedatumtrans->answer);
 
 
     /* Output */
@@ -232,7 +225,7 @@
 	print_wkt(esristyle->answer, dontprettify->answer);
 
     if (create->answer)
-	create_location(location->answer, interprompt->answer);
+	create_location(location->answer);
 
 
     /* Tidy Up */

Modified: grass/trunk/general/g.proj/output.c
===================================================================
--- grass/trunk/general/g.proj/output.c	2008-08-06 00:57:07 UTC (rev 32550)
+++ grass/trunk/general/g.proj/output.c	2008-08-06 03:28:21 UTC (rev 32551)
@@ -143,7 +143,7 @@
     return;
 }
 
-void create_location(char *location, int interactive)
+void create_location(char *location)
 {
     int ret;
 
@@ -165,7 +165,6 @@
 	/* Create flag given but no location specified; overwrite
 	 * projection files for current location */
 
-	int go_ahead = 0;
 	char *mapset = G_mapset();
 	struct Key_Value *old_projinfo = NULL, *old_projunits = NULL;
 	struct Cell_head old_cellhd;
@@ -184,43 +183,9 @@
 	    old_projunits = G_get_projunits();
 	}
 
-	if (old_projinfo && old_projunits) {
-	    if (interactive) {
-		/* Warn as in g.setproj before overwriting current location */
-		fprintf(stderr,
-			_
-			("\n\nWARNING!  A projection file already exists for this location\n"));
-		fprintf(stderr,
-			"\nThis file contains all the parameters for the\nlocation's projection: %s\n",
-			G_find_key_value("proj", old_projinfo));
-		fprintf(stderr,
-			"\n    Overriding this information implies that the old projection parameters\n");
-		fprintf(stderr,
-			"    were incorrect.  If you change the parameters, all existing data will be\n");
-		fprintf(stderr,
-			"    interpreted differently by the projection software.\n%c%c%c",
-			7, 7, 7);
-		fprintf(stderr,
-			"    GRASS will not re-project your data automatically\n\n");
-
-		if (G_yes
-		    (_
-		     ("Would you still like to overwrite the current projection information "),
-		     0))
-		    go_ahead = 1;
-	    }
-	    else
-		go_ahead = 1;
-	}
-	else {
-	    /* Projection files missing for some reason;
-	     * go ahead and update */
-	    go_ahead = 1;
-	}
-
-	if (go_ahead) {
+	{
 	    int out_stat;
-	    char path[4096];
+	    char path[GPATH_MAX];
 
 	    /* Write out the PROJ_INFO, and PROJ_UNITS if available. */
 	    if (projinfo != NULL) {
@@ -250,9 +215,6 @@
 	    }
 	    G_message(_("Projection information updated!"));
 	}
-	else
-	    G_message(_("The projection information will not be updated."));
-
     }
 
     return;

Deleted: grass/trunk/general/manage/lib/menu.c
===================================================================
--- grass/trunk/general/manage/lib/menu.c	2008-08-06 00:57:07 UTC (rev 32550)
+++ grass/trunk/general/manage/lib/menu.c	2008-08-06 03:28:21 UTC (rev 32551)
@@ -1,160 +0,0 @@
-#include <stdlib.h>
-#include <string.h>
-#include <grass/gis.h>
-#include "list.h"
-
-static int count;
-static char **text;
-static int first, last;
-
-int menu(int type)
-{
-    int i;
-    int n;
-    int x;
-    char buf[100];
-
-    build_menu();
-
-    first = 0;
-
-    while (1) {
-	last = first + 30;
-	if (last > count)
-	    last = count;
-
-	G_clear_screen();
-	switch (type) {
-	case RENAME:
-	    fprintf(stdout, "RENAME");
-	    break;
-	case REMOVE:
-	    fprintf(stdout, "REMOVE");
-	    break;
-	case COPY:
-	    fprintf(stdout, "COPY");
-	    break;
-	case LIST:
-	    fprintf(stdout, "LIST");
-	    break;
-	}
-	fprintf(stdout, " FACILITY\n\n");
-	fprintf(stdout, "This program allows you to ");
-	switch (type) {
-	case RENAME:
-	    fprintf(stdout, "rename files found in your mapset");
-	    break;
-	case REMOVE:
-	    fprintf(stdout, "remove files found in your mapset");
-	    break;
-	case COPY:
-	    fprintf(stdout, "copy files from other mapsets into your mapset");
-	    break;
-	case LIST:
-	    fprintf(stdout, "list files from mapsets in your search path");
-	    break;
-	}
-	fprintf(stdout, "\n\n");
-	fprintf(stdout, "Please select the type of file to be ");
-	switch (type) {
-	case RENAME:
-	    fprintf(stdout, "renamed");
-	    break;
-	case REMOVE:
-	    fprintf(stdout, "removed");
-	    break;
-	case COPY:
-	    fprintf(stdout, "copied");
-	    break;
-	case LIST:
-	    fprintf(stdout, "listed");
-	    break;
-	}
-
-	fprintf(stdout, "\n\n");
-	display_menu();
-	fprintf(stdout, "\n");
-
-	if (first > 0)
-	    fprintf(stdout, "  -    to see previous menu page\n");
-	if (last < count)
-	    fprintf(stdout, "  +    to see next menu page\n");
-	fprintf(stdout, "RETURN to exit\n\n");
-
-	fprintf(stdout, "> ");
-
-	if (!G_gets(buf))
-	    continue;
-	if (*buf == 0) {
-	    free_menu();
-	    return -1;
-	}
-	G_strip(buf);
-	if (first > 0 && strcmp(buf, "-") == 0) {
-	    first -= 30;
-	    if (first < 0)
-		first = 0;
-	    continue;
-	}
-	if (last < count && strcmp(buf, "+") == 0) {
-	    first = last;
-	    continue;
-	}
-	if (sscanf(buf, "%d", &x) != 1)
-	    continue;
-	i = 1;
-	for (n = 0; n < nlist; n++)
-	    if (list[n].status && (i++ == x)) {
-		free_menu();
-		return n;
-	    }
-    }
-}
-
-int build_menu(void)
-{
-    char buf[100];
-    int n;
-
-    count = 0;
-    text = 0;
-    for (n = 0; n < nlist; n++)
-	if (list[n].status) {
-	    sprintf(buf, "%3d %-.30s", ++count, list[n].text);
-	    text = (char **)G_realloc(text, count * sizeof(char *));
-	    text[count - 1] = G_store(buf);
-	}
-
-    return 0;
-}
-
-int free_menu(void)
-{
-    while (count-- > 0)
-	G_free(text[count]);
-
-    return 0;
-}
-int display_menu(void)
-{
-    int left, right;
-    int i;
-
-    left = first;
-    right = first + 15;
-
-    for (i = 0; i < 15; i++) {
-	if (left >= last)
-	    break;
-	if (right >= last)
-	    fprintf(stdout, "  %-35.35s\n", text[left]);
-	else
-	    fprintf(stdout, "  %-35.35s  %-35.35s\n", text[left],
-		    text[right]);
-
-	left++;
-	right++;
-    }
-
-    return 0;
-}

Modified: grass/trunk/imagery/i.class/Makefile
===================================================================
--- grass/trunk/imagery/i.class/Makefile	2008-08-06 00:57:07 UTC (rev 32550)
+++ grass/trunk/imagery/i.class/Makefile	2008-08-06 03:28:21 UTC (rev 32551)
@@ -2,8 +2,8 @@
 
 PGM = i.class
 
-LIBES     = $(IMAGERYLIB) $(DISPLAYLIB) $(RASTERLIB) $(GISLIB) $(VASKLIB) $(CURSES) $(GMATHLIB)
-DEPENDENCIES= $(IMAGERYDEP) $(DISPLAYDEP) $(RASTERDEP) $(GISDEP) $(VASKDEP) $(GMATHDEP)
+LIBES     = $(IMAGERYLIB) $(DISPLAYLIB) $(RASTERLIB) $(GISLIB) $(GMATHLIB)
+DEPENDENCIES= $(IMAGERYDEP) $(DISPLAYDEP) $(RASTERDEP) $(GISDEP) $(GMATHDEP)
 
 include $(MODULE_TOPDIR)/include/Make/Module.make
 

Modified: grass/trunk/include/Make/Platform.make.in
===================================================================
--- grass/trunk/include/Make/Platform.make.in	2008-08-06 00:57:07 UTC (rev 32550)
+++ grass/trunk/include/Make/Platform.make.in	2008-08-06 03:28:21 UTC (rev 32551)
@@ -90,9 +90,6 @@
 XEXTRALIBS          = @X_EXTRA_LIBS@
 USE_X11             = @USE_X11@
 
-COMPATLIB           = @COMPATLIB@
-CURSES              = @CURSESLIB@ $(COMPATLIB)
-USE_CURSES          = @USE_CURSES@
 MATHLIB             = @MATHLIB@ 
 XDRLIB              = @XDRLIB@ @ZLIBINCPATH@ @ZLIBLIBPATH@ @ZLIB@
 ICONVLIB            = @ICONVLIB@

Modified: grass/trunk/include/P_site.h
===================================================================
--- grass/trunk/include/P_site.h	2008-08-06 00:57:07 UTC (rev 32550)
+++ grass/trunk/include/P_site.h	2008-08-06 03:28:21 UTC (rev 32551)
@@ -36,10 +36,6 @@
 void G_sites_close(struct Map_info *);
 char *G_find_sites(char *name, const char *mapset);
 char *G_find_sites2(const char *name, const char *mapset);
-char *G_ask_sites_new(const char *prompt, char *name);
-char *G_ask_sites_old(const char *prompt, char *name);
-char *G_ask_sites_any(const char *prompt, char *name);
-char *G_ask_sites_in_mapset(const char *prompt, char *name);
 int G__site_put(struct Map_info *, Site *, int);
 
 struct Map_info *G_fopen_sites_old(const char *, const char *);

Modified: grass/trunk/include/config.h.in
===================================================================
--- grass/trunk/include/config.h.in	2008-08-06 00:57:07 UTC (rev 32550)
+++ grass/trunk/include/config.h.in	2008-08-06 03:28:21 UTC (rev 32551)
@@ -20,12 +20,6 @@
 /* define for Windows static build */
 #undef STATIC_BUILD
 
-/* define if curses.h exists */
-#undef HAVE_CURSES_H
-
-/* define if keypad in lib[n]curses */
-#undef HAVE_KEYPAD
-
 /* define if limits.h exists */
 #undef HAVE_LIMITS_H
 
@@ -95,9 +89,6 @@
 /* Define the return type of signal handlers */
 #define RETSIGTYPE int
 
-/* define curses.h WINDOW structure component */
-#define CURSES_MAXY @CURSES_MAXY@
-
 /* define if ftime() exists */
 #undef HAVE_FTIME
 

Deleted: grass/trunk/include/edit.h
===================================================================
--- grass/trunk/include/edit.h	2008-08-06 00:57:07 UTC (rev 32550)
+++ grass/trunk/include/edit.h	2008-08-06 03:28:21 UTC (rev 32551)
@@ -1,16 +0,0 @@
-#ifndef GRASS_EDIT_H
-#define GRASS_EDIT_H
-
-#include <grass/gis.h>
-
-/* edit_cats.c */
-int E_edit_cats(const char *, struct Categories *, int);
-int E_edit_fp_cats(const char *, struct Categories *);
-
-/* edit_cellhd.c */
-int E_edit_cellhd(struct Cell_head *, int);
-
-/* edit_hist.c */
-int E_edit_history(struct History *);
-
-#endif

Modified: grass/trunk/include/gisdefs.h
===================================================================
--- grass/trunk/include/gisdefs.h	2008-08-06 00:57:07 UTC (rev 32550)
+++ grass/trunk/include/gisdefs.h	2008-08-06 03:28:21 UTC (rev 32551)
@@ -81,34 +81,7 @@
 /* ascii_chk.c */
 int G_ascii_check(char *);
 
-/* ask.c */
-char *G_ask_new(const char *, char *, char *, char *);
-char *G_ask_new_ext(const char *, char *, char *, char *, char *, int (*)());
-char *G_ask_old(const char *, char *, char *, char *);
-char *G_ask_old_ext(const char *, char *, char *, char *, char *, int (*)());
-char *G_ask_any(const char *, char *, char *, char *, int);
-char *G_ask_any_ext(const char *, char *, char *, char *, int, char *,
-		    int (*)());
-char *G_ask_in_mapset(const char *, char *, char *, char *);
-char *G_ask_in_mapset_ext(const char *, char *, char *, char *, char *,
-			  int (*)());
-char *G_ask_new_file(const char *, char *, char *, char *);
-char *G_ask_old_file(const char *, char *, char *, char *);
-int G_set_ask_return_msg(const char *);
-char *G_get_ask_return_msg(void);
 
-/* ask_cell.c */
-char *G_ask_cell_new(const char *, char *);
-char *G_ask_cell_old(const char *, char *);
-char *G_ask_cell_in_mapset(const char *, char *);
-char *G_ask_cell_any(const char *, char *);
-
-/* ask_vctrs.c */
-char *G_ask_vector_new(const char *, char *);
-char *G_ask_vector_old(const char *, char *);
-char *G_ask_vector_any(const char *, char *);
-char *G_ask_vector_in_mapset(const char *, char *);
-
 /* asprintf.c */
 /* Do it better if you know how */
 /* asprintf is not found on MINGW but exists */
@@ -563,12 +536,6 @@
 /* get_cellhd.c */
 int G_get_cellhd(const char *, const char *, struct Cell_head *);
 
-/* get_datum_name.c */
-int G_ask_datum_name(char *, char *);
-
-/* get_ell_name.c */
-int G_ask_ellipse_name(char *);
-
 /* get_ellipse.c */
 int G_get_ellipsoid_parameters(double *, double *);
 int G_get_spheroid_by_name(const char *, double *, double *, double *);
@@ -580,9 +547,6 @@
 struct Key_Value *G_get_projunits(void);
 struct Key_Value *G_get_projinfo(void);
 
-/* get_projname.c */
-int G_ask_proj_name(char *, char *);
-
 /* get_row.c */
 int G_get_map_row_nomask(int, CELL *, int);
 int G_get_raster_row_nomask(int, void *, int, RASTER_MAP_TYPE);
@@ -611,9 +575,6 @@
 int G_getl(char *, int, FILE *);
 int G_getl2(char *, int, FILE *);
 
-/* gets.c */
-int G_gets(char *);
-
 /* gisbase.c */
 char *G_gisbase(void);
 
@@ -780,9 +741,6 @@
 /* mach_name.c */
 char *G__machine_name(void);
 
-/* make_colr.c */
-int G_ask_colors(const char *, const char *, struct Colors *);
-
 /* make_loc.c */
 int G__make_location(const char *, struct Cell_head *, struct Key_Value *,
 		     struct Key_Value *, FILE *);
@@ -1271,9 +1229,6 @@
 /* writ_zeros.c */
 int G_write_zeros(int, size_t);
 
-/* yes.c */
-int G_yes(const char *, int);
-
 /* zero.c */
 int G_zero(void *, int);
 

Modified: grass/trunk/include/gprojects.h
===================================================================
--- grass/trunk/include/gprojects.h	2008-08-06 00:57:07 UTC (rev 32550)
+++ grass/trunk/include/gprojects.h	2008-08-06 03:28:21 UTC (rev 32551)
@@ -95,7 +95,6 @@
 int GPJ_get_datum_params(char **, char **);
 int GPJ__get_datum_params(struct Key_Value *, char **, char **);
 void GPJ_free_datum(struct gpj_datum *);
-int GPJ_ask_datum_params(const char *, char **);
 struct gpj_datum_transform_list *GPJ_get_datum_transform_by_name(const char
 								 *inputname);
 

Modified: grass/trunk/include/imagedefs.h
===================================================================
--- grass/trunk/include/imagedefs.h	2008-08-06 00:57:07 UTC (rev 32550)
+++ grass/trunk/include/imagedefs.h	2008-08-06 03:28:21 UTC (rev 32551)
@@ -13,9 +13,6 @@
 double ***I_alloc_double3(int, int, int);
 int I_free_double3(double ***);
 
-/* ask_group.c */
-int I_ask_group_old(char *, char *);
-
 /* eol.c */
 int I_get_to_eol(char *, int, FILE *);
 

Deleted: grass/trunk/include/vask.h
===================================================================
--- grass/trunk/include/vask.h	2008-08-06 00:57:07 UTC (rev 32550)
+++ grass/trunk/include/vask.h	2008-08-06 03:28:21 UTC (rev 32551)
@@ -1,84 +0,0 @@
-#ifndef __VASK_H__
-#define __VASK_H__
-
-#include	<signal.h>
-#include	<curses.h>
-
-#ifdef MAKE_VASK_LIB
-#define 	MAX_ANSW	80
-#define 	MAX_CONST	80
-#define 	MAX_LINE	23
-
-/**
-*** target contains all the variable type that we will want to
-*** be looking for.
-**/
-union target
-{
-    char *c;
-    short *h;
-    int *i;
-    long *l;
-    float *f;
-    double *d;
-    double for_alignement;
-};
-
-/**
-*** ans_rec contains all the information needed to go
-*** and get an answer from the screen.
-**/
-struct ans_rec
-{
-    union target targetptr;	/* pointer to value     */
-    int var_type;		/* value type           */
-    int row;			/* row position         */
-    int col;			/* column position      */
-    int length;			/* length of entry      */
-    int decimal_places;		/* number of decimal places */
-};
-
-/**
-*** page is an array of pointers to lines on a page.
-**/
-struct page
-{
-    const char *line[MAX_LINE];
-};
-
-struct V__
-{
-    struct ans_rec usr_answ[MAX_ANSW];
-    struct ans_rec constant[MAX_CONST];
-
-    struct page page;
-
-    int NUM_ANSW;
-    int NUM_CONST;
-    int NUM_LINE;
-
-    int decimal_places;
-    char interrupt_msg[80];
-};
-
-/* one of the library routines (V_call) will define this struct */
-extern struct V__ V__;
-
-#endif
-
-void V_float_accuracy(int);
-int V_call(void);
-void V_intrpt_ok(void);
-void V_intrpt_msg(const char *);
-void V_clear(void);
-int V_const(void *, int, int, int, int);
-void V_error(const char *, ...);
-void V_exit(void);
-void V_init(void);
-int V_line(int, const char *);
-int V_ques(void *, int, int, int, int);
-int V__dump_window(void);
-void V__remove_trail(int, char *);
-void V__trim_decimal(char *);
-
-#endif /* __VASK_H__ */

Modified: grass/trunk/lib/Makefile
===================================================================
--- grass/trunk/lib/Makefile	2008-08-06 00:57:07 UTC (rev 32550)
+++ grass/trunk/lib/Makefile	2008-08-06 03:28:21 UTC (rev 32551)
@@ -14,8 +14,6 @@
 	btree \
 	display \
 	db \
-	vask \
-	edit \
 	external \
 	fonts \
 	gtcltk \

Deleted: grass/trunk/lib/edit/Makefile
===================================================================
--- grass/trunk/lib/edit/Makefile	2008-08-06 00:57:07 UTC (rev 32550)
+++ grass/trunk/lib/edit/Makefile	2008-08-06 03:28:21 UTC (rev 32551)
@@ -1,10 +0,0 @@
-MODULE_TOPDIR = ../..
-
-EXTRA_LIBS=$(GISLIB) $(VASKLIB)
-
-LIB_NAME = $(EDIT_LIBNAME)
-
-include $(MODULE_TOPDIR)/include/Make/Lib.make
-
-default: lib
-

Deleted: grass/trunk/lib/edit/edit_cats.c
===================================================================
--- grass/trunk/lib/edit/edit_cats.c	2008-08-06 00:57:07 UTC (rev 32550)
+++ grass/trunk/lib/edit/edit_cats.c	2008-08-06 03:28:21 UTC (rev 32551)
@@ -1,380 +0,0 @@
-
-/****************************************************************************
- *
- * MODULE:       edit library functions
- * AUTHOR(S):    Originally part of gis lib dir in CERL GRASS code
- *               Subsequent (post-CVS) contributors:
- *               Glynn Clements <glynn gclements.plus.com>,
- *               Radim Blazek <radim.blazek gmail.com>,
- *               Eric G. Miller <egm2 jps.net>,
- *               Markus Neteler <neteler itc.it>,
- *               Brad Douglas <rez touchofmadness.com>,
- *               Bernhard Reiter <bernhard intevation.de>
- * PURPOSE:      libraries for interactively editing raster support data
- * COPYRIGHT:    (C) 1996-2006 by the GRASS Development Team
- *
- *               This program is free software under the GNU General Public
- *               License (>=v2). Read the file COPYING that comes with GRASS
- *               for details.
- *
- *****************************************************************************/
-
-/**********************************************************************
- *
- *   E_edit_cats (name, cats, option)
- *      char *name
- *      struct Categories *cats 
- *
- *   Interactively prompts the user for category names for
- *   cats->ncats categories.  Uses screen oriented prompting through
- *   the visual_ask library.  Compile with $(VASKLIB) and $(CURSES)
- *
- *   name is used for informatin on the screen only.
- *   No files are read or written
- *
- *   If option is 0, user can change number of cats
- *                1, user must initialize number of cats
- *               -1, user may not change number of cats
- *
- *
- *   Returns:
- *            -1 if user canceled the edit
- *             1 if ok
- *
- *   note:
- *      at present, this routine pretends to know nothing about the
- *      category label generation capabilities using the cats.fmt
- *      string. If it is necessary to let the user edit this
- *      a separate interface must be used
- **********************************************************************/
-#include <string.h>
-#include <stdlib.h>
-#include <grass/gis.h>
-#include <grass/vask.h>
-#include <grass/edit.h>
-
-
-#define NLINES 10
-
-
-int E_edit_cats(const char *name, struct Categories *cats, int option)
-{
-    long incr;
-    long atnum;
-    long startcat;
-    long endcat;
-    long first_cat, last_cat;
-    long catnum[NLINES];
-    char buff[NLINES][80];
-    char next[20];
-    char next_line[80];
-    char title[80];
-    char msg1[80];
-    char msg2[80];
-    int line;
-    CELL max_ind, max_cat, min_ind;
-    DCELL max_val, min_val;
-
-    if (G_quant_get_limits
-	(&cats->q, &min_val, &max_val, &min_ind, &max_ind) < 0)
-	max_cat = 0;
-    else
-	max_cat = (CELL) max_val;
-
-    if (max_cat < 0)
-	option = 1;
-
-    last_cat = (long)max_cat;
-    if (option >= 0) {
-	V_clear();
-	V_line(1, msg1);
-	V_line(2, msg2);
-
-	if (option == 0) {
-	    strcpy(msg1, "The current value for the highest category");
-	    sprintf(msg2, "in [%s] is shown below", name);
-	    V_line(3, "If you need to change it, enter another value");
-	}
-	else {
-	    last_cat = 0;
-	    strcpy(msg1, "Please enter the highest category value");
-	    sprintf(msg2, "for [%s]", name);
-	}
-
-	V_line(10, "         Highest Category:");
-	V_ques(&last_cat, 'l', 10, 28, 5);
-	V_line(16, next_line);
-
-	*next_line = 0;
-	while (1) {
-	    V_intrpt_ok();
-	    if (!V_call())
-		return -1;
-
-	    if (last_cat >= 0)
-		break;
-
-	    sprintf(next_line, "** Negative values not allowed **");
-	}
-    }
-
-    max_cat = last_cat;
-
-    first_cat = 0;
-    if (cats->ncats > 0 && min_val < 0)
-	first_cat = (CELL) min_val;
-
-    *title = 0;
-    if (cats->title != NULL)
-	strcpy(title, cats->title);
-
-    startcat = first_cat;
-    sprintf(msg1, "[%s] ENTER NEW CATEGORY NAMES FOR THESE CATEGORIES", name);
-
-    while (1) {
-	V_clear();
-	V_line(0, msg1);
-	V_line(2, "TITLE: ");
-	V_line(3, "CAT   NEW CATEGORY NAME");
-	V_line(4, "NUM");
-
-	V_ques(title, 's', 2, 8, 60);
-
-	endcat =
-	    startcat + NLINES <=
-	    last_cat + 1 ? startcat + NLINES : last_cat + 1;
-
-	line = 5;
-	for (incr = startcat; incr < endcat; incr++) {
-	    atnum = incr - startcat;
-	    strcpy(buff[atnum], G_get_cat((CELL) incr, cats));
-	    catnum[atnum] = incr;
-	    V_const(&catnum[atnum], 'l', line, 1, 3);
-	    V_ques(buff[atnum], 's', line, 5, 60);
-	    line++;
-	}
-
-	line += 2;
-	*next = 0;
-	if (endcat > last_cat)
-	    strcpy(next, "end");
-	else
-	    sprintf(next, "%ld", endcat);
-	sprintf(next_line, "%*s%*s  (of %ld)", 41,
-		"Next category ('end' to end): ", 5, "", last_cat);
-	V_line(line, next_line);
-	V_ques(next, 's', line, 41, 5);
-
-	V_intrpt_ok();
-	if (!V_call())
-	    return -1;
-
-	/* store new category name in structure */
-	for (incr = startcat; incr < endcat; incr++) {
-	    atnum = incr - startcat;
-	    G_strip(buff[atnum]);
-	    if (strcmp(buff[atnum], G_get_cat((CELL) incr, cats)) != 0)
-		G_set_cat((CELL) incr, buff[atnum], cats);
-	}
-
-	if (*next == 0)
-	    break;
-	if (strcmp(next, "end") == 0)
-	    break;
-	if (sscanf(next, "%ld", &endcat) != 1)
-	    continue;
-
-	if (endcat < first_cat)
-	    endcat = first_cat;
-
-	if (endcat > last_cat) {
-	    endcat = last_cat - NLINES + 1;
-	    if (endcat < 0)
-		endcat = 0;
-	}
-	startcat = endcat;
-    }
-    if (cats->title)
-	G_free(cats->title);
-
-    G_strip(title);
-    cats->title = G_store(title);
-
-    return (1);
-}
-
-
-/**********************************************************************
- *
- *   E_edit_fp_cats (name, cats)
- *      char *name
- *      struct Categories *cats 
- *
- *   Interactively prompts the user for category names for
- *   fp ranges of data.  Uses screen oriented prompting through
- *   the visual_ask library.  Compile with $(VASKLIB) and $(CURSES)
- *
- *   name is used for informatin on the screen only.
- *   No files are read or written
- *
- *   Returns:
- *            -1 if user canceled the edit
- *             1 if ok
- *
- *   note:
- *      at present, this routine pretends to know nothing about the
- *      category label generation capabilities using the cats.fmt
- *      string. If it is necessary to let the user edit this
- *      a separate interface must be used
- **********************************************************************/
-
-#define NLINES 10
-
-int E_edit_fp_cats(const char *name, struct Categories *cats)
-{
-    long incr;
-    long atnum;
-    long startcat;
-    long endcat;
-    char buff[NLINES][60];
-    char next[20];
-    char next_line[80];
-    char title[80];
-    char msg1[80];
-    char msg2[80];
-    int line, ncats;
-    size_t lab_len;
-    DCELL max_val[NLINES], min_val[NLINES];
-    DCELL dmin, dmax;
-    CELL tmp_cell;
-    struct Categories old_cats;
-    struct FPRange fp_range;
-
-    if (G_read_fp_range(name, G_mapset(), &fp_range) < 0)
-	G_fatal_error("can't read the floating point range for %s", name);
-
-    G_get_fp_range_min_max(&fp_range, &dmin, &dmax);
-    /* first save old cats */
-    G_copy_raster_cats(&old_cats, cats);
-
-    G_init_raster_cats(old_cats.title, cats);
-    G_free_raster_cats(cats);
-
-    ncats = old_cats.ncats;
-    V_clear();
-
-    if (!ncats)
-	sprintf(msg1, "There are no predefined fp ranges to label");
-    else
-	sprintf(msg1, "There are %d predefined fp ranges to label", ncats);
-    sprintf(msg2, "Enter the number of fp ranges you want to label");
-
-    V_line(1, msg1);
-    V_line(2, msg2);
-    V_ques(&ncats, 'l', 2, 48, 5);
-    V_line(16, next_line);
-    *next_line = 0;
-    V_intrpt_ok();
-
-    if (!V_call())
-	return -1;
-
-    *title = 0;
-    if (old_cats.title != NULL)
-	strcpy(title, old_cats.title);
-
-    startcat = 0;
-    sprintf(msg1, "The fp data in map %s ranges from %f to %f", name, dmin,
-	    dmax);
-    sprintf(msg2, "[%s] ENTER NEW CATEGORY NAMES FOR THESE CATEGORIES", name);
-
-    while (1) {
-	V_clear();
-	V_line(0, msg1);
-	V_line(1, msg2);
-	V_line(3, "TITLE: ");
-	V_line(4, "FP RANGE           NEW CATEGORY NAME");
-
-	V_ques(title, 's', 2, 8, 60);
-
-	endcat = startcat + NLINES <= ncats ? startcat + NLINES : ncats;
-
-	line = 6;
-	for (incr = startcat; incr < endcat; incr++) {
-	    atnum = incr - startcat;
-	    if (incr < old_cats.ncats) {
-		/* if editing existing range label */
-		lab_len = strlen(old_cats.labels[incr]);
-		if (lab_len > 58)
-		    lab_len = 58;
-		strncpy(buff[atnum], old_cats.labels[incr], lab_len);
-		buff[atnum][lab_len] = 0;
-		G_quant_get_ith_rule(&old_cats.q, incr, &min_val[atnum],
-				     &max_val[atnum], &tmp_cell, &tmp_cell);
-	    }
-	    else {
-		/* adding new range label */
-		strcpy(buff[atnum], "");
-		max_val[atnum] = min_val[atnum] = 0;
-	    }
-
-	    V_ques(&min_val[atnum], 'd', line, 1, 8);
-	    V_const("-", 's', line, 9, 1);
-	    V_ques(&max_val[atnum], 'd', line, 10, 8);
-	    V_ques(buff[atnum], 's', line, 19, 58);
-	    line++;
-	}
-
-	line += 2;
-	*next = 0;
-	if (endcat >= ncats)
-	    strcpy(next, "end");
-	else
-	    sprintf(next, "%ld", endcat);
-	sprintf(next_line, "%*s%*s  (of %d)", 41,
-		"Next range number ('end' to end): ", 5, "", ncats);
-	V_line(line, next_line);
-	V_ques(next, 's', line, 41, 5);
-
-	V_intrpt_ok();
-	if (!V_call())
-	    return -1;
-
-	/* store new category name in structure */
-	for (incr = startcat; incr < endcat; incr++) {
-	    atnum = incr - startcat;
-	    G_strip(buff[atnum]);
-
-	    /* adding new range label */
-	    if (!(strcmp(buff[atnum], "") == 0 &&
-		  min_val[atnum] == 0. && max_val[atnum] == 0.))
-		G_set_d_raster_cat(&min_val[atnum], &max_val[atnum],
-				   buff[atnum], cats);
-	}
-
-	if (*next == 0)
-	    break;
-	if (strcmp(next, "end") == 0)
-	    break;
-	if (sscanf(next, "%ld", &endcat) != 1)
-	    continue;
-
-	if (endcat < 0)
-	    endcat = 0;
-
-	if (endcat > ncats) {
-	    endcat = ncats - NLINES + 1;
-	    if (endcat < 0)
-		endcat = 0;
-	}
-	startcat = endcat;
-    }
-
-    G_strip(title);
-    cats->title = G_store(title);
-    /* since label pointers in old_cats point to the old allocated strings,
-       and cats now has all the newly allocated strings, it never reuses
-       old ones, we need to free them */
-
-    return (1);
-}

Deleted: grass/trunk/lib/edit/edit_cellhd.c
===================================================================
--- grass/trunk/lib/edit/edit_cellhd.c	2008-08-06 00:57:07 UTC (rev 32550)
+++ grass/trunk/lib/edit/edit_cellhd.c	2008-08-06 03:28:21 UTC (rev 32551)
@@ -1,604 +0,0 @@
-
-/****************************************************************************
- *
- * MODULE:       edit library functions
- * AUTHOR(S):    Originally part of gis lib dir in CERL GRASS code
- *               Subsequent (post-CVS) contributors:
- *               Glynn Clements <glynn gclements.plus.com>,
- *               Radim Blazek <radim.blazek gmail.com>,
- *               Eric G. Miller <egm2 jps.net>,
- *               Markus Neteler <neteler itc.it>,
- *               Brad Douglas <rez touchofmadness.com>,
- *               Bernhard Reiter <bernhard intevation.de>
- * PURPOSE:      libraries for interactively editing raster support data
- * COPYRIGHT:    (C) 1996-2006 by the GRASS Development Team
- *
- *               This program is free software under the GNU General Public
- *               License (>=v2). Read the file COPYING that comes with GRASS
- *               for details.
- *
- *****************************************************************************/
-#define AS_CELLHD 1
-#define AS_WINDOW 0
-#define AS_DEF_WINDOW -1
-
-/* modified 26nov to use word region instead of window
- * as far as the USER is concerned.
- */
-/*
- **********************************************************************
- *
- *   E_edit_cellhd (cellhd, type)
- *      struct Cell_head *cellhd   (cellhd to be defined)
- *      int type 
- *        0 = region - user input resolutions
- *       -1 = default region - user input resolutions
- *        1 = cellhd - rows and cols must be set
- *
- *   Screen oriented user interactive session for modifying a cell header
- *   or region.
- *   Uses the visual_ask V_ask routines.  As such, programs including
- *   this must load the GRASS library $(VASKLIB) and include $(CURSES) in
- *   in the compile line
- *
- *   returns:
- *      -1 error of some sort, or user cancels the edit
- *       0 ok
- *
- **********************************************************************/
-
-/* Documentation moved here from the g.region man page:
- *  (g.region no longer does interactive; lib/init/set_data.c is the
- *   only thing left using E_edit_cellhd() AFAICT.  --HB 28 Jan 2008)
- *
- * <h2>REGION EDIT PROMPT</h2>
- *
- * Most of the options will require the user to edit a
- * geographic region, be it the current geographic region or
- * one stored in the user's named region definitions
- * (the <kbd>windows</kbd> directory).  A standard prompt is
- * used to perform this edit.  An example is shown below:
- *
- *
- *
- * <pre>
- * ---------------------------------------------------------------
- *  |                         IDENTIFY REGION                     |
- *  |                                                             |
- *  |           ===========  DEFAULT REGION  ==========           |
- *  |           |    Default North: 3402025.00        |           |
- *  |           |                                     |           |
- *  |           |          ===YOUR REGION===          |           |
- *  |           |          |  NORTH EDGE   |          |           |
- *  |           |          |  3402025.00_  |          |           |
- *  |           |          |               |          |           |
- *  | Def West: |WEST EDGE |               |EAST EDGE | Def.East: |
- *  | 233975.00 |233975.00_|               |236025.00_| 236025.00 |
- *  |           |          |  SOUTH EDGE   |          |           |
- *  |           |          |  3399975.00_  |          |           |
- *  |           |          =================          |           |
- *  |           |                                     |           |
- *  |           |    Default South: 3399975.00        |           |
- *  |           =======================================           |
- *  |                                                             |
- *  |              Default   GRID RESOLUTION   Region             |
- *  |               50.00   --- East-West ---  50.00__            |
- *  |               50.00   -- North-South --  50.00__            |
- *  |                                                             |
- *  |                                                             |
- *  |     AFTER COMPLETING ALL ANSWERS, HIT &lt;ESC&gt; TO CONTINUE     |
- *  ---------------------------------------------------------------
- *  </pre>
- *
- *  The fields NORTH EDGE, SOUTH EDGE, WEST EDGE and EAST EDGE,
- *  are the boundaries of the geographic region that the user
- *  can change.  The fields Default North, Default South, Def
- *  West and Def East are the boundaries of the default
- *  geographic region that are displayed for reference and
- *  <em>cannot</em> be changed.  The two GRID RESOLUTION Region
- *  fields (east-west, and north-south) are the geographic
- *  region's cell resolutions that the user can change.  The
- *  two GRID RESOLUTION Default fields list the resolutions of
- *  the default geographic region;  these are displayed for
- *  reference and cannot be changed here by the user.
- *
- */
-
-#include <string.h>
-#include <stdlib.h>
-#include <grass/vask.h>
-#include <grass/gis.h>
-#include <grass/edit.h>
-
-
-static void format_value(int (*func) (double, char *, int),
-			 double x, char *buf, int projection);
-static void format_northing(double north, char *buf, int projection);
-static void format_easting(double east, char *buf, int projection);
-static void format_resolution(double res, char *buf, int projection);
-static int hitreturn(void);
-
-
-static char *cellhd_screen[] = {
-    "                           IDENTIFY CELL HEADER",
-    "",
-    "           ============================= DEFAULT REGION ========",
-    "           |          Default North:                           |",
-    "           |                                                   |",
-    "           |           =======  CELL HEADER  =======           |",
-    "           |           | NORTH EDGE:               |           |",
-    "           |           |                           |           |",
-    " Def. West |WEST EDGE  |                           |EAST EDGE  | Def. East",
-    "           |           |                           |           |",
-    "           |           | SOUTH EDGE:               |           |",
-    "           |           =============================           |",
-    "           |                                                   |",
-    "           |          Default South:                           |",
-    "           =====================================================",
-    "           PROJECTION:                                ZONE:",
-    NULL
-};
-
-static char *window_screen[] = {
-    "                              IDENTIFY REGION",
-    "",
-    "           ============================= DEFAULT REGION ========",
-    "           |          Default North:                           |",
-    "           |                                                   |",
-    "           |           =======  YOUR REGION  =======           |",
-    "           |           | NORTH EDGE:               |           |",
-    "           |           |                           |           |",
-    " Def. West |WEST EDGE  |                           |EAST EDGE  | Def. East",
-    "           |           |                           |           |",
-    "           |           | SOUTH EDGE:               |           |",
-    "           |           =============================           |",
-    "           |                                                   |",
-    "           |          Default South:                           |",
-    "           =====================================================",
-    "           PROJECTION:                                ZONE:",
-    "",
-    "                   Default   GRID RESOLUTION   Region",
-    "                            --- East-West ---",
-    "                            -- North-South --",
-    NULL
-};
-
-static char *def_window_screen[] = {
-    "                         DEFINE THE DEFAULT REGION",
-    "",
-    "",
-    "",
-    "",
-    "                       ====== DEFAULT REGION =======",
-    "                       | NORTH EDGE:               |",
-    "                       |                           |",
-    "            WEST EDGE  |                           |EAST EDGE",
-    "                       |                           |",
-    "                       | SOUTH EDGE:               |",
-    "                       =============================",
-    "",
-    "",
-    "",
-    "           PROJECTION:                                ZONE:",
-    "",
-    "                             GRID RESOLUTION",
-    "                                 East-West:",
-    "                               North-South:",
-    NULL
-};
-
-
-static void format_value(int (*func) (double, char *, int),
-			 double x, char *buf, int projection)
-{
-    if (projection != PROJECTION_XY) {
-	int k = (projection == PROJECTION_LL) ? 3600 : 1;
-	int i = (int)(x * k + (x < 0 ? -0.5 : 0.5));
-
-	x = (double)i / k;
-    }
-
-    func(x, buf, projection);
-    buf[10] = '\0';
-}
-
-
-static void format_northing(double north, char *buf, int projection)
-{
-    format_value(G_format_northing, north, buf, projection);
-}
-
-
-static void format_easting(double east, char *buf, int projection)
-{
-    format_value(G_format_easting, east, buf, projection);
-}
-
-
-static void format_resolution(double res, char *buf, int projection)
-{
-    format_value(G_format_resolution, res, buf, projection);
-}
-
-
-int E_edit_cellhd(struct Cell_head *cellhd, int type)
-{
-    char ll_north[20];
-    char ll_south[20];
-    char ll_east[20];
-    char ll_west[20];
-    char ll_nsres[20];
-    char ll_ewres[20];
-    char ll_def_north[20];
-    char ll_def_south[20];
-    char ll_def_east[20];
-    char ll_def_west[20];
-    char ll_def_ewres[20];
-    char ll_def_nsres[20];
-    char projection[80];
-    char **screen;
-
-    struct Cell_head def_wind;
-    double north, south, east, west;
-    double nsres, ewres;
-    char buf[64], buf2[30], *p;
-    short ok;
-    int line;
-    char *prj;
-    char *err;
-
-    if (type == AS_CELLHD && (cellhd->rows <= 0 || cellhd->cols <= 0)) {
-	G_message("E_edit_cellhd() - programmer error");
-	G_message("  ** rows and cols must be positive **");
-	return -1;
-    }
-    if (type != AS_DEF_WINDOW) {
-	if (G_get_default_window(&def_wind) != 1)
-	    return -1;
-
-	if (cellhd->proj < 0) {
-	    cellhd->proj = def_wind.proj;
-	    cellhd->zone = def_wind.zone;
-	}
-	else if (cellhd->zone < 0)
-	    cellhd->zone = def_wind.zone;
-    }
-
-    prj = G__projection_name(cellhd->proj);
-    if (!prj)
-	prj = "** unknown **";
-    sprintf(projection, "%d (%s)", cellhd->proj, prj);
-
-    if (type != AS_DEF_WINDOW) {
-	if (cellhd->west >= cellhd->east || cellhd->south >= cellhd->north) {
-	    cellhd->north = def_wind.north;
-	    cellhd->south = def_wind.south;
-	    cellhd->west = def_wind.west;
-	    cellhd->east = def_wind.east;
-
-	    if (type != AS_CELLHD) {
-		cellhd->ew_res = def_wind.ew_res;
-		cellhd->ns_res = def_wind.ns_res;
-		cellhd->rows = def_wind.rows;
-		cellhd->cols = def_wind.cols;
-	    }
-	}
-
-	if (cellhd->proj != def_wind.proj) {
-	    if (type == AS_CELLHD)
-		G_message
-		    ("header projection %d differs from default projection %d",
-		     cellhd->proj, def_wind.proj);
-	    else
-		G_message
-		    ("region projection %d differs from default projection %d",
-		     cellhd->proj, def_wind.proj);
-
-	    if (!G_yes("do you want to make them match? ", 1))
-		return -1;
-
-	    cellhd->proj = def_wind.proj;
-	    cellhd->zone = def_wind.zone;
-	}
-
-	if (cellhd->zone != def_wind.zone) {
-	    if (type == AS_CELLHD)
-		G_message("header zone %d differs from default zone %d",
-			  cellhd->zone, def_wind.zone);
-	    else
-		G_message("region zone %d differs from default zone %d",
-			  cellhd->zone, def_wind.zone);
-
-	    if (!G_yes("do you want to make them match? ", 1))
-		return -1;
-
-	    cellhd->zone = def_wind.zone;
-	}
-
-	*ll_def_north = 0;
-	*ll_def_south = 0;
-	*ll_def_east = 0;
-	*ll_def_west = 0;
-	*ll_def_ewres = 0;
-	*ll_def_nsres = 0;
-	format_northing(def_wind.north, ll_def_north, def_wind.proj);
-	format_northing(def_wind.south, ll_def_south, def_wind.proj);
-	format_easting(def_wind.east, ll_def_east, def_wind.proj);
-	format_easting(def_wind.west, ll_def_west, def_wind.proj);
-	format_resolution(def_wind.ew_res, ll_def_ewres, def_wind.proj);
-	format_resolution(def_wind.ns_res, ll_def_nsres, def_wind.proj);
-    }
-
-    *ll_north = 0;
-    *ll_south = 0;
-    *ll_east = 0;
-    *ll_west = 0;
-    *ll_ewres = 0;
-    *ll_nsres = 0;
-    format_northing(cellhd->north, ll_north, cellhd->proj);
-    format_northing(cellhd->south, ll_south, cellhd->proj);
-    format_easting(cellhd->east, ll_east, cellhd->proj);
-    format_easting(cellhd->west, ll_west, cellhd->proj);
-    format_resolution(cellhd->ew_res, ll_ewres, cellhd->proj);
-    format_resolution(cellhd->ns_res, ll_nsres, cellhd->proj);
-
-    while (1) {
-	ok = 1;
-
-	/* List window options on the screen for the user to answer */
-	switch (type) {
-	case AS_CELLHD:
-	    screen = cellhd_screen;
-	    break;
-	case AS_DEF_WINDOW:
-	    screen = def_window_screen;
-	    break;
-	default:
-	    screen = window_screen;
-	    break;
-	}
-
-	V_clear();
-	line = 0;
-	while (*screen)
-	    V_line(line++, *screen++);
-
-	/* V_ques ( variable, type, row, col, length) ; */
-	V_ques(ll_north, 's', 6, 36, 10);
-	V_ques(ll_south, 's', 10, 36, 10);
-	V_ques(ll_west, 's', 9, 12, 10);
-	V_ques(ll_east, 's', 9, 52, 10);
-
-	if (type != AS_CELLHD) {
-	    V_ques(ll_ewres, 's', 18, 48, 10);
-	    V_ques(ll_nsres, 's', 19, 48, 10);
-	}
-
-	if (type != AS_DEF_WINDOW) {
-	    V_const(ll_def_north, 's', 3, 36, 10);
-	    V_const(ll_def_south, 's', 13, 36, 10);
-	    V_const(ll_def_west, 's', 9, 1, 10);
-	    V_const(ll_def_east, 's', 9, 65, 10);
-
-	    if (type != AS_CELLHD) {
-		V_const(ll_def_ewres, 's', 18, 21, 10);
-		V_const(ll_def_nsres, 's', 19, 21, 10);
-	    }
-	}
-
-	V_const(projection, 's', 15, 23, (int)strlen(projection));
-	V_const(&cellhd->zone, 'i', 15, 60, 3);
-
-	V_intrpt_ok();
-	if (!V_call())
-	    return -1;
-
-	G_squeeze(ll_north);
-	G_squeeze(ll_south);
-	G_squeeze(ll_east);
-	G_squeeze(ll_west);
-
-	if (type != AS_CELLHD) {
-	    G_squeeze(ll_ewres);
-	    G_squeeze(ll_nsres);
-	}
-
-	if (!G_scan_northing(ll_north, &cellhd->north, cellhd->proj)) {
-	    G_warning("Illegal value for north: %s", ll_north);
-	    ok = 0;
-	}
-
-	if (!G_scan_northing(ll_south, &cellhd->south, cellhd->proj)) {
-	    G_warning("Illegal value for south: %s", ll_south);
-	    ok = 0;
-	}
-
-	if (!G_scan_easting(ll_east, &cellhd->east, cellhd->proj)) {
-	    G_warning("Illegal value for east: %s", ll_east);
-	    ok = 0;
-	}
-
-	if (!G_scan_easting(ll_west, &cellhd->west, cellhd->proj)) {
-	    G_warning("Illegal value for west: %s", ll_west);
-	    ok = 0;
-	}
-
-	if (type != AS_CELLHD) {
-	    if (!G_scan_resolution(ll_ewres, &cellhd->ew_res, cellhd->proj)) {
-		G_warning("Illegal east-west resolution: %s", ll_ewres);
-		ok = 0;
-	    }
-
-	    if (!G_scan_resolution(ll_nsres, &cellhd->ns_res, cellhd->proj)) {
-		G_warning("Illegal north-south resolution: %s", ll_nsres);
-		ok = 0;
-	    }
-	}
-
-	if (!ok) {
-	    hitreturn();
-	    continue;
-	}
-
-	/* Adjust and complete the cell header */
-	north = cellhd->north;
-	south = cellhd->south;
-	east = cellhd->east;
-	west = cellhd->west;
-	nsres = cellhd->ns_res;
-	ewres = cellhd->ew_res;
-
-	if ((err =
-	     G_adjust_Cell_head(cellhd, type == AS_CELLHD,
-				type == AS_CELLHD))) {
-	    G_message("%s", err);
-	    hitreturn();
-	    continue;
-	}
-
-	if (type == AS_CELLHD) {
-	    nsres = cellhd->ns_res;
-	    ewres = cellhd->ew_res;
-	}
-
-      SHOW:
-	fprintf(stderr, "\n\n");
-	G_message("  projection:   %s", projection);
-	G_message("  zone:         %d", cellhd->zone);
-
-	G_format_northing(cellhd->north, buf, cellhd->proj);
-	G_format_northing(north, buf2, cellhd->proj);
-	fprintf(stderr, "  north:       %s", buf);
-
-	if (strcmp(buf, buf2) != 0) {
-	    ok = 0;
-	    fprintf(stderr, "  (Changed to match resolution)");
-	}
-	fprintf(stderr, "\n");
-
-	G_format_northing(cellhd->south, buf, cellhd->proj);
-	G_format_northing(south, buf2, cellhd->proj);
-	fprintf(stderr, "  south:       %s", buf);
-	if (strcmp(buf, buf2) != 0) {
-	    ok = 0;
-	    fprintf(stderr, "  (Changed to match resolution)");
-	}
-	fprintf(stderr, "\n");
-
-	G_format_easting(cellhd->east, buf, cellhd->proj);
-	G_format_easting(east, buf2, cellhd->proj);
-	fprintf(stderr, "  east:        %s", buf);
-	if (strcmp(buf, buf2) != 0) {
-	    ok = 0;
-	    fprintf(stderr, "  (Changed to match resolution)");
-	}
-	fprintf(stderr, "\n");
-
-	G_format_easting(cellhd->west, buf, cellhd->proj);
-	G_format_easting(west, buf2, cellhd->proj);
-	fprintf(stderr, "  west:        %s", buf);
-	if (strcmp(buf, buf2) != 0) {
-	    ok = 0;
-	    fprintf(stderr, "  (Changed to match resolution)");
-	}
-	fprintf(stderr, "\n\n");
-
-	G_format_resolution(cellhd->ew_res, buf, cellhd->proj);
-	G_format_resolution(ewres, buf2, cellhd->proj);
-	fprintf(stderr, "  e-w res:     %s", buf);
-	if (strcmp(buf, buf2) != 0) {
-	    ok = 0;
-	    fprintf(stderr, "  (Changed to conform to grid)");
-	}
-	fprintf(stderr, "\n");
-
-	G_format_resolution(cellhd->ns_res, buf, cellhd->proj);
-	G_format_resolution(nsres, buf2, cellhd->proj);
-	fprintf(stderr, "  n-s res:     %s", buf);
-	if (strcmp(buf, buf2) != 0) {
-	    ok = 0;
-	    fprintf(stderr, "  (Changed to conform to grid)");
-	}
-	fprintf(stderr, "\n\n");
-
-	G_message("  total rows:  %15d", cellhd->rows);
-	G_message("  total cols:  %15d", cellhd->cols);
-
-	sprintf(buf, "%lf", (double)cellhd->rows * cellhd->cols);
-	*(p = strchr(buf, '.')) = 0;
-	G_insert_commas(buf);
-	G_message("  total cells: %15s", buf);
-	fprintf(stderr, "\n");
-
-	if (type != AS_DEF_WINDOW) {
-	    if (cellhd->north > def_wind.north) {
-		G_warning("north falls outside the default region");
-		ok = 0;
-	    }
-
-	    if (cellhd->south < def_wind.south) {
-		G_warning("south falls outside the default region");
-		ok = 0;
-	    }
-
-	    if (cellhd->proj != PROJECTION_LL) {
-		if (cellhd->east > def_wind.east) {
-		    G_warning("east falls outside the default region");
-		    ok = 0;
-		}
-
-		if (cellhd->west < def_wind.west) {
-		    G_warning("west falls outside the default region");
-		    ok = 0;
-		}
-	    }
-	}
-
-      ASK:
-	fflush(stdin);
-	if (type == AS_CELLHD)
-	    fprintf(stderr, "\nDo you accept this header? (y/n) [%s] > ",
-		    ok ? "y" : "n");
-	else
-	    fprintf(stderr, "\nDo you accept this region? (y/n) [%s] > ",
-		    ok ? "y" : "n");
-
-	if (!G_gets(buf))
-	    goto SHOW;
-
-	G_strip(buf);
-	switch (*buf) {
-	case 0:
-	    break;
-	case 'y':
-	case 'Y':
-	    ok = 1;
-	    break;
-	case 'n':
-	case 'N':
-	    ok = 0;
-	    break;
-	default:
-	    goto ASK;
-	}
-
-	if (ok)
-	    return 0;
-    }
-}
-
-
-static int hitreturn(void)
-{
-    char buf[100];
-
-    fprintf(stderr, "hit RETURN -->");
-    if (!fgets(buf, 100, stdin))
-	exit(EXIT_SUCCESS);
-
-    G_strip(buf);
-    if (!strncmp(buf, "exit", sizeof(buf)))
-	exit(EXIT_SUCCESS);
-
-    return 0;
-}

Deleted: grass/trunk/lib/edit/edit_hist.c
===================================================================
--- grass/trunk/lib/edit/edit_hist.c	2008-08-06 00:57:07 UTC (rev 32550)
+++ grass/trunk/lib/edit/edit_hist.c	2008-08-06 03:28:21 UTC (rev 32551)
@@ -1,145 +0,0 @@
-
-/****************************************************************************
- *
- * MODULE:       edit library functions
- * AUTHOR(S):    Originally part of gis lib dir in CERL GRASS code
- *               Subsequent (post-CVS) contributors:
- *               Glynn Clements <glynn gclements.plus.com>,
- *               Radim Blazek <radim.blazek gmail.com>,
- *               Eric G. Miller <egm2 jps.net>,
- *               Markus Neteler <neteler itc.it>,
- *               Brad Douglas <rez touchofmadness.com>,
- *               Bernhard Reiter <bernhard intevation.de>
- * PURPOSE:      libraries for interactively editing raster support data
- * COPYRIGHT:    (C) 1996-2006 by the GRASS Development Team
- *
- *               This program is free software under the GNU General Public
- *               License (>=v2). Read the file COPYING that comes with GRASS
- *               for details.
- *
- *****************************************************************************/
-/*
- **********************************************************************
- *
- *   E_edit_history (hist)
- *      struct History *hist 
- *
- *   Interactively prompts the user for history information.
- *   Uses screen oriented prompting through the visual_ask library.
- *   Programs using this must be compiled with the GRASS library $(VASKLIB)
- *   and include $(CURSES) in the compile line
- *
- *   Returns: 1 ok
- *           -1 user canceled edit
- *
- **********************************************************************/
-
-#include <grass/gis.h>
-#include <grass/vask.h>
-#include <grass/edit.h>
-
-int E_edit_history(struct History *phist)
-{
-    int len;
-    int i;
-
-    if (!*phist->mapid)
-	sprintf(phist->mapid, "%s : %s", G_date(), "filename");
-    if (!*phist->title)
-	sprintf(phist->title, "%s", "filename");
-    if (!*phist->mapset)
-	sprintf(phist->mapset, "%s", G_mapset());
-    if (!*phist->creator)
-	sprintf(phist->creator, "%s", G_whoami());
-    if (!*phist->maptype)
-	sprintf(phist->maptype, "raster");
-
-    V_clear();
-    V_line(0, "		 ENTER/CORRECT FILE HISTORY INFORMATION");
-    V_line(2, "Map ID ...");
-    V_line(4, "Title ....");
-    V_line(6, "Project ..");
-    V_line(8, "Creator ..");
-    V_line(10, "Maptype ..");
-    V_line(12, "Data source");
-    V_line(16, "Data Description");
-    V_line(19, "For history comments see next page");
-
-    len = RECORD_LEN - 1;
-    if (len > 65)
-	len = 65;
-    phist->mapid[len] = 0;
-    phist->title[len] = 0;
-    phist->mapset[len] = 0;
-    phist->creator[len] = 0;
-    phist->maptype[len] = 0;
-    len--;
-
-    V_const(phist->mapid, 's', 2, 11, len);
-    V_ques(phist->title, 's', 4, 11, len);
-    V_const(phist->mapset, 's', 6, 11, len);
-    V_const(phist->creator, 's', 8, 11, len);
-    V_ques(phist->maptype, 's', 10, 11, len);
-
-    phist->datsrc_1[len] = 0;
-    phist->datsrc_2[len] = 0;
-    phist->keywrd[len] = 0;
-    len--;
-
-    V_ques(phist->datsrc_1, 's', 13, 0, len);
-    V_ques(phist->datsrc_2, 's', 14, 0, len);
-    V_ques(phist->keywrd, 's', 17, 0, len);
-
-    V_intrpt_ok();
-    if (!V_call())
-	return -1;
-
-    G_strip(phist->title);
-    G_strip(phist->maptype);
-    G_strip(phist->datsrc_1);
-    G_strip(phist->datsrc_2);
-    G_strip(phist->keywrd);
-
-    V_clear();
-    V_line(0, "		 ENTER/CORRECT FILE HISTORY COMMENTS");
-    V_ques(phist->edhist[0], 's', 2, 0, len);
-    V_ques(phist->edhist[1], 's', 3, 0, len);
-    V_ques(phist->edhist[2], 's', 4, 0, len);
-    V_ques(phist->edhist[3], 's', 5, 0, len);
-    V_ques(phist->edhist[4], 's', 6, 0, len);
-    V_ques(phist->edhist[5], 's', 7, 0, len);
-    V_ques(phist->edhist[6], 's', 8, 0, len);
-    V_ques(phist->edhist[7], 's', 9, 0, len);
-    V_ques(phist->edhist[8], 's', 10, 0, len);
-    V_ques(phist->edhist[9], 's', 11, 0, len);
-    V_ques(phist->edhist[10], 's', 12, 0, len);
-    V_ques(phist->edhist[11], 's', 13, 0, len);
-    V_ques(phist->edhist[12], 's', 14, 0, len);
-    V_ques(phist->edhist[13], 's', 15, 0, len);
-    V_ques(phist->edhist[14], 's', 16, 0, len);
-    V_ques(phist->edhist[15], 's', 17, 0, len);
-    V_ques(phist->edhist[16], 's', 18, 0, len);
-    V_ques(phist->edhist[17], 's', 19, 0, len);
-    V_ques(phist->edhist[18], 's', 20, 0, len);
-    V_ques(phist->edhist[19], 's', 21, 0, 65);
-
-    len++;
-    for (i = 0; i <= 19; i++)
-	phist->edhist[i][len] = 0;
-
-    V_intrpt_ok();
-    if (!V_call())
-	return -1;
-
-    for (i = 0; i <= 19; i++)
-	G_strip(phist->edhist[i]);
-
-    for (phist->edlinecnt = 19; phist->edlinecnt > 0; phist->edlinecnt--) {
-	if (*phist->edhist[phist->edlinecnt] != 0)
-	    break;
-    }
-    phist->edlinecnt++;
-    V_clear();
-
-    return (1);
-}

Deleted: grass/trunk/lib/gis/ask.c
===================================================================
--- grass/trunk/lib/gis/ask.c	2008-08-06 00:57:07 UTC (rev 32550)
+++ grass/trunk/lib/gis/ask.c	2008-08-06 03:28:21 UTC (rev 32551)
@@ -1,618 +0,0 @@
-
-/****************************************************************
-* These routines prompt the user for names of GIS data files
-*
-* G_ask_new           (prompt, name, element, desc)
-* G_ask_old           (prompt, name, element, desc)
-* G_ask_any           (prompt, name, element, desc, warn)
-* G_ask_in_mapset     (prompt, name, element, desc)
-* G_ask_new_file      (prompt, name, element, desc)
-* G_ask_old_file      (prompt, name, element, desc)
-*
-* G_ask_new_ext       (prompt, name, element, desc, option, lister)
-* G_ask_old_ext       (prompt, name, element, desc, option, lister)
-* G_ask_any_ext       (prompt, name, element, desc, warn, option, lister)
-* G_ask_in_mapset_ext (prompt, name, element, desc, option, lister)
-*
-*   char *prompt      prompt to be printed. can be "" in which
-*                     case an appropriate prompt will be printed.
-*   char *name        buffer to hold the name input by the user
-*   char *element     GIS data element - "cell", "vect", etc.
-*   char *desc        a description of element.  Used for prompting
-*                     and listing. Will be set to element if given as ""
-*                     (eg, if element is "vect", set desc = "vector")
-*   char *option      list option. a description of the option.
-*                     (eg, "with utms" will prompt as follows:
-*                     list -f for a list with utms)
-*   int (*lister)()   subroutine to return text for -f option.
-*
-*
-* G_ask_new() requires the user to enter the name of a file
-*             which does not exist in the current mapset
-*             (but which may exist in other mapsets).
-*
-* G_ask_old() requires the user to enter the name of a file
-*             which already exists.
-*
-* G_ask_in_mapset() requires the user to enter the name of a file
-*                   which exists in the current mapset
-*
-* G_ask_any() accepts any legal filename. Optionally warns user
-*             if the file exists in the current mapset.
-*
-* G_ask_new_file() requires the user to enter the name of a new file.
-*
-* G_ask_old_file() requires the user to enter the name of any existing file.
-*
-* returns:
-*   char *    mapset where file was found, or
-*             mapset where file is to be created
-*   NULL      user hit RETURN to cancel the request
-*
-* note:
-*  These routines have a 'list' function built in.  If a list -f
-*  option is also desired, create a lister() routine, and
-*  use G_ask_xxx_ext(). The lister() routine will be called as
-*  follows:
-*
-*       lister (name, mapset, buf)
-*
-*       char *name        name of file 
-*       char *mapset      mapset to where file lives
-*       char *buf         buffer to hold description.
-*                         lister() should copy into buf.
-*                         buf will be large (about 400 bytes)
-*                         but only first 60 chars will be displayed
-*
-*
-*  for each mapset, lister() will be called once with
-*  name set to the empty string "" in order to get an title for the
-*  list.  Set buf to null to suppress title, otherwise copy title
-*  into buf.  The title will start above the text for the files.
-*
-*  then for each file in each mapset, lister() will be called
-*  to obtain infomation about the file.
-*
-* also:
-*   G_set_ask_return_msg (msg) char *msg;
-*   can be used to change the hit RETURN to cancel request message
-*   displayed during the ask prompting.
-*
-*   G_get_ask_return_msg() will return the msg.
-******************************************************************/
-#include <string.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <grass/gis.h>
-#include <grass/glocale.h>
-
-/*
- * OLD references any mapset
- * NEW, ANY, PRJ are for the current mapset only
- *
- * OLD means must exist in some mapset
- * NEW means must not exist in current mapset
- * ANY means just get a name. If file exists, (optionally) warn user.
- * PRJ means must exist in current mapset
- */
-
-#define OLD 0
-#define NEW 1
-#define PRJ 2
-#define ANY 3
-#define ANY_NW 4
-#define OLD_FILE 5
-#define NEW_FILE 6
-
-static char *ask_return_msg = 0;
-static char clear_return_msg = 0;
-static int (*no_lister) () = 0;
-static int parselist(const char *, int, char *);
-static char *ask(const char *, char *, char *, char *, char *, int (*)(),
-		 int);
-
-
-/*!
- * \brief prompt for new database file
- *
- * The user is asked to enter the name of
- * a new file which does not exist in the current mapset.
- * <b>Note.</b> The file chosen by the user may exist in other mapsets. This
- * routine does not look in other mapsets, since the assumption is that
- * <b>name</b> will be used to create a new file. New files are always created
- * in the current mapset.
- *
- *  \param prompt
- *  \param name
- *  \param element
- *  \param desc
- *  \return char * 
- */
-
-char *G_ask_new(const char *prompt, char *name, char *element, char *desc)
-{
-    return ask(prompt, name, element, desc, (char *)NULL, no_lister, NEW);
-}
-
-char *G_ask_new_ext(const char *prompt, char *name, char *element, char *desc,
-		    char *option, int (*lister) ())
-{
-    return ask(prompt, name, element, desc, option, lister, NEW);
-}
-
-
-/*!
- * \brief prompt for existing database file
- *
- * The user is asked to enter the
- * name of an existing database file.
- * <b>Note.</b> This routine looks for the file in the current mapset as well
- * as other mapsets. The mapsets that are searched are determined from the user's
- * mapset search path. See Mapset_Search_Path for some more details
- * about the search path.
- *
- *  \param prompt
- *  \param name
- *  \param element
- *  \param label
- *  \return char * 
- */
-
-char *G_ask_old(const char *prompt, char *name, char *element, char *desc)
-{
-    return ask(prompt, name, element, desc, (char *)NULL, no_lister, OLD);
-}
-
-char *G_ask_old_ext(const char *prompt, char *name, char *element, char *desc,
-		    char *option, int (*lister) ())
-{
-    return ask(prompt, name, element, desc, option, lister, OLD);
-}
-
-
-/*!
- * \brief prompt for any valid file name
- *
- * The user is asked to enter
- * any leg al file name. If <b>warn</b> is 1 and the file chosen exists in the
- * current mapset, then the user is asked if it is ok to overwrite the file. If
- * <b>warn</b> is 0, then any leg al name is accepted and no warning is issued
- * to the user if the file exists.
- *
- *  \param prompt
- *  \param name
- *  \param element
- *  \param label
- *  \param warn
- *  \return char * 
- */
-
-char *G_ask_any(const char *prompt, char *name, char *element, char *desc,
-		int warn)
-{
-    return ask(prompt, name, element, desc, (char *)NULL, no_lister,
-	       warn ? ANY : ANY_NW);
-}
-
-char *G_ask_any_ext(const char *prompt, char *name, char *element, char *desc,
-		    int warn, char *option, int (*lister) ())
-{
-    return ask(prompt, name, element, desc, option, lister,
-	       warn ? ANY : ANY_NW);
-}
-
-
-/*!
- * \brief prompt for existing database file
- *
- * The user is asked to enter the
- * name of an file which exists in the current mapset.
- * <b>Note.</b> The file chosen by the user may or may not exist in other
- * mapsets. This routine does not look in other mapsets, since the assumption is
- * that <b>name</b> will be used to modify a file. GRASS only permits users to
- * modify files in the current mapset.
- *
- *  \param prompt
- *  \param name
- *  \param element
- *  \param label
- *  \return char * 
- */
-
-char *G_ask_in_mapset(const char *prompt, char *name, char *element,
-		      char *desc)
-{
-    return ask(prompt, name, element, desc, (char *)NULL, no_lister, PRJ);
-}
-
-char *G_ask_in_mapset_ext(const char *prompt, char *name, char *element,
-			  char *desc, char *option, int (*lister) ())
-{
-    return ask(prompt, name, element, desc, option, lister, PRJ);
-}
-
-
-/*!
- * \brief prompt for new file
- *
- * The user is asked to enter the name of an file which doesn't exist.
- *
- *  \param prompt
- *  \param name
- *  \param element
- *  \param label
- *  \return char * 
- */
-
-char *G_ask_new_file(const char *prompt, char *name, char *element,
-		     char *desc)
-{
-    /* element is a dummy parameter for this function */
-    return ask(prompt, name, element, desc, (char *)NULL, no_lister,
-	       NEW_FILE);
-}
-
-/* do we need this function?
-   char *
-   G_ask_new_file_ext (prompt, name, element, desc, option, lister)
-   char *prompt;
-   char *name;
-   char *element;
-   char *desc;
-   char *option;
-   int (*lister)();
-   {
-   return ask (prompt, name, element, desc, option, lister, NEW_FILE);
-   }
- */
-
-
-/*!
- * \brief prompt for existing file
- *
- * The user is asked to enter the name of an file which exists.
- *
- *  \param prompt
- *  \param name
- *  \param element
- *  \param label
- *  \return char * 
- */
-
-char *G_ask_old_file(const char *prompt, char *name, char *element,
-		     char *desc)
-{
-    /* element is a dummy parameter for this function */
-    return ask(prompt, name, element, desc, (char *)NULL, no_lister,
-	       OLD_FILE);
-}
-
-/* do we need this function?
-   char *
-   G_ask_old_file_ext (prompt, name, element, desc, option, lister)
-   char *prompt;
-   char *name;
-   char *element;
-   char *desc;
-   char *option;
-   int (*lister)();
-   {
-   return ask (prompt, name, element, desc, option, lister, OLD_FILE);
-   }
- */
-
-
-/*!
- * \brief set Hit RETURN msg
- *
- * The "Hit
- * RETURN to cancel request" part of the prompt in the prompting routines
- * described above, is modified to "Hit RETURN <b>msg.</b>"
- *
- *  \param msg
- *  \return int
- */
-
-int G_set_ask_return_msg(const char *msg)
-{
-    if (ask_return_msg)
-	G_free(ask_return_msg);
-    ask_return_msg = G_store(msg);
-    clear_return_msg = 0;
-
-    return 0;
-}
-
-
-/*!
- * \brief get Hit RETURN msg
- *
- *  The current
- * <i>msg</i> (as set by <i>G_set_ask_return_msg</i>) is returned.
- *
- *  \param void
- *  \return char * 
- */
-
-char *G_get_ask_return_msg()
-{
-    static char none[80];
-
-    strcpy(none, _("to cancel request"));
-    return (ask_return_msg == NULL ? none : ask_return_msg);
-}
-
-static char *ask(const char *prompt,
-		 char *name,
-		 char *element,
-		 char *desc, char *option, int (*lister) (), int type)
-{
-    char tmapset[GMAPSET_MAX];
-    char xname[GNAME_MAX], xmapset[GMAPSET_MAX];
-    int name_is_qualified;
-    int ok;
-    char tprompt[256];
-    char input[256];
-    char *mapset;
-    char *cur_mapset;
-
-    G__check_gisinit();
-
-    fflush(stdout);
-    /* RETURN msg */
-    if (clear_return_msg) {
-	G_free(ask_return_msg);
-	ask_return_msg = 0;
-    }
-    clear_return_msg = ask_return_msg ? 1 : 0;
-
-    /* make sure option is valid */
-    if (lister && (option == 0 || *option == 0))
-	lister = 0;
-
-    /* set name to NO NAME at outset */
-    *name = 0;
-
-    /*
-     * if element description not given, make it the same as the
-     * element name
-     */
-    if (desc == 0 || *desc == 0)
-	desc = element;
-
-    /*
-     * if no prompt is given, build an approriate prompt
-     */
-    if (prompt == 0 || *prompt == 0) {
-	switch (type) {
-	case NEW:
-	case NEW_FILE:
-	    sprintf(tprompt, _("Enter a new %s file name"), desc);
-	    prompt = tprompt;
-	    break;
-	case OLD:
-	case PRJ:
-	case OLD_FILE:
-	    sprintf(tprompt, _("Enter the name of an existing %s file"),
-		    desc);
-	    prompt = tprompt;
-	    break;
-	default:
-	    sprintf(tprompt, _("Enter %s file name"), desc);
-	    prompt = tprompt;
-	    break;
-	}
-    }
-
-    /*
-     * get the current mapset name
-     */
-    cur_mapset = G_mapset();
-
-    while (1) {
-	/*
-	 * print the prompt and input the request
-	 */
-	do {
-	    fprintf(stderr, "\n%s\n", prompt);
-	    /* no listing function implemented for old_file and new_file */
-	    if (type != OLD_FILE && type != NEW_FILE)
-		fprintf(stderr,
-			_("Enter 'list' for a list of existing %s files\n"),
-			desc);
-	    if (lister) {
-		fprintf(stderr, _("Enter 'list -f' for "));
-		if (option && *option)
-		    fprintf(stderr, _("a list %s"), option);
-		else
-		    fprintf(stderr, _("an extended list"));
-		fprintf(stderr, "\n");
-	    }
-
-	    fprintf(stderr, _("Hit RETURN %s\n"), G_get_ask_return_msg());
-	    fprintf(stderr, "> ");
-	}
-	while (!G_gets(input));
-
-	G_strip(input);
-	fprintf(stderr, "<%s>\n", input);
-
-	/*
-	 * if the user just hit return (or blanks only)
-	 * return NULL
-	 */
-	if (*input == 0)
-	    return 0;
-
-	if (type == OLD_FILE || type == NEW_FILE) {
-	    int exist;
-
-	    exist = (access(input, 0) == 0);
-	    if (type == OLD_FILE && !exist) {
-		fprintf(stderr, _("\n** %s - not found **\n"), input);
-		continue;
-	    }
-	    if (type == NEW_FILE && exist) {
-		char question[200];
-
-		sprintf(question,
-			_("\n** %s exists. ok to overwrite? "), input);
-		if (!G_yes(question, 0))
-		    continue;
-	    }
-	    strcpy(name, input);
-	    return G_store(input);
-	}
-	/*
-	 * 'list' does a list without extension. if we are looking for a new
-	 * file only list the current mapset. Otherwise list all mapsets
-	 * in the mapset search list
-	 *
-	 * 0  not a list request
-	 * 1  list
-	 * 2  list -f
-	 * 3  list mapset
-	 * 4  list -f mapset
-	 */
-
-	switch (parselist(input, lister ? 1 : 0, tmapset)) {
-	case 0:
-	    break;
-	case 1:
-	    G_list_element(element, desc, type == OLD ? "" : cur_mapset,
-			   no_lister);
-	    continue;
-	case 2:
-	    G_list_element(element, desc, type == OLD ? "" : cur_mapset,
-			   lister);
-	    continue;
-	case 3:
-	    G_list_element(element, desc, tmapset, no_lister);
-	    continue;
-	case 4:
-	    G_list_element(element, desc, tmapset, lister);
-	    continue;
-	default:
-	    fprintf(stderr, "** illegal request **\n");
-	    continue;
-	}
-
-	if ((name_is_qualified =
-	     G__name_is_fully_qualified(input, xname, xmapset)))
-	    ok = G_legal_filename(xname) >= 0;
-	else
-	    ok = G_legal_filename(input) >= 0;
-	if (!ok) {
-	    fprintf(stderr, _("\n**<%s> illegal name **\n"), input);
-	    continue;
-	}
-	/*
-	 * now look for the file.
-	 *
-	 * new files must be simple names
-	 * and must not exist in the current mapset
-	 */
-	if (type != OLD) {
-	    if (name_is_qualified) {
-		if (strcmp(cur_mapset, xmapset) != 0) {
-		    fprintf(stderr, _("\n** %s - illegal request **\n"),
-			    input);
-		    continue;
-		}
-		strcpy(input, xname);
-	    }
-	    mapset = G_find_file(element, input, cur_mapset);
-	    switch (type) {
-	    case NEW:
-
-		if (!mapset) {
-		    strcpy(name, input);
-		    return cur_mapset;
-		}
-		fprintf(stderr,
-			_("\n** %s - exists, select another name **\n"),
-			input);
-		break;
-
-	    case ANY:
-	    case ANY_NW:
-
-		if (mapset && type == ANY) {
-		    char question[200];
-
-		    sprintf(question,
-			    _("\n** %s exists. ok to overwrite? "), input);
-		    if (!G_yes(question, 0))
-			break;
-		}
-		strcpy(name, input);
-		return cur_mapset;
-
-	    case PRJ:
-
-		if (mapset) {
-		    strcpy(name, input);
-		    return cur_mapset;
-		}
-		fprintf(stderr, _("\n** %s - not found **\n"), input);
-		break;
-
-	    default:
-		G_fatal_error(_("ask: can't happen"));
-	    }
-	}
-	/*
-	 * old names can be simple or qualified
-	 * and must exist
-	 */
-	else {
-	    mapset = G_find_file(element, input, "");
-	    if (mapset) {
-		if (name_is_qualified)
-		    strcpy(name, xname);
-		else
-		    strcpy(name, input);
-		return mapset;
-	    }
-	    fprintf(stderr, _("\n** %s - not found **\n"), input);
-	}
-    }
-
-    return NULL;
-}
-
-static int parselist(const char *input, int option, char *mapset)
-{
-    char list[GNAME_MAX];
-    char f1[GMAPSET_MAX];
-    char f2[GMAPSET_MAX];
-    char f3[GMAPSET_MAX];
-    int count;
-
-    *list = *f1 = *f2 = 0;
-    count = sscanf(input, "%s%s%s%s", list, f1, f2, f3);
-    if (count < 1)
-	return 0;
-    if (strcmp(list, "list") != 0)
-	return 0;
-
-    if (count == 1)
-	return 1;		/* list */
-    if (count > 3)
-	return -1;		/* illegal */
-
-    if (*f1 == '-') {		/* list -f */
-	if (!option)
-	    return -1;
-	if (f1[1] == 0 || f1[1] != 'f' || f1[2] != 0)
-	    return -1;
-	if (count == 2)
-	    return 2;
-	strcpy(mapset, f2);
-	return 4;
-    }
-    if (count != 2)
-	return -1;
-    strcpy(mapset, f1);
-    return 3;
-}

Deleted: grass/trunk/lib/gis/ask_cell.c
===================================================================
--- grass/trunk/lib/gis/ask_cell.c	2008-08-06 00:57:07 UTC (rev 32550)
+++ grass/trunk/lib/gis/ask_cell.c	2008-08-06 03:28:21 UTC (rev 32551)
@@ -1,114 +0,0 @@
-/*
- *************************************************************************
- *   char *
- *   G_ask_cell_new(prompt, name)) 
- *       asks user to input name of a new cell file
- *
- *   char *
- *   G_ask_cell_old(prompt, name) 
- *       asks user to input name of an existing cell file
- *
- *   char *
- *   G_ask_cell_in_mapset(prompt, name)
- *       asks user to input name of an existing cell file in current mapset
- *
- *   char *
- *   G_ask_cell_any(prompt, name)
- *       asks user to input name of a new or existing cell file in
- *       the current mapset. Warns user about (possible) overwrite
- *       if cell file already exists
- *
- *   parms:
- *      const char *prompt    optional prompt for user
- *      char *name            buffer to hold name of map found
- *
- *   returns:
- *      char *pointer to a string with name of mapset
- *       where file was found, or NULL if not found
- *
- *   note:
- *      rejects all names that begin with .
- **********************************************************************/
-#include <stdlib.h>
-#include <string.h>
-#include <grass/gis.h>
-#include <grass/glocale.h>
-
-static int lister(char *, char *, char *);
-
-
-/*!
- * \brief prompt for new raster map
- *
- * Asks the user to enter a name for a raster map which does not
- * exist in the current mapset.
- *
- *  \param prompt
- *  \param name
- *  \return char * 
- */
-
-char *G_ask_cell_new(const char *prompt, char *name)
-{
-
-    return G_ask_new_ext(prompt, name, "cell", "raster", _("with titles"),
-			 lister);
-}
-
-
-/*!
- * \brief prompt for existing raster map
- *
- * Asks the user to enter the name of an existing raster
- * file in any mapset in the database.
- *
- *  \param prompt
- *  \param name
- *  \return char * 
- */
-
-char *G_ask_cell_old(const char *prompt, char *name)
-{
-    return G_ask_old_ext(prompt, name, "cell", "raster", _("with titles"),
-			 lister);
-}
-
-
-/*!
- * \brief prompt for existing raster map
- *
- * Asks the user to enter the name of an existing raster
- * file in the current mapset.
- *
- *  \param prompt
- *  \param name
- *  \return char * 
- */
-
-char *G_ask_cell_in_mapset(const char *prompt, char *name)
-{
-    return G_ask_in_mapset_ext(prompt, name, "cell", "raster",
-			       _("with titles"), lister);
-}
-
-char *G_ask_cell_any(const char *prompt, char *name)
-{
-    return G_ask_any_ext(prompt, name, "cell", "raster", 1, _("with titles"),
-			 lister);
-}
-
-static int lister(char *name, char *mapset, char *buf)
-{
-    char *title;
-
-    *buf = 0;
-    if (*name == 0)
-	return 0;
-
-    strcpy(buf, title = G_get_cell_title(name, mapset));
-    if (*buf == 0)
-	strcpy(buf, _("(no title)"));
-    G_free(title);
-
-    return 0;
-}

Deleted: grass/trunk/lib/gis/ask_vctrs.c
===================================================================
--- grass/trunk/lib/gis/ask_vctrs.c	2008-08-06 00:57:07 UTC (rev 32550)
+++ grass/trunk/lib/gis/ask_vctrs.c	2008-08-06 03:28:21 UTC (rev 32551)
@@ -1,86 +0,0 @@
-/*
- ***********************************************************************
- * prompt for vector maps (digit)
- *
- *   char *
- *   G_ask_vector_new(prompt, name)) 
- *       asks user to input name of a new vector map
- *
- *   char *
- *   G_ask_vector_old(prompt, name) 
- *       asks user to input name of an existing vector map
- *
- *   char *
- *   G_ask_vector_any(prompt, name)
- *       asks user to input any vector name
- *
- *   char *
- *   G_ask_vector_in_mapset(prompt, name)
- *       asks user to input name of an existing vector map
- *       in current mapset
- *
- *   parms:
- *      const char *prompt    optional prompt for user
- *      char *name            buffer to hold name of map found
- *
- *   returns:
- *      char *pointer to a string with name of mapset
- *       where file was found, or NULL if not found
- **********************************************************************/
-#include <grass/gis.h>
-
-
-/*!
- * \brief prompt for a new vector map
- *
- * Asks the user to enter a name for a vector map which does not
- * exist in the current mapset.
- *
- *  \param prompt
- *  \param name
- *  \return char * 
- */
-
-char *G_ask_vector_new(const char *prompt, char *name)
-{
-    return G_ask_new(prompt, name, "vector", "vector");
-}
-
-
-/*!
- * \brief prompt for an existing vector map
- *
- * Asks the user to enter the name of an existing vector
- * file in any mapset in the database.
- *
- *  \param prompt
- *  \param name
- *  \return char * 
- */
-
-char *G_ask_vector_old(const char *prompt, char *name)
-{
-    return G_ask_old(prompt, name, "vector", "vector");
-}
-
-char *G_ask_vector_any(const char *prompt, char *name)
-{
-    return G_ask_any(prompt, name, "vector", "vector", 1);
-}
-
-
-/*!
- * \brief prompt for an existing vector map
- *
- * Asks the user to enter the name of an existing vector
- * file in the current mapset.
- *
- *  \param prompt
- *  \param name
- *  \return char * 
- */
-
-char *G_ask_vector_in_mapset(const char *prompt, char *name)
-{
-    return G_ask_in_mapset(prompt, name, "vector", "vector");
-}

Deleted: grass/trunk/lib/gis/get_datum_name.c
===================================================================
--- grass/trunk/lib/gis/get_datum_name.c	2008-08-06 00:57:07 UTC (rev 32550)
+++ grass/trunk/lib/gis/get_datum_name.c	2008-08-06 03:28:21 UTC (rev 32551)
@@ -1,123 +0,0 @@
-/*
- *
- ****************************************************************************
- *
- * MODULE:       GRASS 5.0 gis library, get_datum_name.c
- * AUTHOR(S):    unknown, updated by Andreas Lange, andreas.lange at rhein-main.de
- * PURPOSE:      Get datum name for new location database
- * COPYRIGHT:    (C) 2000 by the GRASS Development Team
- *
- *               This program is free software under the GNU General Public
- *               License (>=v2). Read the file COPYING that comes with GRASS
- *               for details.
- *
- *****************************************************************************/
-
-#include <string.h>
-#include <unistd.h>
-#include <stdlib.h>
-#include <grass/gis.h>
-#include <grass/glocale.h>
-
-/***********************************************************************
- * G_ask_datum_name(char *datumname, char *ellpsname)
- *
- * ask interactively for a valid datum name
- *
- * returns <0 on error
- * returns 1 on success
- ***********************************************************************/
-
-/*!
- * \brief ask for a valid datum name
- *
- * This function asks the user interactively for a valid datum name from the datum
- * table. The datum name is stored in the character array pointed to by
- * <b>datum</b>. The function returns 1 on sucess, -1 if no datum was entered
- * on command line and 0 on internal error. 
- *
- *  \param datum
- *  \return int
- */
-
-int G_ask_datum_name(char *datumname, char *ellpsname)
-{
-    char buff[1024], answer[100], ellipse[100];
-    char *dat, *Tmp_file;
-    FILE *Tmp_fd = NULL;
-    int i;
-
-
-    for (;;) {
-	do {
-	    fprintf(stderr, _("\nPlease specify datum name\n"));
-	    fprintf(stderr,
-		    _("Enter 'list' for the list of available datums\n"));
-	    fprintf(stderr,
-		    _
-		    ("or 'custom' if you wish to enter custom parameters\n"));
-	    fprintf(stderr, _("Hit RETURN to cancel request\n"));
-	    fprintf(stderr, ">");
-	} while (!G_gets(answer));
-	G_strip(answer);
-
-	if (strlen(answer) == 0)
-	    return -1;
-
-	if (strcmp(answer, "list") == 0) {
-	    Tmp_file = G_tempfile();
-	    if (NULL == (Tmp_fd = fopen(Tmp_file, "w")))
-		G_warning(_("Cannot open temp file"));
-	    else {
-		char *pager;
-
-		fprintf(Tmp_fd, "Short Name\tLong Name / Description\n---\n");
-		for (i = 0; (dat = G_datum_name(i)); i++) {
-		    fprintf(Tmp_fd, "%s\t%s\n\t\t\t(%s ellipsoid)\n---\n",
-			    dat, G_datum_description(i),
-			    G_datum_ellipsoid(i));
-		}
-		fclose(Tmp_fd);
-
-		pager = getenv("GRASS_PAGER");
-		if (!pager || strlen(pager) == 0)
-		    pager = "cat";
-		sprintf(buff, "%s \"%s\" 1>&2", pager,
-			G_convert_dirseps_to_host(Tmp_file));
-		G_system(buff);
-
-		remove(Tmp_file);
-	    }
-	    G_free(Tmp_file);
-	}
-	else {
-	    if (G_strcasecmp(answer, "custom") == 0)
-		break;
-
-	    if (G_get_datum_by_name(answer) < 0) {
-		fprintf(stderr, _("\ninvalid datum\n"));
-	    }
-	    else
-		break;
-	}
-    }
-
-
-    if (G_strcasecmp(answer, "custom") == 0) {
-	/* For a custom datum we need to interactively ask for the ellipsoid */
-	if (G_ask_ellipse_name(ellipse) < 0)
-	    return -1;
-	sprintf(ellpsname, ellipse);
-	sprintf(datumname, "custom");
-    }
-    else {
-	/* else can look it up from datum.table */
-	if ((i = G_get_datum_by_name(answer)) < 0)
-	    return -1;
-	sprintf(ellpsname, G_datum_ellipsoid(i));
-	sprintf(datumname, G_datum_name(i));
-    }
-
-    return 1;
-
-}

Deleted: grass/trunk/lib/gis/get_ell_name.c
===================================================================
--- grass/trunk/lib/gis/get_ell_name.c	2008-08-06 00:57:07 UTC (rev 32550)
+++ grass/trunk/lib/gis/get_ell_name.c	2008-08-06 03:28:21 UTC (rev 32551)
@@ -1,79 +0,0 @@
-/*
- ****************************************************************************
- *
- * MODULE:       GRASS 5 gis library, get_ell_name.c
- * AUTHOR(S):    unknown, updated by Andreas Lange, andreas.lange at rhein-main.de
- * PURPOSE:      Get ellipse name from user
- * COPYRIGHT:    (C) 2000 by the GRASS Development Team
- *
- *               This program is free software under the GNU General Public
- *               License (>=v2). Read the file COPYING that comes with GRASS
- *               for details.
- *
- *****************************************************************************/
-
-#include <string.h>
-#include <unistd.h>
-#include <stdlib.h>
-#include <grass/gis.h>
-#include <grass/glocale.h>
-
-int G_ask_ellipse_name(char *spheroid)
-{
-    char buff[1024], answer[50];
-    double aa, e2;
-    char *sph, *Tmp_file;
-    FILE *Tmp_fd = NULL;
-    int i;
-
-    Tmp_file = G_tempfile();
-    if (NULL == (Tmp_fd = fopen(Tmp_file, "w"))) {
-	G_fatal_error(_("Cannot open temp file"));
-    }
-    fprintf(Tmp_fd, "sphere\n");
-    for (i = 0; (sph = G_ellipsoid_name(i)); i++) {
-	fprintf(Tmp_fd, "%s\n", sph);
-    }
-
-    fclose(Tmp_fd);
-
-    for (;;) {
-	do {
-	    fprintf(stderr, _("\nPlease specify ellipsoid name\n"));
-	    fprintf(stderr,
-		    _("Enter 'list' for the list of available ellipsoids\n"));
-	    fprintf(stderr, _("Hit RETURN to cancel request\n"));
-	    fprintf(stderr, ">");
-	} while (!G_gets(answer));
-	G_strip(answer);
-	if (strlen(answer) == 0)
-	    return -1;
-	if (strcmp(answer, "list") == 0) {
-	    char *pager;
-
-	    pager = getenv("GRASS_PAGER");
-	    if (!pager || strlen(pager) == 0)
-		pager = "cat";
-
-	    /* Always print interactive output to stderr */
-	    sprintf(buff, "%s \"%s\" 1>&2", pager,
-		    G_convert_dirseps_to_host(Tmp_file));
-	    G_system(buff);
-	}
-	else {
-	    if (strcmp(answer, "sphere") == 0)
-		break;
-	    if (G_get_ellipsoid_by_name(answer, &aa, &e2) == 0) {
-		fprintf(stderr, _("\ninvalid ellipsoid\n"));
-	    }
-	    else
-		break;
-	}
-    }
-    sprintf(spheroid, "%s", answer);
-    remove(Tmp_file);
-    if (strcmp(spheroid, "sphere") == 0) {
-	return 2;
-    }
-    return 1;
-}

Deleted: grass/trunk/lib/gis/get_projname.c
===================================================================
--- grass/trunk/lib/gis/get_projname.c	2008-08-06 00:57:07 UTC (rev 32550)
+++ grass/trunk/lib/gis/get_projname.c	2008-08-06 03:28:21 UTC (rev 32551)
@@ -1,86 +0,0 @@
-/*
- ****************************************************************************
- *
- * MODULE:       GRASS 5 gis library, get_projname.c
- * AUTHOR(S):    unknown
- * PURPOSE:      Get projection name from user
- * COPYRIGHT:    (C) 2000 by the GRASS Development Team
- *
- *               This program is free software under the GNU General Public
- *               License (>=v2). Read the file COPYING that comes with GRASS
- *               for details.
- *
- *****************************************************************************/
-
-#include <string.h>
-#include <unistd.h>
-#include <stdlib.h>
-#include <grass/gis.h>
-#include <grass/glocale.h>
-
-int G_ask_proj_name(char *proj_id, char *proj_name)
-{
-    char path[GPATH_MAX], buff[GPATH_MAX], answer[50], *a;
-    struct Key_Value *in_proj_keys;
-    char *Tmp_file;
-    FILE *Tmp_fd = NULL;
-    int in_stat, i, npr;
-
-    sprintf(path, "%s/etc/projections", G_gisbase());
-    while (access(path, 0) != 0)
-	G_fatal_error(_("%s not found"), path);
-    in_proj_keys = G_read_key_value_file(path, &in_stat);
-    if (in_stat != 0)
-	G_fatal_error(_("ERROR in reading %s"), path);
-    npr = in_proj_keys->nitems;
-    Tmp_file = G_tempfile();
-    if (NULL == (Tmp_fd = fopen(Tmp_file, "w"))) {
-	G_fatal_error(_("Cannot open temp file"));
-    }
-    for (i = 0; i < npr; i++) {
-	fprintf(Tmp_fd, "%s -- %s\n", in_proj_keys->key[i],
-		in_proj_keys->value[i]);
-    }
-    fclose(Tmp_fd);
-
-    for (;;) {
-
-	do {
-	    fprintf(stderr, _("\n\nPlease specify projection name\n"));
-	    fprintf(stderr,
-		    _
-		    ("Enter 'list' for the list of available projections\n"));
-	    fprintf(stderr, _("Hit RETURN to cancel request\n"));
-	    fprintf(stderr, ">");
-	} while (!G_gets(answer));
-
-	G_strip(answer);
-	if (strlen(answer) == 0)
-	    return -1;
-	if (strcmp(answer, "list") == 0) {
-	    char *pager;
-
-	    pager = getenv("GRASS_PAGER");
-	    if (!pager || strlen(pager) == 0)
-		pager = "cat";
-
-	    /* Always print interactive output to stderr */
-	    sprintf(buff, "%s \"%s\" 1>&2", pager,
-		    G_convert_dirseps_to_host(Tmp_file));
-	    G_system(buff);
-	}
-	else {
-	    a = G_find_key_value(answer, in_proj_keys);
-	    if (a == NULL) {
-		fprintf(stderr, _("\ninvalid projection\n"));
-	    }
-	    else
-		break;
-	}
-    }
-
-    sprintf(proj_id, "%s", answer);
-    sprintf(proj_name, "%s", a);
-    remove(Tmp_file);
-    return 1;
-}

Deleted: grass/trunk/lib/gis/gets.c
===================================================================
--- grass/trunk/lib/gis/gets.c	2008-08-06 00:57:07 UTC (rev 32550)
+++ grass/trunk/lib/gis/gets.c	2008-08-06 03:28:21 UTC (rev 32551)
@@ -1,99 +0,0 @@
-#include <grass/gis.h>
-#include <unistd.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <signal.h>
-
-/**********************************************************
- * G_gets (buf)
- *    char *buf      buffer to receive data
- *
- *  does a gets() from stdin. exits upon EOF.
- *  if stdin is a tty (ie, not a pipe or redirected)
- *  then ctrl-z is detected
- *
- * returns
- *  1 read ok
- *  0 ctrl-z entered. calling routine should re-print a prompt
- *    and call G_gets() again
- *
- * note: This is very useful for allowing a program to 
- *       reprompt after the program is restarted after
- *       being stopped with a ctrl-Z.
- *
- * sample use:
- *   do {
- *      fprintf (stderr, "Enter some input:  ") ;
- *   } while ( ! G_gets(buff) )  ;
- *
- *   If the user suspends the process at this prompt G_gets will return
- *   "0" causing the reprompting.
- ***********************************************************/
-
-static int ctrlz = 0;
-static void catch_ctrlz(int);
-static void catch_int(int);
-
-
-int G_gets(char *buf)
-{
-#ifdef SIGTSTP
-    RETSIGTYPE(*sigtstp) ();
-    int tty;
-#endif
-    char p[128];
-    char *eof;
-
-    ctrlz = 0;
-#ifdef SIGTSTP
-    if ((tty = isatty(0))) {
-	sigtstp = signal(SIGTSTP, catch_ctrlz);
-	if (sigtstp != (RETSIGTYPE(*)())SIG_DFL)
-	    signal(SIGTSTP, sigtstp);
-    }
-#endif
-    eof = fgets(p, 100, stdin);
-    /* strip the EOL character      */
-    if (strlen(p) > 1 && p[strlen(p) - 1] == '\n' && p[strlen(p) - 2] == '\r')
-	p[strlen(p) - 2] = '\0';	/* Handles DOS/Windows "\r\n" */
-    else
-	p[strlen(p) - 1] = '\0';	/* Handles Unix "\n" or old Mac "\r" */
-    /*      buf could be any length.  Any overflow will occur here. */
-    strcpy(buf, p);
-
-#ifdef SIGTSTP
-    if (tty)
-	signal(SIGTSTP, sigtstp);
-#endif
-    if (eof)
-	return 1;
-    if (ctrlz)
-	return 0;
-
-    exit(EXIT_SUCCESS);
-}
-
-static void catch_ctrlz(int n)
-{
-#ifdef __MINGW32__
-    G_warning("catch_ctrlz: ignored Ctrl-z");
-#else
-
-    RETSIGTYPE(*sigint) ();
-
-    /* having caught ctrlz - effect a ctrl-z using kill */
-    ctrlz = 1;
-    signal(n, SIG_DFL);
-    kill(0, n);
-
-    /* for berkley systems, ctrlz will not cause eof on read */
-    sigint = signal(SIGINT, catch_int);
-    kill(getpid(), SIGINT);
-    signal(SIGINT, sigint);
-#endif
-}
-
-static void catch_int(int n)
-{
-}

Deleted: grass/trunk/lib/gis/intr_char.c
===================================================================
--- grass/trunk/lib/gis/intr_char.c	2008-08-06 00:57:07 UTC (rev 32550)
+++ grass/trunk/lib/gis/intr_char.c	2008-08-06 03:28:21 UTC (rev 32551)
@@ -1,48 +0,0 @@
-#include <grass/gis.h>
-
-#include <grass/config.h>
-#ifndef __MINGW32__
-#if defined(HAVE_TERMIOS_H)
-# include <termios.h>
-# define TYPE termios
-# define C c_cc[VINTR]
-#elif defined(HAVE_TERMIO_H)
-# include <termio.h>
-# define TYPE termio
-# define C c_cc[VINTR]
-# define GET TCGETA
-#else
-# include <sgtty.h>
-# define TYPE tchars
-# define C t_intrc
-# define GET TIOCGETC
-#endif
-#endif
-
-/*!
- * \brief return interrupt char
- *
- * This routine returns the
- * user's keyboard interrupt character. This is the character that generates the
- * SIGINT signal from the keyboard.
- *
- *  \param ~
- *  \return char 
- */
-
-char G_intr_char(void)
-{
-    char c = 0;
-
-#ifndef __MINGW32__
-    struct TYPE buf;
-
-#ifdef HAVE_TERMIOS_H
-    tcgetattr(2, &buf);
-#else
-    ioctl(2, GET, &buf);
-#endif
-    c = buf.C;
-#endif
-    return c;
-}

Deleted: grass/trunk/lib/gis/make_colr.c
===================================================================
--- grass/trunk/lib/gis/make_colr.c	2008-08-06 00:57:07 UTC (rev 32550)
+++ grass/trunk/lib/gis/make_colr.c	2008-08-06 03:28:21 UTC (rev 32551)
@@ -1,95 +0,0 @@
-
-/**********************************************************************
- *
- *   G_make_color (name, mapset, colors)
- *       char *name               name of map
- *       char *mapset             mapset containing name
- *       struct Colors *colors    struct to hold colors
- *
- *   Interactively prompts user for deciding which type of color
- *   lookup table is desired.
- *       Red, green, and blue color ramps
- *       Gray scale
- *       Rainbow colors
- *       Random colors
- *       Color wave
- *       Aspect colors
- *       Red through yellow to green
- *
- *   Returns -1 user canceled the request
- *            1 color table is ok
- **********************************************************************/
-
-#include <grass/gis.h>
-#include <grass/glocale.h>
-
-int G_ask_colors(const char *name, const char *mapset, struct Colors *pcolr)
-{
-    char buff[128];
-    int answ;
-    struct FPRange range;
-    DCELL min, max;
-
-    G_init_colors(pcolr);
-
-    /* determine range cell values */
-    if (G_read_fp_range(name, mapset, &range) < 0)
-	return -1;
-    G_get_fp_range_min_max(&range, &min, &max);
-    if (G_is_d_null_value(&min) || G_is_d_null_value(&max)) {
-	sprintf(buff, _(" The raster map %s@%s is empty"), name, mapset);
-	G_warning(buff);
-	return -1;
-    }
-
-    /* Prompting */
-  ASK:
-    G_clear_screen();
-    fprintf(stderr,
-	    _("\n\nColor table needed for file [%s] in mapset [%s].\n"), name,
-	    mapset);
-
-    fprintf(stderr, _("\nPlease identify the type desired:\n"));
-    fprintf(stderr, _("    1:  Random colors\n"));
-    fprintf(stderr, _("    2:  Red, green, and blue color ramps\n"));
-    fprintf(stderr, _("    3:  Color wave\n"));
-    fprintf(stderr, _("    4:  Gray scale\n"));
-    fprintf(stderr, _("    5:  Aspect\n"));
-    fprintf(stderr, _("    6:  Rainbow colors\n"));
-    fprintf(stderr, _("    7:  Red through yellow to green\n"));
-    fprintf(stderr, _("    8:  Green through yellow to red\n"));
-    fprintf(stderr, _("RETURN  quit\n"));
-    fprintf(stderr, "\n> ");
-
-    for (;;) {
-	if (!G_gets(buff))
-	    goto ASK;
-	G_strip(buff);
-	if (*buff == 0)
-	    return -1;
-	if (sscanf(buff, "%d", &answ) != 1)
-	    answ = -1;
-
-	switch (answ) {
-	case 1:
-	    return G_make_random_colors(pcolr, (CELL) min, (CELL) max);
-	case 2:
-	    return G_make_ramp_fp_colors(pcolr, min, max);
-	case 3:
-	    return G_make_wave_fp_colors(pcolr, min, max);
-	case 4:
-	    return G_make_grey_scale_fp_colors(pcolr, min, max);
-	case 5:
-	    return G_make_aspect_fp_colors(pcolr, min, max);
-	case 6:
-	    return G_make_rainbow_fp_colors(pcolr, min, max);
-	case 7:
-	    return G_make_ryg_fp_colors(pcolr, min, max);
-	case 8:
-	    return G_make_gyr_fp_colors(pcolr, min, max);
-	default:
-	    fprintf(stderr, _("\n%s invalid; Try again > "), buff);
-	    break;
-	}
-    }
-}

Modified: grass/trunk/lib/gis/parser.c
===================================================================
--- grass/trunk/lib/gis/parser.c	2008-08-06 00:57:07 UTC (rev 32550)
+++ grass/trunk/lib/gis/parser.c	2008-08-06 03:28:21 UTC (rev 32551)
@@ -130,10 +130,6 @@
 static int split_opts(void);
 static int check_multiple_opts(void);
 static int check_overwrite(void);
-static int interactive(const char *);
-static int interactive_flag(struct Flag *);
-static int interactive_option(struct Option *);
-static int gis_prompt(struct Option *, char *);
 static int split_gisprompt(const char *, char *, char *, char *);
 
 static void G_gui(void);
@@ -807,15 +803,8 @@
     /* If there are NO arguments, go interactive */
 
     if (argc < 2 && interactive_ok && isatty(0)) {
-	if (getenv("GRASS_UI_TERM")) {
-	    interactive(argv[0]);
-	    opt_checked = 1;
-	    /* all options have been already checked interactively */
-	}
-	else {
-	    G_gui();
-	    return -1;
-	}
+	G_gui();
+	return -1;
     }
     else if (argc < 2 && isatty(0)) {
 	G_usage();
@@ -2564,134 +2553,6 @@
     return (error);
 }
 
-static int interactive(const char *command)
-{
-    struct Item *item;
-
-    /* Query for flags */
-
-    if (!n_items) {
-	fprintf(stderr, "PROGRAMMER ERROR: no flags or options\n");
-	exit(EXIT_FAILURE);
-    }
-
-    for (item = &first_item;;) {
-	if (item->flag)
-	    interactive_flag(item->flag);
-	else if (item->option)
-	    interactive_option(item->option);
-	else
-	    break;
-
-	item = item->next_item;
-
-	if (item == NULL)
-	    break;
-    }
-
-    return 0;
-}
-
-static int interactive_flag(struct Flag *flag)
-{
-    char buff[1024];
-
-    fprintf(stderr, _("\nFLAG: Set the following flag?\n"));
-    sprintf(buff, "    %s?", flag->description);
-    flag->answer = G_yes(buff, 0);
-
-    return 0;
-}
-
-static int interactive_option(struct Option *opt)
-{
-    char buff[1024], *bptr;
-    char buff2[1024];
-    int set_one;
-    int no_prompt;
-
-    fprintf(stderr, _("\nOPTION:   %s\n"), opt->description);
-    fprintf(stderr, _("     key: %s\n"), opt->key);
-    if (opt->key_desc)
-	fprintf(stderr, _("  format: %s\n"), opt->key_desc);
-    if (opt->def)
-	fprintf(stderr, _(" default: %s\n"), opt->def);
-    fprintf(stderr, _("required: %s\n"), opt->required ? "YES" : "NO");
-    if (opt->multiple)
-	fprintf(stderr, _("multiple: %s\n"), opt->multiple ? "YES" : "NO");
-    if (opt->options)
-	fprintf(stderr, _(" options: %s\n"), opt->options);
-    /*
-       show_options(0, opt->options) ;
-     */
-
-    set_one = 0;
-    for (;;) {
-	*buff = '\0';
-	if (opt->gisprompt)
-	    no_prompt = gis_prompt(opt, buff);
-	else
-	    no_prompt = -1;
-	if (no_prompt) {
-	    fprintf(stderr, _("enter option > "));
-	    if (fgets(buff, 1024, stdin) == 0)
-		exit(EXIT_SUCCESS);;
-	    bptr = buff;	/* strip newline  */
-	    while (*bptr) {
-		if (*bptr == '\n')
-		    *bptr = '\0';
-		bptr++;
-	    }
-
-	}
-
-	if (strlen(buff) != 0) {
-	    if (opt->options)
-		/* then check option */
-	    {
-		if (check_an_opt(opt->key, opt->type, opt->options, buff)) {
-		    if (G_yes(_("   Try again? "), 1))
-			continue;
-		    else
-			exit(EXIT_FAILURE);
-		}
-	    }
-	    if (opt->checker)
-		if (opt->checker(buff)) {
-		    fprintf(stderr, _("Sorry, %s is not accepted.\n"), buff);
-		    *buff = '\0';
-		    if (G_yes(_("   Try again? "), 1))
-			continue;
-		    else
-			exit(EXIT_FAILURE);
-		}
-
-	    sprintf(buff2, "%s=%s", opt->key, buff);
-	    if (!opt->gisprompt) {
-		fprintf(stderr, _("\nYou have chosen:\n  %s\n"), buff2);
-		if (G_yes(_("Is this correct? "), 1)) {
-		    set_option(buff2);
-		    set_one++;
-		}
-	    }
-	    else {
-		set_option(buff2);
-		set_one++;
-	    }
-	}			/* if strlen(buf ) !=0 */
-
-	if ((strlen(buff) == 0) && opt->required && (set_one == 0))
-	    exit(EXIT_FAILURE);
-	if ((strlen(buff) == 0) && (set_one > 0) && opt->multiple)
-	    break;
-	if ((strlen(buff) == 0) && !opt->required)
-	    break;
-	if ((set_one == 1) && !opt->multiple)
-	    break;
-    }
-    return (0);
-}
-
 static int split_gisprompt(const char *gisprompt, char *age, char *element,
 			   char *desc)
 {
@@ -2722,52 +2583,6 @@
     return 0;
 }
 
-static int gis_prompt(struct Option *opt, char *buff)
-{
-    char age[KEYLENGTH];
-    char element[KEYLENGTH];
-    char desc[KEYLENGTH];
-    char *ptr1;
-
-    split_gisprompt(opt->gisprompt, age, element, desc);
-
-	/*********ptr1 points to current mapset description***********/
-
-    if (opt->answer)
-	G_set_ask_return_msg(_("to accept the default"));
-    if (!strcmp("old", age)) {
-	ptr1 = G_ask_old("", buff, element, desc);
-	if (ptr1) {
-	    strcpy(buff, G_fully_qualified_name(buff, ptr1));
-	}
-    }
-    else if (!strcmp("new", age))
-	ptr1 = G_ask_new("", buff, element, desc);
-    else if (!strcmp("mapset", age))
-	ptr1 = G_ask_in_mapset("", buff, element, desc);
-    else if (!strcmp("any", age))
-	ptr1 = G_ask_any("", buff, element, desc, 1);
-    else if (!strcmp("old_file", age))	/* file must exist */
-	ptr1 = G_ask_old_file("", buff, element, desc);
-    else if (!strcmp("new_file", age))	/* file shouldn't exist unless overwrite is enabled */
-	ptr1 = G_ask_new_file("", buff, element, desc);
-    else if (!strcmp("color", age))
-	/* These prompts are only implemented in the gui */
-	/* The data can still be entered in the console */
-	return -1;
-    else {
-	fprintf(stderr,
-		"\nPROGRAMMER ERROR: first item in gisprompt is <%s>\n", age);
-	fprintf(stderr,
-		"        Must be either new, old, mapset, any, old_file, new_file, or color\n");
-	return -1;
-    }
-    if (ptr1 == '\0')
-	*buff = '\0';
-
-    return 0;
-}
-
 /**
  * \brief Creates command to run non-interactive.
  *

Deleted: grass/trunk/lib/gis/yes.c
===================================================================
--- grass/trunk/lib/gis/yes.c	2008-08-06 00:57:07 UTC (rev 32550)
+++ grass/trunk/lib/gis/yes.c	2008-08-06 03:28:21 UTC (rev 32551)
@@ -1,71 +0,0 @@
-
-/**
- * \file yes.c
- *
- * \brief GIS Library - Yes/No functions.
- *
- * (C) 2001-2008 by the GRASS Development Team
- *
- * This program is free software under the GNU General Public License
- * (>=v2). Read the file COPYING that comes with GRASS for details.
- *
- * \author GRASS GIS Development Team
- *
- * \date 1999-2008
- */
-
-#include <stdio.h>
-#include <grass/gis.h>
-
-
-/**
- * \brief Ask a yes/no question.
- *
- * This routine prints a <b>question</b> to the user, and expects the user to
- * respond either yes or no. (Invalid responses are rejected and the process is
- * repeated until the user answers yes or no.)<br>
- * The <b>default</b> indicates what the RETURN key alone should mean. A
- * <b>default</b> of 1 indicates that RETURN means yes, 0 indicates that RETURN
- * means no. The <b>question</b> will be appended with ''(y/n) '', and, 
- * if <b>default</b> is not -1, with ''[y] '' or ''[n] '', depending on 
- * the <b>default.</b><br>
- *
- * \param[in] question
- * \param[in] dflt
- * \return 0 for No
- * \return 1 for Yes
- */
-
-int G_yes(const char *question, int dflt)
-{
-    fflush(stdout);
-
-    while (1) {
-	char answer[100];
-
-	fprintf(stderr, "%s", question);
-
-	while (1) {
-	    fprintf(stderr, "(y/n) ");
-	    if (dflt >= 0)
-		fprintf(stderr, dflt == 0 ? "[n] " : "[y] ");
-
-	    fflush(stderr);
-	    if (!G_gets(answer))
-		break;
-	    G_strip(answer);
-
-	    switch (*answer) {
-	    case 'y':
-	    case 'Y':
-		return (1);
-	    case 'n':
-	    case 'N':
-		return (0);
-	    case 0:
-		if (dflt >= 0)
-		    return (dflt);
-	    }
-	}
-    }
-}

Deleted: grass/trunk/lib/imagery/ask_group.c
===================================================================
--- grass/trunk/lib/imagery/ask_group.c	2008-08-06 00:57:07 UTC (rev 32550)
+++ grass/trunk/lib/imagery/ask_group.c	2008-08-06 03:28:21 UTC (rev 32551)
@@ -1,67 +0,0 @@
-
-/*************************************************************
-* I_ask_group_old (prompt,group)
-*
-* prompt the user for an imagery group file name
-*************************************************************/
-#include <string.h>
-#include <grass/gis.h>
-#include <grass/imagery.h>
-static int ask_group(char *, char *);
-
-
-/*!
- * \brief prompt for an existing group
- *
- * Asks the user to enter the name of an existing <b>group</b>
- * in the current mapset.
- *
- *  \param prompt
- *  \param group
- *  \return int
- */
-
-int I_ask_group_old(char *prompt, char *group)
-{
-    while (1) {
-	if (*prompt == 0)
-	    prompt = "Select an imagery group file";
-	if (!ask_group(prompt, group))
-	    return 0;
-	if (I_find_group(group))
-	    return 1;
-	fprintf(stderr, "\n** %s - not found **\n\n", group);
-    }
-}
-
-static int ask_group(char *prompt, char *group)
-{
-    char buf[1024];
-
-    while (1) {
-	fprintf(stderr, "\n%s\n", prompt);
-	fprintf(stderr,
-		"Enter 'list' for a list of existing imagery groups\n");
-	fprintf(stderr, "Enter 'list -f' for a verbose listing\n");
-	fprintf(stderr, "Hit RETURN %s\n", G_get_ask_return_msg());
-	fprintf(stderr, "> ");
-	if (!G_gets(buf))
-	    continue;
-
-	G_squeeze(buf);
-	fprintf(stderr, "<%s>\n", buf);
-	if (*buf == 0)
-	    return 0;
-
-	if (strcmp(buf, "list") == 0)
-	    I_list_groups(0);
-	else if (strcmp(buf, "list -f") == 0)
-	    I_list_groups(1);
-	else if (G_legal_filename(buf) < 0)
-	    fprintf(stderr, "\n** <%s> - illegal name **\n\n", buf);
-	else
-	    break;
-    }
-    strcpy(group, buf);
-    return 1;
-}

Modified: grass/trunk/lib/imagery/ls_groups.c
===================================================================
--- grass/trunk/lib/imagery/ls_groups.c	2008-08-06 00:57:07 UTC (rev 32550)
+++ grass/trunk/lib/imagery/ls_groups.c	2008-08-06 03:28:21 UTC (rev 32551)
@@ -71,9 +71,6 @@
     fclose(temp);
     G_spawn(getenv("GRASS_PAGER"), getenv("GRASS_PAGER"), tempfile, NULL);
     remove(tempfile);
-    fprintf(stdout, "hit RETURN to continue -->");
-    fflush(stdout);
-    G_gets(buf);
 
     return 0;
 }
@@ -129,9 +126,6 @@
     fclose(temp);
     G_spawn(getenv("GRASS_PAGER"), getenv("GRASS_PAGER"), tempfile, NULL);
     remove(tempfile);
-    fprintf(stdout, "hit RETURN to continue -->");
-    fflush(stdout);
-    G_gets(buf);
 
     return 0;
 }

Modified: grass/trunk/lib/init/Makefile
===================================================================
--- grass/trunk/lib/init/Makefile	2008-08-06 00:57:07 UTC (rev 32550)
+++ grass/trunk/lib/init/Makefile	2008-08-06 03:28:21 UTC (rev 32551)
@@ -23,20 +23,11 @@
 START_UP=grass$(GRASS_VERSION_MAJOR)$(GRASS_VERSION_MINOR)
 
 EXTRA_CFLAGS = -DD_LOCATION_NAME=\"$(DEFAULT_LOCATION)\" -DD_GISDBASE=\"$(DEFAULT_DATABASE)\" -DGRASS_VERSION_NUMBER=\"'$(GRASS_VERSION_NUMBER)'\" -DGRASS_VERSION_UPDATE_PKG=\"'$(GRASS_VERSION_UPDATE_PKG)'\"
-SET_DATA = $(OBJDIR)/set_data.o $(OBJDIR)/mke_mapset.o \
-	   $(OBJDIR)/mke_loc.o $(OBJDIR)/chk_dbase.o $(OBJDIR)/other.o
 
-ifdef USE_CURSES
-SET_DATA_PROG = $(ETC)/set_data$(EXE)
-else
-SET_DATA_PROG =
-endif
-
 FILES = \
 	$(ARCH_BINDIR)/$(START_UP) \
 	$(ETC)/Init.sh \
 	$(ETC)/prompt.sh \
-	$(SET_DATA_PROG) \
 	$(ETC)/clean_temp$(EXE) \
 	$(ETC)/lock$(EXE) \
 	$(ETC)/run$(EXE) \
@@ -118,9 +109,6 @@
 	$< > $@"
 	chmod +x $@
 
-$(ETC)/set_data$(EXE): $(SET_DATA)
-	$(CC) $(LDFLAGS) -o $@ $(SET_DATA) $(EDITLIB) $(GISLIB) $(DATETIMELIB) $(VASKLIB) $(CURSES) $(MATHLIB) $(XDRLIB)
-
 $(ETC)/echo$(EXE): $(OBJDIR)/echo.o
 	$(CC) $(LDFLAGS) $(OBJDIR)/echo.o -o $@
 

Deleted: grass/trunk/lib/init/chk_dbase.c
===================================================================
--- grass/trunk/lib/init/chk_dbase.c	2008-08-06 00:57:07 UTC (rev 32550)
+++ grass/trunk/lib/init/chk_dbase.c	2008-08-06 03:28:21 UTC (rev 32551)
@@ -1,38 +0,0 @@
-#include <stdio.h>
-#include <sys/types.h>
-#include <unistd.h>
-#include <sys/stat.h>
-#ifndef __MINGW32__
-#  include <pwd.h>
-#endif
-
-int can_make_location(char *gisdbase, char *location)
-{
-    struct stat s;
-    struct passwd *pwd;
-
-    /* make sure this is a directory */
-    if (stat(gisdbase, &s) != 0) {
-	fprintf(stderr, "\n** %s not found **\n", gisdbase);
-	return 0;
-    }
-    if (!(s.st_mode & S_IFDIR)) {
-	fprintf(stderr, "\n** %s is not a directory **\n", gisdbase);
-	return 0;
-    }
-
-    /* look for write permission */
-    if (access(gisdbase, 2) == 0)
-	return 1;
-
-    fprintf(stderr, "\nNote\n");
-    fprintf(stderr,
-	    " You don't have permission under %s to create a new location\n",
-	    gisdbase);
-#ifndef __MINGW32__
-    if ((pwd = getpwuid(s.st_uid)))
-	fprintf(stderr, " See user %s about creating location %s\n",
-		pwd->pw_name, location);
-#endif
-    return 0;
-}

Deleted: grass/trunk/lib/init/mke_loc.c
===================================================================
--- grass/trunk/lib/init/mke_loc.c	2008-08-06 00:57:07 UTC (rev 32550)
+++ grass/trunk/lib/init/mke_loc.c	2008-08-06 03:28:21 UTC (rev 32551)
@@ -1,195 +0,0 @@
-#include <string.h>
-#include <stdlib.h>
-#include <stdio.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <grass/gis.h>
-#include "local_proto.h"
-
-int make_location(const char *gisdbase, const char *location_name)
-{
-    struct Cell_head window;
-    char buf[GPATH_MAX];
-    int i;
-    char myname[75];
-    char *mapset;
-    char *name, c;
-    FILE *fp;
-
-    G_clear_screen();
-    fprintf(stderr,
-	    "To create a new LOCATION, you will need the following information:\n");
-    fprintf(stderr, "\n");
-    fprintf(stderr, "1. The coordinate system for the database\n");
-    /*for (i = 1; name = G__projection_name(i); i++) */
-    fprintf(stderr, "        %s (for imagery and other unreferenced data)\n",
-	    G__projection_name(PROJECTION_XY));
-    fprintf(stderr, "        %s\n", G__projection_name(PROJECTION_LL));
-    fprintf(stderr, "        %s\n", G__projection_name(PROJECTION_UTM));
-    fprintf(stderr, "        %s\n", G__projection_name(PROJECTION_OTHER));
-    fprintf(stderr, "2. The zone for the %s database\n",
-	    G__projection_name(PROJECTION_UTM));
-    fprintf(stderr,
-	    "   and all the necessary parameters for projections other than\n");
-    fprintf(stderr, "   %s, %s, and %s\n", G__projection_name(PROJECTION_LL),
-	    G__projection_name(PROJECTION_XY),
-	    G__projection_name(PROJECTION_UTM));
-    fprintf(stderr,
-	    "3. The coordinates of the area to become the default region\n");
-    fprintf(stderr, "   and the grid resolution of this region\n");
-    fprintf(stderr,
-	    "4. A short, one-line description or title for the location\n");
-    fprintf(stderr, "\n");
-
-    if (!G_yes("Do you have all this information? ", 1))
-	return 0;
-
-    G_zero(&window, sizeof(window));
-    while (1) {
-	G_clear_screen();
-	fprintf(stderr,
-		"Please specify the coordinate system for location <%s>\n\n",
-		location_name);
-	fprintf(stderr, "A   %s\n", G__projection_name(PROJECTION_XY));
-	fprintf(stderr, "B   %s\n", G__projection_name(PROJECTION_LL));
-	fprintf(stderr, "C   %s\n", G__projection_name(PROJECTION_UTM));
-	fprintf(stderr, "D   %s\n", G__projection_name(PROJECTION_OTHER));
-	fprintf(stderr, "RETURN to cancel\n");
-	fprintf(stderr, "\n");
-	fprintf(stderr, "> ");
-	if (!G_gets(buf))
-	    continue;
-	G_strip(buf);
-	if (*buf == 0)
-	    return 0;
-	if (sscanf(buf, "%c", &c) != 1)
-	    continue;
-	switch (c) {
-	case 'A':
-	    i = PROJECTION_XY;
-	    break;
-	case 'a':
-	    i = PROJECTION_XY;
-	    break;
-	case 'B':
-	    i = PROJECTION_LL;
-	    break;
-	case 'b':
-	    i = PROJECTION_LL;
-	    break;
-	case 'C':
-	    i = PROJECTION_UTM;
-	    break;
-	case 'c':
-	    i = PROJECTION_UTM;
-	    break;
-	case 'D':
-	    i = PROJECTION_OTHER;
-	    break;
-	case 'd':
-	    i = PROJECTION_OTHER;
-	    break;
-	default:
-	    continue;
-	}
-	name = G__projection_name(i);
-	if (name == NULL)
-	    continue;
-	fprintf(stderr, "\n");
-	sprintf(buf, "\n%s coordinate system? ", name);
-	if (G_yes(buf, 1))
-	    break;
-    }
-    window.proj = i;
-    /*
-       while (window.proj == PROJECTION_UTM)
-       {
-       fprintf (stderr, " ("Please specify the %s zone for location <%s>\n",
-       G__projection_name(window.proj), location_name);
-       fprintf (stderr, " ("or RETURN to cancel\n");
-       fprintf (stderr, " ("\n");
-       fprintf (stderr, " ("> ");
-       if (!G_gets(buf))
-       continue;
-       G_strip (buf);
-       if (*buf == 0) return 0;
-       if (sscanf (buf, "%d", &i) != 1)
-       continue;
-       if (i > 0 && i <= 60)
-       {
-       fprintf(stderr, "zone %d is illegal"\n);
-       fprintf (stderr, " ("\n");
-       sprintf (buf, "zone %d? ", i);
-       if (G_yes (buf, 1))
-       {
-       window.zone = i;
-       break;
-       }
-       }
-     */
-
-    while (1) {
-	G_clear_screen();
-	fprintf(stderr,
-		"Please enter a one line description for location <%s>\n\n",
-		location_name);
-	fprintf(stderr, "> ");
-	if (!G_gets(buf))
-	    continue;
-	G_squeeze(buf);
-	buf[sizeof(myname)] = 0;
-	G_squeeze(buf);
-	fprintf(stderr,
-		"=====================================================\n");
-	fprintf(stderr, "%s\n", buf);
-	fprintf(stderr,
-		"=====================================================\n");
-	if (G_yes("ok? ", *buf != 0))
-	    break;
-    }
-    strcpy(myname, buf);
-    /*
-       if(G_edit_cellhd(&window, -1) < 0)
-       return 0;
-     */
-
-    mapset = "PERMANENT";
-    G__setenv("MAPSET", mapset);
-    G__setenv("LOCATION_NAME", location_name);
-
-    sprintf(buf, "%s/%s", gisdbase, location_name);
-    if (G_mkdir(buf) < 0)
-	return 0;
-    sprintf(buf, "%s/%s/%s", gisdbase, location_name, mapset);
-    if (G_mkdir(buf) < 0)
-	return 0;
-    /* set the dummy window */
-    window.north = 1.;
-    window.south = 0.;
-    window.top = 1.;
-    window.bottom = 0.;
-    window.rows = 1;
-    window.rows3 = 1;
-    window.cols = 1;
-    window.cols3 = 1;
-    window.depths = 1;
-    window.ew_res = 1.;
-    window.ew_res3 = 1.;
-    window.ns_res = 1.;
-    window.ns_res3 = 1.;
-    window.tb_res = 1.;
-    window.east = 1.;
-    window.west = 0.;
-    window.zone = 0.;
-    /* make a dummy default window for location */
-    /* later after calling g.setrpj we will let user create a real default window */
-    G__put_window(&window, "", "DEFAULT_WIND");
-    G__put_window(&window, "", "WIND");
-
-    sprintf(buf, "%s/%s/%s/MYNAME", gisdbase, location_name, mapset);
-    fp = fopen(buf, "w");
-    fputs(myname, fp);
-    fclose(fp);
-
-    return 1;
-}

Deleted: grass/trunk/lib/init/mke_mapset.c
===================================================================
--- grass/trunk/lib/init/mke_mapset.c	2008-08-06 00:57:07 UTC (rev 32550)
+++ grass/trunk/lib/init/mke_mapset.c	2008-08-06 03:28:21 UTC (rev 32551)
@@ -1,52 +0,0 @@
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <fcntl.h>
-#include <unistd.h>
-#include <errno.h>
-extern int errno;
-
-#include <grass/gis.h>
-
-int make_mapset(const char *location, const char *mapset)
-{
-    char buffer[GPATH_MAX];
-    char *buffer2;
-    FILE *fd;
-    struct Cell_head window;
-
-    /* create the mapset directory */
-    sprintf(buffer, "%s/%s", location, mapset);
-    G_mkdir(buffer);
-
-    /* give the mapset a default window for the entire location */
-    G_get_default_window(&window);
-    G_put_window(&window);
-
-    /* generate DB settings file in new mapset */
-    G_asprintf(&buffer2, "%s/%s/VAR", location, mapset);
-    if ((fd = fopen(buffer2, "w")) == NULL) {
-	perror("fopen");
-	G_fatal_error("Cannot create <%s> file in new mapset", buffer2);
-    }
-    /* Use DB_DEFAULT_DRIVER from <grass/dbmi.h> instead of hardcoding? */
-    fprintf(fd, "DB_DRIVER: sqlite\n");
-    fprintf(fd, "DB_DATABASE: $GISDBASE/$LOCATION_NAME/$MAPSET/sqlite.db\n");
-    fclose(fd);
-    G_free(buffer2);
-
-#ifdef KEEP_IF_DB_PER_MAP
-    /* create similar dir structure for SQLite if a db file is to be
-       created for every vector map instead of one DB per mapset */
-    if (strcmp(DB_DEFAULT_DRIVER, "dbf") == 0) {
-	/* Make the dbf/ subdirectory */
-	sprintf(buffer, "%s/%s/dbf", location, mapset);
-	if (G_mkdir(buffer) != 0)
-	    return -1;
-    }
-#endif
-
-    return (0);
-}

Deleted: grass/trunk/lib/init/other.c
===================================================================
--- grass/trunk/lib/init/other.c	2008-08-06 00:57:07 UTC (rev 32550)
+++ grass/trunk/lib/init/other.c	2008-08-06 03:28:21 UTC (rev 32551)
@@ -1,57 +0,0 @@
-#include <fcntl.h>
-#include <sys/stat.h>
-#include <sys/types.h>
-#include <stdio.h>
-#include <unistd.h>
-#include <grass/gis.h>
-#include "local_proto.h"
-
-static char *filename(const char *name, const char *mapset)
-{
-    static char path[GPATH_MAX];
-
-    G__file_name(path, "", name, mapset);
-    return path;
-}
-
-int mapset_permissions(const char *mapset)
-{
-    int stat;
-
-    stat = G__mapset_permissions(mapset);
-    if (stat == 1) {
-	if (access(filename(".lock", mapset), 0) == 0)
-	    stat = 0;
-    }
-    return stat;
-}
-
-int mapset_message(const char *mapset)
-{
-    if (printfile(filename(".message", mapset)))
-	hit_return();
-
-    return 0;
-}
-
-int mapset_question(const char *mapset)
-{
-    if (printfile(filename(".question", mapset)))
-	return G_yes("Select this mapset? ", -1);
-    return 1;
-}
-
-int printfile(const char *name)
-{
-    int fd;
-    int n;
-    char buf[1024];
-
-    fd = open(name, 0);
-    if (fd < 0)
-	return 0;
-    while ((n = read(fd, buf, sizeof buf)) > 0)
-	write(STDOUT_FILENO, buf, n);
-    close(fd);
-    return 1;
-}

Deleted: grass/trunk/lib/init/set_data.c
===================================================================
--- grass/trunk/lib/init/set_data.c	2008-08-06 00:57:07 UTC (rev 32550)
+++ grass/trunk/lib/init/set_data.c	2008-08-06 03:28:21 UTC (rev 32551)
@@ -1,348 +0,0 @@
-/* setup:  Program for GRASS user to first use.  Sets environment
- * variables:  LOCATION_NAME MAPSET GISDBASE
- */
-
-
-/* these defines come from the Gmakefile, but are defined here to allow
- * debugging with saber
- */
-#ifndef D_LOCATION_NAME
-#define D_LOCATION_NAME "spearfish"
-#endif
-#ifndef D_GISDBASE
-#define D_GISDBASE "/data"
-#endif
-#ifndef GRASS_VERSION_NUMBER
-#define GRASS_VERSION_NUMBER ""
-#endif
-
-
-
-static char *intro[] = {
-    "                   PLEASE SET SESSION INFORMATION",
-    "",
-    "DATABASE: A directory (folder) on disk to contain all GRASS maps and data.",
-    "",
-    "LOCATION: This is the name of a geographic location. It is defined by a",
-    "          co-ordinate system and a rectangular boundary.",
-    "",
-    "MAPSET:   Each GRASS session runs under a particular MAPSET. This consists of",
-    "          a rectangular REGION and a set of maps. Every LOCATION contains at",
-    "          least a MAPSET called PERMANENT, which is readable by all sessions.",
-    "",
-    "         The REGION defaults to the entire area of the chosen LOCATION.",
-    "         You may change it later with the command: g.region",
-    "- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - ",
-    0
-};
-static char *loc_text =
-    "LOCATION:                              (enter list for a list of locations)";
-static char *map_text =
-    "MAPSET:                                (or mapsets within a location)";
-
-#include <string.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <unistd.h>
-#include <stdlib.h>
-#include <grass/gis.h>
-#include <grass/vask.h>
-#include <grass/edit.h>
-#include "local_proto.h"
-
-int main(int argc, char *argv[])
-{
-    char version[80];
-    char gisdbase[70];
-    char location_name[41];
-    char location[1024];
-    char mapset[41];
-    int line;
-    int yes;
-    struct Cell_head window;
-
-    char *GISDBASE;
-    char *LOCATION_NAME;
-    char *MAPSET;
-
-    int repeat;
-
-    /* GISBASE
-     *   comes from the unix environment and must be set
-     *   make sure it is NOT in the .gisrc file
-     *   note: G_getenv() make a special case of this variable
-     */
-    G_no_gisinit();
-
-    G_unsetenv("GISBASE");	/* this cleans the variable */
-    G_getenv("GISBASE");	/* this reads it from the unix environment */
-
-    /* Gather all existing variables ********************************************* */
-    GISDBASE = G__getenv("GISDBASE");
-    LOCATION_NAME = G__getenv("LOCATION_NAME");
-    MAPSET = G__getenv("MAPSET");
-
-    if (!MAPSET)
-	MAPSET = G_whoami();
-    if (!LOCATION_NAME)
-	LOCATION_NAME = D_LOCATION_NAME;
-    if (!GISDBASE)
-	GISDBASE = D_GISDBASE;
-
-    strcpy(mapset, MAPSET);
-    strcpy(location_name, LOCATION_NAME);
-    strcpy(gisdbase, GISDBASE);
-    G__setenv("GISDBASE", gisdbase);
-
-    sprintf(version, "                            GRASS %s",
-	    GRASS_VERSION_NUMBER);
-
-    for (repeat = 1; repeat; hit_return()) {
-	V_clear();
-	V_line(0, version);
-	for (line = 1; intro[line]; line++)
-	    V_line(line, intro[line]);
-
-	line++;
-	V_line(line, loc_text);
-	V_ques(location_name, 's', line++, 12, 25);
-
-	V_line(line, map_text);
-	V_ques(mapset, 's', line++, 12, 25);
-
-	line++;
-	V_line(line, "DATABASE:");
-	V_ques(gisdbase, 's', line++, 10, sizeof(gisdbase) - 1);
-
-	V_intrpt_ok();
-	if (!V_call())
-	    exit(1);
-
-	G_strip(gisdbase);
-	if (*gisdbase == 0) {
-	    fprintf(stderr, "No DATABASE specified\n");
-	    strcpy(gisdbase, D_GISDBASE);
-	    continue;
-	}
-#ifdef __MINGW32__
-	if (*gisdbase == '/') {
-	    char tmp[200], *p;
-
-	    sprintf(tmp, "%s", getenv("WD"));
-	    for (p = tmp + strlen(tmp); --p >= tmp && *p == '\\';) ;
-	    for (; --p >= tmp && *p != '\\';) ;
-	    for (; --p >= tmp && *p == '\\';) ;
-	    *(p + 1) = 0;
-	    for (p = tmp; *p; p++)
-		if (*p == '\\')
-		    *p = '/';
-	    strcat(tmp, gisdbase);
-	    strcpy(gisdbase, tmp);
-	}
-	if (!gisdbase[1] || gisdbase[1] != ':')
-#else
-	if (*gisdbase != '/')
-#endif
-	{
-	    char temp[200];
-
-	    fprintf(stderr, "DATABASE <%s> - must start with /\n", gisdbase);
-	    sprintf(temp, " '%s'", gisdbase);
-	    strcpy(gisdbase, temp);
-	    continue;
-	}
-	if (access(gisdbase, 0) != 0) {
-	    fprintf(stderr, "DATABASE <%s> - not found\n", gisdbase);
-	    continue;
-	}
-	G__setenv("GISDBASE", gisdbase);
-
-	/* take only first word of responses */
-	first_word(location_name);
-	first_word(mapset);
-
-	if (*location_name && (G_legal_filename(location_name) < 0)) {
-	    fprintf(stderr, "LOCATION <%s> - illegal name\n", location_name);
-	    continue;
-	}
-	if (*mapset && (G_legal_filename(mapset) < 0)) {
-	    fprintf(stderr, "MAPSET <%s> - illegal name\n", mapset);
-	    continue;
-	}
-
-	if (*location_name == 0 || strcmp(location_name, "list") == 0) {
-	    list_locations(gisdbase);
-	    *location_name = 0;
-	    continue;
-	}
-	sprintf(location, "%s/%s", gisdbase, location_name);
-	if (access(location, 0) != 0) {
-	    fprintf(stderr, "LOCATION <%s> - doesn't exist\n", location_name);
-	    list_locations(gisdbase);
-	    if (!can_make_location(gisdbase, location_name))
-		continue;
-
-	    fprintf(stderr, "\nWould you like to create location <%s> ? ",
-		    location_name);
-	    if (G_yes("", 1)) {
-		if (make_location(gisdbase, location_name)) {
-
-		    G__setenv("LOCATION_NAME", location_name);
-		    G__setenv("MAPSET", "PERMANENT");
-		    G__write_env();
-
-
-		    if (system("g.setproj")) {
-			G_get_default_window(&window);
-			if (E_edit_cellhd(&window, -1) < 0)
-			    fprintf(stderr,
-				    "WARNING: You did not provide default region for %s!\n",
-				    location_name);
-
-			G__put_window(&window, "", "DEFAULT_WIND");
-			G__put_window(&window, "", "WIND");
-			fprintf(stderr, "LOCATION <%s> created\n",
-				location_name);
-			fprintf(stderr,
-				"\nBut the PROJECTION information files were not created!\n");
-			fprintf(stderr,
-				"You must run g.setproj successfully before projection software will work%c%c%c\n",
-				7, 7, 7);
-			continue;
-		    }
-		    else {
-			G_get_default_window(&window);
-			if (E_edit_cellhd(&window, -1) < 0)
-			    fprintf(stderr,
-				    "WARNING: You did not provide default region for %s!\n",
-				    location_name);
-			G__put_window(&window, "", "DEFAULT_WIND");
-			G__put_window(&window, "", "WIND");
-			fprintf(stderr, "LOCATION <%s> created!\n",
-				location_name);
-			continue;
-		    }
-		}
-		fprintf(stderr, "LOCATION <%s> NOT created\n", location_name);
-	    }
-	    continue;
-	}
-	G__setenv("LOCATION_NAME", location_name);
-	if (*mapset == 0 || strcmp(mapset, "list") == 0) {
-	    list_mapsets(location_name, location);
-	    *mapset = 0;
-	    continue;
-	}
-	G__setenv("MAPSET", mapset);
-
-	repeat = 0;
-
-	switch (mapset_permissions(mapset)) {
-	case -1:
-	    if (strcmp(mapset, G_whoami()) == 0) {
-		yes = 1;
-	    }
-	    else {
-		repeat = 1;
-		fprintf(stderr, "\n\nMapset <<%s>> is not available\n",
-			mapset);
-		list_mapsets(location_name, location);
-		fprintf(stderr,
-			"\nWould you like to create < %s > as a new mapset? ",
-			mapset);
-		yes = G_yes("", 1);
-	    }
-
-	    if (yes && (make_mapset(location, mapset) == 0))
-		repeat = 0;
-	    break;
-	case 0:
-	    fprintf(stderr, "\n\nSorry, no access to <<%s>>.\n", mapset);
-	    list_mapsets(location_name, location);
-	    repeat = 1;
-	    break;
-	case 1:
-	    mapset_message(mapset);
-	    if (!mapset_question(mapset))
-		repeat = 1;
-	    break;
-	}
-	if (!repeat)
-	    break;
-    }
-
-    G__write_env();
-    exit(0);
-}
-
-int list_locations(const char *gisdbase)
-{
-    fprintf(stderr, "\nAvailable locations:\n");
-    fprintf(stderr, "----------------------\n");
-    G_ls(gisdbase, stderr);
-    fprintf(stderr, "----------------------\n");
-    return 0;
-}
-
-int list_mapsets(const char *location_name, const char *location)
-{
-    char **mapsets;
-    int i, num_mapsets;
-    int any, ok, any_ok;
-    int len, tot_len;
-
-    fprintf(stderr, "\nMapsets in location <%s>\n", location_name);
-    fprintf(stderr, "----------------------\n");
-    mapsets = G__ls(location, &num_mapsets);
-    any = 0;
-    any_ok = 0;
-    tot_len = 0;
-    if (num_mapsets > 0) {
-	for (i = 0; i < num_mapsets; i++) {
-	    any = 1;
-	    len = strlen(mapsets[i]) + 1;
-	    len /= 20;
-	    len = (len + 1) * 20;
-	    tot_len += len;
-	    if (tot_len > 75) {
-		fprintf(stderr, "\n");
-		tot_len = len;
-	    }
-	    if ((ok = (mapset_permissions(mapsets[i]) == 1)))
-		any_ok = 1;
-	    fprintf(stderr, "%s%-*s", ok ? "(+)" : "   ", len, mapsets[i]);
-	}
-	if (tot_len)
-	    fprintf(stderr, "\n");
-	if (any_ok)
-	    fprintf(stderr,
-		    "\nnote: you only have access to mapsets marked with (+)\n");
-	else if (any)
-	    fprintf(stderr,
-		    "\nnote: you do not have access to any of these mapsets\n");
-    }
-    fprintf(stderr, "----------------------\n");
-
-    return 0;
-}
-
-int first_word(char *buf)
-{
-    char temp[GNAME_MAX];
-
-    *temp = 0;
-    sscanf(buf, "%s", temp);
-    strcpy(buf, temp);
-
-    return 0;
-}
-
-int hit_return(void)
-{
-    char buf[80];
-
-    fprintf(stderr, "\nHit RETURN -->");
-    G_gets(buf);
-
-    return 0;
-}

Modified: grass/trunk/lib/proj/datum.c
===================================================================
--- grass/trunk/lib/proj/datum.c	2008-08-06 00:57:07 UTC (rev 32550)
+++ grass/trunk/lib/proj/datum.c	2008-08-06 03:28:21 UTC (rev 32551)
@@ -216,154 +216,6 @@
 }
 
 /**
- *  \brief Interactively ask for datum parameters for a particular datum
- * 
- *  Uses traditional GRASS interactive prompt interface to provide 
- *  information to user and encourage him/her to select the most 
- *  appropriate set of datum transformation parameters for the location.
- *  Could really benefit from an abstracted user interaction library
- *  for seamless GUI interaction.
- *
- *  \param datumname     String containing datum name that
- *                       parameters are to be found for. Must
- *                       exist in datum.table or be "custom"
- * 
- *  \param params        Pointer to a pointer that will have 
- *                       memory allocated and into which a string 
- *                       containing the datum parameters chosen 
- *                       by the user will be placed.
- *
- *  \return 1 ok, -1 error or user cancelled
- * 
- **/
-
-int GPJ_ask_datum_params(const char *datumname, char **params)
-{
-    char buff[1024], answer[100];
-    char *Tmp_file;
-    FILE *Tmp_fd = NULL;
-    struct gpj_datum_transform_list *list, *listhead, *old;
-    int transformcount, currenttransform;
-
-    if (G_strcasecmp(datumname, "custom") != 0) {
-	Tmp_file = G_tempfile();
-	if (NULL == (Tmp_fd = fopen(Tmp_file, "w"))) {
-	    G_warning(_("Unable to open temporary file"));
-	}
-
-	fprintf(Tmp_fd, "Number\tDetails\t\n---\n");
-	listhead = GPJ_get_datum_transform_by_name(datumname);
-	list = listhead;
-	transformcount = 0;
-	while (list != NULL) {
-	    /* Count how many sets of transformation paramters have been 
-	     * defined for this datum and print them to a temporary file 
-	     * in case the user asks for them to be displayed */
-	    fprintf(Tmp_fd,
-		    "%d\tUsed in %s\n\t(PROJ.4 Params %s)\n\t%s\n---\n",
-		    list->count, list->where_used, list->params,
-		    list->comment);
-	    list = list->next;
-	    transformcount++;
-	}
-	fclose(Tmp_fd);
-
-	for (;;) {
-	    do {
-		fprintf(stderr,
-			("\nNow select Datum Transformation Parameters\n"));
-		fprintf(stderr,
-			("Please think carefully about the area covered by your data\n"
-			 "and the accuracy you require before making your selection.\n"));
-		fprintf(stderr,
-			("\nEnter 'list' to see the list of available Parameter sets\n"));
-		fprintf(stderr,
-			("Enter the corresponding number, or <RETURN> to cancel request\n"));
-		fprintf(stderr, ">");
-	    } while (!G_gets(answer));
-	    G_strip(answer);
-	    if (strlen(answer) == 0) {
-		remove(Tmp_file);
-		G_free(Tmp_file);
-		return -1;
-	    }
-	    if (strcmp(answer, "list") == 0) {
-		char *pager;
-
-		pager = getenv("GRASS_PAGER");
-		if (!pager || strlen(pager) == 0)
-		    pager = "cat";
-
-		/* Always print interactive output to stderr */
-		sprintf(buff, "%s \"%s\" 1>&2", pager,
-			G_convert_dirseps_to_host(Tmp_file));
-		G_system(buff);
-	    }
-	    else {
-		if ((sscanf(answer, "%d", &currenttransform) != 1) ||
-		    currenttransform > transformcount ||
-		    currenttransform < 1) {
-
-		    /* If a number was not typed, was less than 0 or greater
-		     * than the number of sets of parameters, ask again */
-		    fprintf(stderr, ("\ninvalid transformation number\n"));
-		}
-		else
-		    break;
-	    }
-
-	}
-	remove(Tmp_file);
-	G_free(Tmp_file);
-
-	list = listhead;
-	while (list != NULL) {
-	    /* Search through the linked list to find the parameter string
-	     * that corresponds to the number entered */
-	    if (list->count == currenttransform)
-		G_asprintf(params, list->params);
-
-	    /* Continue to end of list even after we find it, to free all
-	     * the memory used */
-	    old = list;
-	    list = old->next;
-	    G_free(old);
-	}
-    }
-    else {
-	/* Here we ask the user to enter customised parameters */
-	for (;;) {
-	    do {
-		fprintf(stderr,
-			("\nPlease specify datum transformation parameters in PROJ.4 syntax. Examples:\n"));
-		fprintf(stderr,
-			("\ttowgs84=dx,dy,dz\t(3-parameter transformation)\n"));
-		fprintf(stderr,
-			("\ttowgs84=dx,dy,dz,rx,ry,rz,m\t(7-parameter transformation)\n"));
-		fprintf(stderr,
-			("\tnadgrids=alaska\t(Tables-based grid-shifting transformation)\n"));
-		fprintf(stderr, _("Hit RETURN to cancel request\n"));
-		fprintf(stderr, ">");
-	    } while (!G_gets(answer));
-	    G_strip(answer);
-	    if (strlen(answer) == 0)
-		return -1;
-	    G_asprintf(params, answer);
-	    sprintf(buff,
-		    "Parameters to be used are:\n\"%s\"\nIs this correct?",
-		    *params);
-	    if (G_yes(buff, 1))
-		break;
-
-	}
-
-    }
-
-    return 1;
-
-}
-
-/**
  * \brief Internal function to find all possible sets of 
  *        transformation parameters for a particular datum
  *  

Modified: grass/trunk/lib/sites/sites.c
===================================================================
--- grass/trunk/lib/sites/sites.c	2008-08-06 00:57:07 UTC (rev 32550)
+++ grass/trunk/lib/sites/sites.c	2008-08-06 03:28:21 UTC (rev 32551)
@@ -249,35 +249,7 @@
 }
 
 /*-************************************************************************
- *   char *
- *   G_ask_sites_new(prompt, name))
- *       asks user to input name of a new site list file
  *
- *   char *
- *   G_ask_sites_old(prompt, name)
- *       asks user to input name of an existing site list file
- *
- *   char *
- *   G_ask_sites_any(prompt, name)
- *       asks user to input any site list name
- *
- *   char *
- *   G_ask_sites_in_mapset(prompt, name)
- *       asks user to input name of an existing site list file in
- *       current mapset
- *
- *   parms:
- *      char *prompt    optional prompt for user
- *      char *name      buffer to hold name of map found
- *
- *   returns:
- *      char *pointer to a string with name of mapset
- *       where file was found, or NULL if not found
- *
- *   note:
- *      rejects all names that begin with .
- **********************************************************************
- *
  *  struct Map_info *
  *  G_sites_open_old (name, mapset)
  *      opens the existing site list file 'name' in the 'mapset'
@@ -304,30 +276,6 @@
 }
 
 
-char *G_ask_sites_new(const char *prompt, char *name)
-{
-    return G_ask_new(prompt, name, "vector", "vector");
-}
-
-
-char *G_ask_sites_old(const char *prompt, char *name)
-{
-    return G_ask_old(prompt, name, "vector", "vector");
-}
-
-
-char *G_ask_sites_any(const char *prompt, char *name)
-{
-    return G_ask_any(prompt, name, "vector", "vector", 1);
-}
-
-
-char *G_ask_sites_in_mapset(const char *prompt, char *name)
-{
-    return G_ask_in_mapset(prompt, name, "vector", "vector");
-}
-
-
 struct Map_info *G_sites_open_old(const char *name, const char *mapset)
 {
     struct Map_info *Map;

Deleted: grass/trunk/lib/vask/Makefile
===================================================================
--- grass/trunk/lib/vask/Makefile	2008-08-06 00:57:07 UTC (rev 32550)
+++ grass/trunk/lib/vask/Makefile	2008-08-06 03:28:21 UTC (rev 32551)
@@ -1,12 +0,0 @@
-MODULE_TOPDIR = ../..
-
-EXTRA_LIBS=$(GISLIB) $(CURSES)
-
-EXTRA_CFLAGS	= -DMAKE_VASK_LIB
-
-LIB_NAME = $(VASK_LIBNAME)
-
-include $(MODULE_TOPDIR)/include/Make/Lib.make
-
-default: lib
-

Deleted: grass/trunk/lib/vask/README
===================================================================
--- grass/trunk/lib/vask/README	2008-08-06 00:57:07 UTC (rev 32550)
+++ grass/trunk/lib/vask/README	2008-08-06 03:28:21 UTC (rev 32551)
@@ -1,36 +0,0 @@
-From: Glynn Clements <glynn.clements at virgin.net>
-Date: Fri, 1 Jun 2001 00:31:44 +0100
-To: Markus Neteler <neteler at geog.uni-hannover.de>, grass5 at geog.uni-hannover.de
-Subject: Vask changes
-
-Glynn Clements wrote:
-
-[...]
-> I'll do the more substantial changes to vasklib today or tonight.
-
-I've now commited these.
-
-The main change is that V_call() now has curses process the escape
-sequences for extended keys, rather than using hardcoded definitions.
-
-Extended keys (cursor keys, Home, End) should now work on any terminal
-which has a correct termcap/terminfo entry.
-
-One possible disadvantage is that if the termcap/terminfo entry is
-broken, you will get undesirable results. This seems most likely to
-happen with xterm, which has many configuration options which impact
-upon the necessary terminal description.
-
-The main one of relevance here is the sunKeyboard resource,
-corresponding to the [+/-]sp command line flag and the "Sun Keyboard"
-(or "VT220 Keyboard" in recent XFree86) menu option (Ctrl + left mouse
-button). This affects whether the escape sequences generated by
-Home/End are the Sun versions or the VT220 versions.
-
-BTW: I tagged the previous version of V_call.c with "pre-curses-fix",
-in case anyone needs the original breakage (to match a broken
-terminfo).
-
--- 
-Glynn Clements <glynn.clements at virgin.net>
-

Deleted: grass/trunk/lib/vask/V_acc.c
===================================================================
--- grass/trunk/lib/vask/V_acc.c	2008-08-06 00:57:07 UTC (rev 32550)
+++ grass/trunk/lib/vask/V_acc.c	2008-08-06 03:28:21 UTC (rev 32551)
@@ -1,50 +0,0 @@
-
-/**
- * \file V_acc.c
- *
- * \brief Decimal precision functions.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or (at
- * your option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- *
- * \author GRASS GIS Development Team
- *
- * \date 1999-2006
- */
-
-#include <grass/vask.h>
-
-
-/**
- * \brief Set number of decimal places.
- * 
- * <i>V_float_accuracy()</i> defines the number of decimal places in 
- * which floats and doubles are displayed or accepted. <b>Num</b> is an 
- * integer value defining the number of decimal places to be used. This 
- * routine affects subsequent calls to <i>V_const()</i> and 
- * <i>V_ques()</i>. Various inputs or displayed constants can be
- * represented with different numbers of decimal places within the same 
- * screen display by making different calls to <i>V_float_accuracy()</i> 
- * before calls to <i>V_ques()</i> or <i>V_const()</i>. <i>V_clear()</i> 
- * resets the number of decimal places to the default (which is 
- * unlimited).
- *
- *  \param[in] n
- *  \return always returns 0
- */
-
-void V_float_accuracy(int n)
-{
-    V__.decimal_places = n;
-}

Deleted: grass/trunk/lib/vask/V_call.c
===================================================================
--- grass/trunk/lib/vask/V_call.c	2008-08-06 00:57:07 UTC (rev 32550)
+++ grass/trunk/lib/vask/V_call.c	2008-08-06 03:28:21 UTC (rev 32551)
@@ -1,507 +0,0 @@
-
-/**
- * \file V_call.c
- *
- * \brief Interactive call functions.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or (at
- * your option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- *
- * \note Modified by Jacques Bouchard and Markus Neteler 6/99 to make 
- * cursor keys working. Exit now with ESC-CR.
- *
- * \author GRASS GIS Development Team
- *
- * \date 2007-11-01
- */
-
-/*
-   ALGORITHM:  
-   |   Zero out screen answer locations
-   |   Initial curses screens
-   |   Display text, constants, and answer fields
-   |       Write text      (results from V_line() calls)  to curses window
-   |       Write constants (results from V_const() calls) to curses window
-   |       Write answers   (results from V_ques() calls)  to curses window
-   |   Take commands from the keyboard
-   |       switch on commands:
-   |           case CR: case NL: case UP: case ESC:
-   |               switch on answer type
-   |                   case string
-   |                       remove trailing non-alphanumeric characters
-   |                       copy answer to target denoted in V_ques() call
-   |                       blank out screen line
-   |                       copy target to curses window
-   |                   case integer
-   |                       run atoi on answer, putting results in target 
-   |                           denoted in V_ques() call
-   |                       blank out screen line
-   |                       printf target to curses window
-   |                   case long
-   |                       run atol on answer, putting results in target 
-   |                           denoted in V_ques() call
-   |                       blank out screen line
-   |                       printf target to curses window
-   |                   case float, double
-   |                       run sscanf on answer, putting results in target 
-   |                           denoted in V_ques() call
-   |                       blank out screen line
-   |                       printf target to curses window
-   |                   default:
-   |                       do nothing
-   |               if ESC+CR return from V_call()
-   |               if UP  shift to previous question
-   |               if CR or NL  shift to next question
-   |           case BS:   Move cursor back one column in current question
-   |           case FS:   Move cursor forward one column in current 
-   |               question
-   |           case RPLT: Replot the current screen image
-   |           case DUMP: Dump (append) the current window to the user's 
-   |               home dir.
-   |           default:   If an alphanumeric, put that char on the screen 
-   |               and in the current answer field
-   |   call V_exit  (erase screen and exit curses)
-   ********************************************************************** */
-
-#include <grass/config.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <grass/vask.h>
-
-
-static void centered(const char *);
-static void fmt(char *, int, double);
-
-/* define the V__ struct defined in vask.h */
-struct V__ V__;
-
-#define DUMP	001
-#define BS	010
-#define FS	014
-#define NL	012
-#define UP	013
-#define CR	015
-#define RPLT	022
-#define ESC	033
-#define CTRLC	003
-
-#define TARGET	V__.usr_answ[at_answer].targetptr
-#define ROW	V__.usr_answ[at_answer].row
-#define COL	V__.usr_answ[at_answer].col
-#define LENGTH	V__.usr_answ[at_answer].length
-#define TYPE	V__.usr_answ[at_answer].var_type
-#define ANSWER	scr_answ[at_answer].position
-#define RELINE	do {                                           \
-			move(ROW, COL) ;                       \
-			for (incr2=0;incr2<LENGTH; incr2++)    \
-				addch('_')  ;                  \
-			move(ROW, COL) ;                       \
-		} while (0)
-
-/* flag ctrl-c is to be allowed */
-
-static int interrupts_ok = 0;	/* mod shapiro */
-
-
-/**
- * \fn int V_call (void)
- *
- * \brief Interact with the user.
- *
- * Interactively allow the user to enter answers into all available 
- * fields (as previously defined). Answer fields have been created with 
- * calls to <i>V_ques()</i>. Information fields have been created using 
- * <i>V_const()</i>. General text has been created with calls to 
- * <i>V_line()</i>.
- *
- * <i>V_call()</i> clears the screen and writes the text and data values 
- * specified by <i>V_line()</i>, <i>V_ques()</i> and <i>V_const()</i> to 
- * the screen. It interfaces with the user, collecting user responses in 
- * the <i>V_ques()</i> fields until the user is satisfied. A message is
- * automatically supplied on line number 23, explaining to the user to 
- * enter an ESC when all inputs have been supplied as desired. 
- * <i>V_call()</i> ends when the user hits ESC and returns a value of 1 
- * (but see <i>V_intrpt_ok()</i> below). No error checking is done by 
- * <i>V_call()</i>. Instead, all variables used in <i>V_ques()</i>
- * calls must be checked upon return from <i>V_call()</i>. If the user 
- * has supplied inappropriate information, the user can be informed, and 
- * the input prompted for again by further calls to <i>V_call()</i>.
- *
- * \return 1 user entered ESC to continue
- * \return 0 user entered CTRL-C to cancel
- * \return -1 no match
- */
-
-int V_call(void)
-{
-    int incr;
-    int incr2;
-    int num_answers;
-    int at_answer;
-    int at_constant;
-    int ans_col = 0;
-    int newchar;
-    int lastchar = 0;
-    int new_answer = 0;
-    struct
-    {
-	char position[80];
-    } scr_answ[MAX_ANSW];
-    int y, x;			/* shapiro */
-    char temp[100];
-    int done;
-
-    /* Zero out screen answer locations */
-    for (incr = 0; incr < MAX_ANSW; incr++)
-	for (incr2 = 0; incr2 < 80; incr2++)
-	    scr_answ[incr].position[incr2] = 000;
-
-    /* Initialize the curses windows */
-    V_init();
-
-    /* Display text              */
-    for (incr = 0; incr < MAX_LINE; incr++) {
-	move(incr, 0);
-	addstr(V__.page.line[incr]);
-    }
-
-    /* Display constants   */
-    for (at_constant = 0; at_constant < V__.NUM_CONST; at_constant++) {
-	move(V__.constant[at_constant].row, V__.constant[at_constant].col);
-	switch (V__.constant[at_constant].var_type) {
-	case 's':
-	    addstr(V__.constant[at_constant].targetptr.c);
-	    break;
-	case 'i':
-	    sprintf(temp, "%d", *V__.constant[at_constant].targetptr.i);
-	    addstr(temp);
-	    break;
-	case 'l':
-	    sprintf(temp, "%ld", *V__.constant[at_constant].targetptr.l);
-	    addstr(temp);
-	    break;
-	case 'f':
-	    fmt(temp, V__.constant[at_constant].decimal_places,
-		(double)*V__.constant[at_constant].targetptr.f);
-	    addstr(temp);
-	    break;
-	case 'd':
-	    fmt(temp, V__.constant[at_constant].decimal_places,
-		(double)*V__.constant[at_constant].targetptr.d);
-	    addstr(temp);
-	    break;
-	default:
-	    break;
-	}
-    }
-
-    /* Display answer locations  */
-    for (at_answer = 0; at_answer < V__.NUM_ANSW; at_answer++) {
-	/* clear ANSWER */
-	for (incr = 0; incr < 80; incr++)
-	    scr_answ[at_answer].position[incr] = 000;
-
-	switch (TYPE) {
-	case 's':
-	    strcpy(ANSWER, TARGET.c);
-	    RELINE;
-	    for (incr = 0; incr < LENGTH; incr++) {
-		if (*(TARGET.c + incr) == '\000')
-		    while (incr++ < LENGTH)
-			addch('_');
-		else
-		    addch(*(TARGET.c + incr));
-	    }
-	    break;
-	case 'i':
-	    sprintf(ANSWER, "%d", *TARGET.i);
-	    RELINE;
-	    addstr(ANSWER);
-	    break;
-	case 'l':
-	    sprintf(ANSWER, "%ld", *TARGET.l);
-	    RELINE;
-	    addstr(ANSWER);
-	    break;
-	case 'f':
-	    fmt(ANSWER, V__.usr_answ[at_answer].decimal_places,
-		(double)*TARGET.f);
-	    RELINE;
-	    addstr(ANSWER);
-	    break;
-	case 'd':
-	    fmt(ANSWER, V__.usr_answ[at_answer].decimal_places,
-		(double)*TARGET.d);
-	    RELINE;
-	    addstr(ANSWER);
-	    break;
-	default:
-	    break;
-	}
-    }
-    num_answers = at_answer;
-
-    if (interrupts_ok)
-	move(22, 0);
-    else
-	move(23, 0);
-
-    centered("AFTER COMPLETING ALL ANSWERS, HIT <ESC><ENTER> TO CONTINUE");
-    if (interrupts_ok) {
-	sprintf(temp, "(OR <Ctrl-C> TO %s)", V__.interrupt_msg);
-	centered(temp);
-    }
-
-    /* Begin taking commands/answers from terminal */
-    at_answer = 0;
-
-    move(ROW, COL);
-    refresh();
-
-    for (done = 0; !done;) {
-	getyx(stdscr, y, x);
-
-	newchar = getch();
-
-	switch (newchar) {
-	case ERR:
-	    break;
-
-	case ESC:
-	    if (V__.NUM_ANSW <= 0)
-		done = 1;
-	    break;
-
-	case CTRLC:
-	    if (interrupts_ok || V__.NUM_ANSW <= 0)
-		done = 1;
-	    break;
-
-#ifdef KEY_UP
-	case KEY_UP:
-#endif
-	case UP:
-	    new_answer = (at_answer + num_answers - 1) % num_answers;
-	    ans_col = 0;
-	    break;
-
-#ifdef KEY_DOWN
-	case KEY_DOWN:
-#endif
-	case CR:
-	case NL:
-	    new_answer = (at_answer + 1) % num_answers;
-	    ans_col = 0;
-	    if (lastchar == ESC && (newchar == CR || newchar == NL))
-		done = 1;
-	    break;
-
-#ifdef KEY_LEFT
-	case KEY_LEFT:
-	    ans_col = (ans_col - 1 >= 0) ? ans_col - 1 : 0;
-	    break;
-#endif
-
-#ifdef KEY_BACKSPACE
-	case KEY_BACKSPACE:
-#endif
-	case BS:
-	    ans_col = (ans_col - 1 >= 0) ? ans_col - 1 : 0;
-	    ANSWER[ans_col] = ' ';
-	    move(ROW, COL + ans_col);
-	    addch(' ');
-	    break;
-
-#ifdef KEY_RIGHT
-	case KEY_RIGHT:
-#endif
-	case FS:
-	    ans_col = (ans_col + 1 < LENGTH &&
-		       ANSWER[ans_col]) ? ans_col + 1 : ans_col;
-	    break;
-
-#ifdef KEY_HOME
-	case KEY_HOME:
-	    ans_col = 0;
-	    break;
-#endif
-
-#ifdef KEY_END
-	case KEY_END:
-	    for (ans_col = 0; ans_col < LENGTH && ANSWER[ans_col];
-		 ans_col++) ;
-	    break;
-#endif
-
-#ifdef KEY_REFRESH
-	case KEY_REFRESH:
-#endif
-	case RPLT:
-	    wrefresh(curscr);
-	    break;
-
-#ifdef KEY_PRINT
-	case KEY_PRINT:
-#endif
-	case DUMP:
-	    V__dump_window();
-	    break;
-
-	case '\177':
-	    break;
-
-	default:
-	    if (ans_col < LENGTH && newchar >= 040 && newchar <= 0377) {
-		addch(newchar);
-		ANSWER[ans_col] = newchar;
-		ans_col++;
-	    }
-	    break;
-	}
-
-	if (new_answer != at_answer || done) {
-	    V__remove_trail(LENGTH, ANSWER);
-	    switch (TYPE) {
-	    case 's':
-		strcpy(TARGET.c, ANSWER);
-		RELINE;
-		addstr(TARGET.c);
-		break;
-	    case 'i':
-		*TARGET.i = atoi(ANSWER);
-		RELINE;
-		sprintf(temp, "%d", *TARGET.i);
-		addstr(temp);
-		break;
-	    case 'l':
-		*TARGET.l = atol(ANSWER);
-		RELINE;
-		sprintf(temp, "%ld", *TARGET.l);
-		addstr(temp);
-		break;
-	    case 'f':
-		sscanf(ANSWER, "%f", TARGET.f);
-		RELINE;
-		fmt(ANSWER, V__.usr_answ[at_answer].decimal_places,
-		    (double)*TARGET.f);
-		sscanf(ANSWER, "%f", TARGET.f);
-		addstr(ANSWER);
-		break;
-	    case 'd':
-		sscanf(ANSWER, "%lf", TARGET.d);
-		RELINE;
-		fmt(ANSWER, V__.usr_answ[at_answer].decimal_places,
-		    (double)*TARGET.d);
-		sscanf(ANSWER, "%lf", TARGET.d);
-		addstr(ANSWER);
-		break;
-	    default:
-		break;
-	    }
-
-	    at_answer = new_answer;
-	}
-
-	lastchar = newchar;
-	move(ROW, COL + ans_col);
-	refresh();
-
-	if (done) {
-	    interrupts_ok = 0;
-	    V_exit();
-	    return (newchar != CTRLC);
-	}
-    }
-
-    return -1;
-}
-
-
-/**
- * \fn int V_intrpt_ok (void)
- *
- * \brief Allow CTRL-C.
- *
- * <i>V_call()</i> normally only allows the ESC character to end the 
- * interactive input session. Sometimes, it is desirable to allow the 
- * user to cancel the session. To provide this alternate means of exit, 
- * the programmer can call <i>V_intrpt_ok()</i> before <i>V_call()</i>. 
- * This allows the user to enter CTRL-C, which causes <i>V_call()</i> to 
- * return a value of 0 instead of 1.<br>
- * A message is automatically supplied to the user on line 23 saying to 
- * use CTRL-C to cancel the input session. The normal message 
- * accompanying <i>V_call()</i> is moved up to line 22.<br>
- * <b>Note:</b> When <i>V_intrpt_ok()</i> is called, the programmer must 
- * limit the use of <i>V_line()</i>, <i>V_ques()</i>, and 
- * <i>V_const()</i> to lines 0-21.
- *
- * \return always returns 0
- */
-
-void V_intrpt_ok(void)
-{
-    interrupts_ok = 1;		/* will be set false when V_call() exists */
-}
-
-
-/**
- * \fn int V_intrpt_msg (const char *msg)
- *
- * \brief Change CTRL-C message.
- *
- * A call to <i>V_intrpt_msg()</i> changes the default 
- * <i>V_intrpt_ok()</i> message from (OR <CTRL-C> TO CANCEL) to (OR 
- * <CTRL-C> TO <i>msg</i>). The message is (re)set to the default by 
- * <i>V_clear()</i>.
- *
- * \param[in] msg
- * \return always returns 0
- */
-
-void V_intrpt_msg(const char *msg)
-{
-    strcpy(V__.interrupt_msg, msg);
-}
-
-
-static void fmt(char *s, int n, double x)
-{
-    char buf[20];
-
-    if (n >= 0)
-	sprintf(buf, "%%.%dlf", n);
-    else
-	strcpy(buf, "%.5lf");
-
-    /* I had to use .5lf instead of just lf since a number like 65.8 got 
-     * sprintf'ed as 65.800003 this is a hack - I admit it.
-     */
-    sprintf(s, buf, x);
-    if (n < 0)
-	V__trim_decimal(s);
-}
-
-
-static void centered(const char *msg)
-{
-    int indent;
-
-    indent = (80 - strlen(msg)) / 2;
-    while (indent-- > 0)
-	addstr(" ");
-
-    addstr(msg);
-    addstr("\n");
-}

Deleted: grass/trunk/lib/vask/V_clear.c
===================================================================
--- grass/trunk/lib/vask/V_clear.c	2008-08-06 00:57:07 UTC (rev 32550)
+++ grass/trunk/lib/vask/V_clear.c	2008-08-06 03:28:21 UTC (rev 32551)
@@ -1,61 +0,0 @@
-
-/**
- * \file V_clear.c
- *
- * \brief Screen clearning functions.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or (at
- * your option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- *
- * \author GRASS GIS Development Team
- *
- * \date 1999-2006
- */
-
-#include <stdio.h>
-#include <grass/vask.h>
-
-
-#define DECIMAL_PLACES -1
-
-
-/*!
- * \brief Zero out prompt and answer arrays.
- *
- * This routine initializes the screen description information and must 
- * be called before each new screen layout description.
- *
- *  \return always returns 0
- */
-
-void V_clear(void)
-{
-    static const char text[] = "";
-    int at_answer;
-
-    for (at_answer = 0; at_answer < MAX_ANSW; at_answer++)
-	V__.usr_answ[at_answer].length = 0;
-
-    for (at_answer = 0; at_answer < MAX_CONST; at_answer++)
-	V__.constant[at_answer].length = 0;
-
-    for (at_answer = 0; at_answer < MAX_LINE; at_answer++)
-	V__.page.line[at_answer] = text;
-
-    V__.NUM_CONST = 0;
-    V__.NUM_ANSW = 0;
-    V__.NUM_LINE = 0;
-    V_float_accuracy(DECIMAL_PLACES);
-    sprintf(V__.interrupt_msg, "CANCEL");
-}

Deleted: grass/trunk/lib/vask/V_const.c
===================================================================
--- grass/trunk/lib/vask/V_const.c	2008-08-06 00:57:07 UTC (rev 32550)
+++ grass/trunk/lib/vask/V_const.c	2008-08-06 03:28:21 UTC (rev 32551)
@@ -1,88 +0,0 @@
-
-/**
- * \file V_const.c
- *
- * \brief Display constant functions.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or (at
- * your option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- *
- * \author GRASS GIS Development Team
- *
- * \date 1999-2006
- */
-
-#include <stdio.h>
-#include <grass/vask.h>
-
-
-/**
- * \fn int V_const (void *src, char var_type, int row, int col, int length)
- *
- * \brief Define screen constant.
- *
- * This routine allows a program to identify a constant, and where that 
- * constant should be placed on the screen in the next call to 
- * <i>V_call()</i>. <b>var_type</b> is one of <i>int</i>, <i>long</i>, 
- * <i>float</i>, <i>double</i>, or <i>char</i>.
- *
- * \param[in] src
- * \param[in] var_type
- * \param[in] row
- * \param[in] col
- * \param[in] len
- * \return 0 on success
- * \return -1 on error
- */
-
-int V_const(void *src, int var_type, int row, int col, int length)
-{
-    union target targetptr;
-
-    targetptr.i = src;
-
-    if (V__.NUM_CONST >= MAX_CONST) {
-	V_error("Too many constants in call to V_const");
-	return (-1);
-    }
-    if ((row < 0) || (row >= MAX_LINE)) {
-	V_error("Illegal row (%d) in call to V_const", row);
-	return (-1);
-    }
-    if ((col < 0) || (col > 80)) {
-	V_error("Illegal column (%d) in call to V_const", col);
-	return (-1);
-    }
-    if ((length < 0) || ((length + col) > 80)) {
-	V_error("Length out of bounds in call to V_const");
-	return (-1);
-    }
-
-    if ((var_type == 's') || (var_type == 'i') || (var_type == 'f')
-	|| (var_type == 'l') || (var_type == 'd')) {
-	V__.constant[V__.NUM_CONST].targetptr = targetptr;
-	V__.constant[V__.NUM_CONST].var_type = var_type;
-	V__.constant[V__.NUM_CONST].row = row;
-	V__.constant[V__.NUM_CONST].col = col;
-	V__.constant[V__.NUM_CONST].length = length;
-	V__.constant[V__.NUM_CONST].decimal_places = V__.decimal_places;
-
-	V__.NUM_CONST++;
-	return (0);
-    }
-    else {
-	V_error("Illegal variable type in call to V_const");
-	return (-1);
-    }
-}

Deleted: grass/trunk/lib/vask/V_error.c
===================================================================
--- grass/trunk/lib/vask/V_error.c	2008-08-06 00:57:07 UTC (rev 32550)
+++ grass/trunk/lib/vask/V_error.c	2008-08-06 03:28:21 UTC (rev 32551)
@@ -1,52 +0,0 @@
-
-/**
- * \file V_error.c
- *
- * \brief Display error functions.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or (at
- * your option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- *
- * \author GRASS GIS Development Team
- *
- * \date 1999-2006
- */
-
-#include <stdio.h>
-#include <stdarg.h>
-#include <grass/gis.h>
-#include <grass/vask.h>
-
-/**
- * \fn int V_error (char *message)
- *
- * \brief Dispay error routine.
- *
- * Deals with error messages generated by other Visual ask routines.
- *
- * \param[in] message
- * \return always returns 0
- */
-
-void V_error(const char *fmt, ...)
-{
-    va_list ap;
-
-    va_start(ap, fmt);
-    fprintf(stderr, "V_ask error: ");
-    vfprintf(stderr, fmt, ap);
-    va_end(ap);
-
-    G_sleep(4);
-}

Deleted: grass/trunk/lib/vask/V_exit.c
===================================================================
--- grass/trunk/lib/vask/V_exit.c	2008-08-06 00:57:07 UTC (rev 32550)
+++ grass/trunk/lib/vask/V_exit.c	2008-08-06 03:28:21 UTC (rev 32551)
@@ -1,67 +0,0 @@
-
-/**
- * \file V_exit.c
- *
- * \brief Interactive exit functions.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or (at
- * your option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- *
- * \author GRASS GIS Development Team
- *
- * \date 1999-2006
- */
-
-#include <grass/config.h>
-#include <stdio.h>
-#include <grass/vask.h>
-
-
-/**
- * \fn int V_exit ()
- *
- * \brief Erases the current screen and flushes the current curses setup.
- *
- * \return always returns 0
- */
-
-void V_exit(void)
-{
-#ifdef HAVE_KEYPAD
-    keypad(stdscr, 0);
-#endif
-    clear();
-    refresh();
-
-    /* added for Mips' braindead implementation of curses 
-     * and the ordering is important
-     */
-    echo();
-    nl();
-    noraw();
-
-    endwin();
-    fflush(stdout);
-    fflush(stderr);
-    fflush(stdin);
-
-    /* Added 17 Sep 1990  dpg.  is a hack we have been using on Sys V 
-     * machines it is not the correct way, but it seems to do the job.
-     * Fixes the problem with prompts not being displayed after 
-     * exitting curses. */
-#ifdef SYSV
-    setvbuf(stderr, NULL, _IONBF, 0);
-    setvbuf(stdout, NULL, _IONBF, 0);
-#endif
-}

Deleted: grass/trunk/lib/vask/V_init.c
===================================================================
--- grass/trunk/lib/vask/V_init.c	2008-08-06 00:57:07 UTC (rev 32550)
+++ grass/trunk/lib/vask/V_init.c	2008-08-06 03:28:21 UTC (rev 32551)
@@ -1,64 +0,0 @@
-
-/**
- * \file V_init.c
- *
- * \brief Interactive initialization functions.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or (at
- * your option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- *
- * \author GRASS GIS Development Team
- *
- * \date 1999-2006
- */
-
-#include <grass/config.h>
-#include <stdlib.h>
-#include <grass/gis.h>
-#include <grass/vask.h>
-
-
-/**
- * \fn int V_init ()
- *
- * \brief Initialize curses and prepare screen.
- *
- * \return always returns 0
- */
-
-void V_init(void)
-{
-    static int first = 1;
-
-    G_clear_screen();		/* this is a kludge - xterm has problems
-				 * it shows what was on the screen after
-				 * endwin is called in V_exit()
-				 */
-    if (first) {
-	initscr();		/* initialize curses and tty */
-	first = 0;
-    }
-
-    /* the order of these 3 calls is important for
-     * Mips' braindead implementation of curses  */
-    noecho();
-    nonl();
-    raw();
-
-    clear();
-    refresh();
-#ifdef HAVE_KEYPAD
-    keypad(stdscr, 1);
-#endif
-}

Deleted: grass/trunk/lib/vask/V_line.c
===================================================================
--- grass/trunk/lib/vask/V_line.c	2008-08-06 00:57:07 UTC (rev 32550)
+++ grass/trunk/lib/vask/V_line.c	2008-08-06 03:28:21 UTC (rev 32551)
@@ -1,57 +0,0 @@
-
-/**
- * \file V_line.c
- *
- * \brief Display line functions.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or (at
- * your option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- *
- * \author GRASS GIS Development Team
- *
- * \date 1999-2006
- */
-
-#include <grass/vask.h>
-
-
-/**
- * \fn int V_line (int linenumber, char *text)
- * 
- * \brief Add line of text to screen for next call to <i>V_call()</i>.
- *
- * This routine is used to place lines of text on the screen. 
- * <b>linenumber</b> is an integer value of 0-22 specifying the row on 
- * the screen where the <b>text</b> is placed. The top row on the screen 
- * is row 0.<br>
- * <b>Warning:</b> <i>V_line()</i> does not copy the text to the screen 
- * description. It only saves the text address. This implies that each 
- * call to <i>V_line()</i> must use a different text buffer.
- *
- * \param[in] linenumber
- * \param[in] text
- * \return 0 on success
- * \return -1 on error
- */
-
-int V_line(int linenumber, const char *text)
-{
-    if (linenumber >= MAX_LINE || linenumber < 0) {
-	V_error("Linenumber out of bounds in call to V_line");
-	return (-1);
-    }
-    V__.page.line[linenumber] = text;
-
-    return 0;
-}

Deleted: grass/trunk/lib/vask/V_ques.c
===================================================================
--- grass/trunk/lib/vask/V_ques.c	2008-08-06 00:57:07 UTC (rev 32550)
+++ grass/trunk/lib/vask/V_ques.c	2008-08-06 03:28:21 UTC (rev 32551)
@@ -1,119 +0,0 @@
-
-/**
- * \file V_ques.c
- *
- * \brief Display question functions.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or (at
- * your option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- *
- * \author GRASS GIS Development Team
- *
- * \date 1999-2006
- */
-
-#include <grass/vask.h>
-
-
-/**
- * \fn int V_ques (void *src, char var_type, int row, int col, int length)
- *
- * \brief Define screen question.
- *
- * <i>V_ques()</i> allows a program to identify a prompt field and where 
- * that field should be placed on the screen in the next call to 
- * <i>V_call()</i>.<br>
- * <i>V_ques()</i> specifies that the contents of memory at the address 
- * of <b>src</b> are to be displayed on the screen at location 
- * <b>row</b>, <b>col</b> for <b>len</b> characters.<br>
- * <i>V_ques()</i> further specifies that this screen location is a 
- * prompt field. The user will be allowed to change the field on the 
- * screen and thus change the <b>src</b> itself.
- * <b>var_type</b> specifies what type <b>src</b> points to: 'i' (int), 
- * 'l' (long), 'f' (float), 'd' (double), or 's' (character string).<br>
- * <b>row</b> is an integer value of 0-22 specifying the row on the 
- * screen where the value is placed. The top row on the screen is row 
- * 0.<br>
- * <b>col</b> is an integer value of 0-79 specifying the column on the 
- * screen where the value is placed. The leftmost column on the screen 
- * is column 0.<br>
- * <b>len</b> specifies the number of columns that the value will 
- * use.<br>
- * <b>Note:</b> The size of a character array passed to <i>V_ques()</i>
- * must be at least one byte longer than the length of the prompt field 
- * to allow for NULL termination. Currently, you are limited to 20 
- * constants and 80 variables.<br>
- * <b>Warning:</b> These routines store the address of <b>src</b> and 
- * not the value itself. This implies that different variables must be 
- * used for different calls. Programmers will instinctively use 
- * different variables with <i>V_ques()</i>, but it is a stumbling block 
- * for <i>V_const()</i>. Also, the programmer must initialize 
- * <b>src</b> prior to calling these routines.
- *
- * \remarks {Technically <b>src</b> needs to be initialized before
- * the call to <i>V_call()</i> since <i>V_const()</i> and 
- * <i>V_ques()</i> only store the address of <b>src</b>. 
- * <i>V_call()</i> looks up the values and places them on the screen.}
- *
- * \param[in] src
- * \param[in] var_type
- * \param[in] row
- * \param[in] col
- * \param[in] len
- * \return 0 on success
- * \return -1 on error
- */
-
-int V_ques(void *src, int var_type, int row, int col, int length)
-{
-    union target targetptr;
-
-    targetptr.i = src;
-
-    if (V__.NUM_ANSW >= MAX_ANSW) {
-	V_error("Too many questions in call to V_ques");
-	return (-1);
-    }
-    if ((row < 0) || (row >= MAX_LINE)) {
-	V_error("Illegal row (%d) in call to V_ques", row);
-	return (-1);
-    }
-    if ((col < 0) || (col >= 80)) {
-	V_error("Illegal column (%d) in call to V_ques", col);
-	return (-1);
-    }
-    if (length <= 0) {
-	V_error("Negative length in call to V_ques");
-	return (-1);
-    }
-    if (length + col > 80)
-	length = 80 - col;
-
-    if ((var_type == 's') || (var_type == 'i') || (var_type == 'f')
-	|| (var_type == 'l') || (var_type == 'd')) {
-	V__.usr_answ[V__.NUM_ANSW].targetptr = targetptr;
-	V__.usr_answ[V__.NUM_ANSW].var_type = var_type;
-	V__.usr_answ[V__.NUM_ANSW].row = row;
-	V__.usr_answ[V__.NUM_ANSW].col = col;
-	V__.usr_answ[V__.NUM_ANSW].length = length;
-	V__.usr_answ[V__.NUM_ANSW].decimal_places = V__.decimal_places;
-
-	V__.NUM_ANSW++;
-	return (0);
-    }
-    else {
-	V_error("Illegal variable type in call to V_ques");
-	return (-1);
-    }
-}

Deleted: grass/trunk/lib/vask/V_support.c
===================================================================
--- grass/trunk/lib/vask/V_support.c	2008-08-06 00:57:07 UTC (rev 32550)
+++ grass/trunk/lib/vask/V_support.c	2008-08-06 03:28:21 UTC (rev 32551)
@@ -1,110 +0,0 @@
-
-/**
- * \file V_support.c
- *
- * \brief Interactive support functions.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or (at
- * your option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- *
- * \author GRASS GIS Development Team
- *
- * \date 1999-2006
- */
-
-#include <grass/config.h>
-#include <stdio.h>
-#ifndef __MINGW32__
-#include <pwd.h>
-#endif
-#include <unistd.h>
-#include <sys/types.h>
-#include <curses.h>
-#include <grass/gis.h>
-#include <grass/vask.h>
-#include <grass/glocale.h>
-
-
-/**
- * \fn int V__dump_window ()
- *
- * \brief Dumps screen to file.
- *
- * \return 0 on success
- * \return -1 on error
- */
-
-int V__dump_window(void)
-{
-    int atrow, atcol;
-    FILE *file;
-    char home[GPATH_MAX];
-    int curx, cury;
-
-    sprintf(home, "%s/visual_ask", G_home());
-
-    if ((file = fopen(home, "a")) == NULL) {
-	V_error(_("Unable to open file %s"), home);
-	return (-1);
-    }
-
-    getyx(stdscr, cury, curx);
-
-    fprintf(file,
-	    "--------------------------------------------------------\n");
-    for (atrow = 0; atrow < LINES; atrow++) {
-	for (atcol = 0; atcol < COLS - 1; atcol++) {
-	    move(atrow, atcol);
-	    fprintf(file, "%c", (int)(inch() & A_CHARTEXT));
-	}
-	fprintf(file, "\n");
-    }
-    fprintf(file,
-	    "--------------------------------------------------------\n");
-    fprintf(file, "\n\n");
-    fclose(file);
-
-    move(cury, curx);
-    return 0;
-}
-
-
-/**
- * \fn int V__remove_trail (int ans_col, char *answer)
- *
- * \brief Remove trailing text from <b>answer</b>?
- *
- * \param[in] ans_col
- * \param[in] answer
- * \return always returns 0;
- */
-
-void V__remove_trail(int ans_col, char *answer)
-{
-    char *ans_ptr;
-
-    ans_ptr = answer + ans_col;
-    while (ans_col >= 0) {
-	int c = *(unsigned char *)ans_ptr;
-
-	if (c > '\040' && c != '\177' && c != '_')
-	    return;
-
-	*ans_ptr = '\0';
-	ans_col--;
-	ans_ptr--;
-    }
-
-    return;
-}

Deleted: grass/trunk/lib/vask/V_trim_dec.c
===================================================================
--- grass/trunk/lib/vask/V_trim_dec.c	2008-08-06 00:57:07 UTC (rev 32550)
+++ grass/trunk/lib/vask/V_trim_dec.c	2008-08-06 03:28:21 UTC (rev 32551)
@@ -1,56 +0,0 @@
-
-/**
- * \file V_trim_dec.c
- *
- * \brief Display trim functions.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or (at
- * your option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- *
- * \author GRASS GIS Development Team
- *
- * \date 1999-2006
- */
-
-#include <grass/vask.h>
-
-
-/**
- * \fn int V__trim_decimal (char *buf)
- *
- * \brief Remove trailing zeros from decimal number.
- *
- * For example: 23.45000 would return 23.45.
- *
- * \param[in,out] buf
- * \return always returns 0
- */
-
-void V__trim_decimal(char *buf)
-{
-    char *mark;
-
-    /* find the . */
-    while (*buf != '.')
-	if (*buf++ == '\0')
-	    return;
-
-    mark = buf;
-    while (*++buf)
-	if (*buf != '0')
-	    mark = buf + 1;
-
-    while (*mark)
-	*mark++ = 0;
-}

Deleted: grass/trunk/raster/r.coin/check.c
===================================================================
--- grass/trunk/raster/r.coin/check.c	2008-08-06 00:57:07 UTC (rev 32550)
+++ grass/trunk/raster/r.coin/check.c	2008-08-06 03:28:21 UTC (rev 32551)
@@ -1,58 +0,0 @@
-
-/****************************************************************************
- *
- * MODULE:       r.coin
- *
- * AUTHOR(S):    Michael O'Shea - CERL
- *               Michael Shapiro - CERL
- *
- * PURPOSE:      Calculates the coincidence of two raster map layers.
- *
- * COPYRIGHT:    (C) 2006 by the GRASS Development Team
- *
- *               This program is free software under the GNU General Public
- *               License (>=v2). Read the file COPYING that comes with GRASS
- *               for details.
- *
- ***************************************************************************/
-
-#include <stdlib.h>
-#include "coin.h"
-
-
-/* computes the approximate number of lines/pages an 80 column
- * report would take, and asks the user if this is ok
- */
-int check_report_size(void)
-{
-    long nlines;
-    long npages;
-    long npanels;
-    char buf[100];
-
-
-    npanels = ncat1 / 3;
-    if (ncat1 % 3)
-	npanels++;
-
-    nlines = (12 + ncat2) * npanels + 11 + ncat2;
-    npages = (nlines + 65) / 66;
-
-    while (1) {
-	fprintf(stdout, "\nThe coincidence table is %d rows by %d columns\n",
-		ncat2, ncat1);
-	fprintf(stdout,
-		"The report will require approximately %ld lines (%ld pages)\n",
-		nlines, npages);
-	fprintf(stdout, "Do you want to continue? ");
-	while (1) {
-	    fprintf(stdout, "(y/n) ");
-	    if (!G_gets(buf))
-		break;
-	    if (*buf == 'y' || *buf == 'Y')
-		return 1;
-	    if (*buf == 'n' || *buf == 'N')
-		exit(0);
-	}
-    }
-}

Deleted: grass/trunk/raster/r.coin/inter.c
===================================================================
--- grass/trunk/raster/r.coin/inter.c	2008-08-06 00:57:07 UTC (rev 32550)
+++ grass/trunk/raster/r.coin/inter.c	2008-08-06 03:28:21 UTC (rev 32551)
@@ -1,156 +0,0 @@
-
-/****************************************************************************
- *
- * MODULE:       r.coin
- *
- * AUTHOR(S):    Michael O'Shea - CERL
- *               Michael Shapiro - CERL
- *
- * PURPOSE:      Calculates the coincidence of two raster map layers.
- *
- * COPYRIGHT:    (C) 2006 by the GRASS Development Team
- *
- *               This program is free software under the GNU General Public
- *               License (>=v2). Read the file COPYING that comes with GRASS
- *               for details.
- *
- ***************************************************************************/
-
-#include <stdlib.h>
-#include "coin.h"
-#include <grass/spawn.h>
-#include <grass/glocale.h>
-
-
-int interactive_version(void)
-{
-    int cols;
-    char key;
-    char line[128], outname[GNAME_MAX], command[1024];
-    char ans[80];
-
-    setbuf(stderr, NULL);
-
-    G_clear_screen();
-    G_message(_("GIS Coincidence Tabulation Facility\n"));
-    G_message(_("This utility will allow you to compare the "
-		"coincidence of two map layers\n"));
-
-    mapset1 = G_ask_cell_old("Enter Name of Map Layer 1", map1name);
-    if (!mapset1)
-	G_fatal_error(_("Raster map <%s> not found"), map1name);
-
-    mapset2 = G_ask_cell_old("Enter Name of Map Layer 2", map2name);
-    if (!mapset2)
-	G_fatal_error(_("Raster map <%s> not found"), map2name);
-
-    make_coin();
-    check_report_size();
-
-
-    while (1) {
-	G_clear_screen();
-	G_message(_("The report can be made in one of 8 units."));
-	G_message(_("Please choose a unit by entering one of the "
-		    "following letter codes:"));
-	G_message(_("     'c': cells"));
-	G_message(_("     'p': percent cover of region"));
-	G_message(_("     'x': percent of '%s' category (column)"), map1name);
-	G_message(_("     'y': percent of '%s' category (row)"), map2name);
-	G_message(_("     'a': acres"));
-	G_message(_("     'h': hectares"));
-	G_message(_("     'k': square kilometers"));
-	G_message(_("     'm': square miles\n"));
-	G_message(_("     'Q': quit"));
-	fprintf(stderr, "> ");
-
-	*ans = 0;
-	if (!G_gets(ans))
-	    continue;
-	if (sscanf(ans, "%c", &key) != 1)
-	    continue;
-
-	switch (key) {
-	case 'c':
-	case 'p':
-	case 'x':
-	case 'y':
-	case 'a':
-	case 'h':
-	case 'k':
-	case 'm':
-	    print_coin(key, 80, 1);
-	    break;
-	case 'Q':
-	    exit(0);
-	default:
-	    continue;
-	}
-
-	sprintf(command, "%s \"%s\"", getenv("GRASS_PAGER"),
-		G_convert_dirseps_to_host(dumpname));
-	G_system(command);
-
-	while (1) {
-	    fprintf(stderr,
-		    _
-		    ("Do you wish to save this report in a file? (y/n) [n] "));
-	    *ans = 0;
-	    if (!G_gets(ans))
-		continue;
-	    G_strip(ans);
-	    if (ans[0] != 'y' && ans[0] != 'Y')
-		break;
-
-	    fprintf(stderr, _("Enter the file name or path\n> "));
-	    if (!G_gets(line))
-		continue;
-	    if (sscanf(line, "%s", outname) != 1)
-		continue;
-	    fprintf(stderr, _("'%s' being saved\n"), outname);
-	    if (G_copy_file(dumpname, outname))
-		/* Break out if file copy was successful otherwise try again */
-		break;
-	}
-
-	while (1) {
-	    *ans = 0;
-	    fprintf(stderr,
-		    _
-		    ("Do you wish to print this report (requires Unix lpr command)? (y/n) [n] "));
-	    if (!G_gets(ans))
-		continue;
-	    G_strip(ans);
-	    if (ans[0] != 'y' && ans[0] != 'Y')
-		break;
-
-	  ask132:
-	    fprintf(stderr,
-		    _("Do you wish it printed in 80 or 132 columns?\n> "));
-	    *ans = 0;
-	    if (!G_gets(ans))
-		continue;
-	    G_strip(ans);
-	    if (sscanf(ans, "%d", &cols) != 1)
-		goto ask132;
-	    if (cols == 132)
-		print_coin(key, 132, 1);
-	    else if (cols != 80)
-		goto ask132;
-	    G_spawn("lpr", "lpr", dumpname, NULL);
-	    break;
-	}
-
-	do {
-	    fprintf(stderr, _("Do you wish to run this report with a "
-			      "different unit of measure? (y/n) [y] "));
-	    *ans = 0;
-	}
-	while (!G_gets(ans));
-	G_strip(ans);
-	if (*ans == 'n' || *ans == 'N')
-	    break;
-    }
-
-    return 0;
-}

Modified: grass/trunk/raster/r.coin/main.c
===================================================================
--- grass/trunk/raster/r.coin/main.c	2008-08-06 00:57:07 UTC (rev 32550)
+++ grass/trunk/raster/r.coin/main.c	2008-08-06 03:28:21 UTC (rev 32551)
@@ -52,10 +52,7 @@
     window_cells = G_window_rows() * G_window_cols();
 
 
-    if (argc > 1)
-	command_version(argc, argv);
-    else
-	interactive_version();
+    command_version(argc, argv);
 
     unlink(dumpname);
     unlink(statname);

Modified: grass/trunk/raster/r.le/r.le.setup/Makefile
===================================================================
--- grass/trunk/raster/r.le/r.le.setup/Makefile	2008-08-06 00:57:07 UTC (rev 32550)
+++ grass/trunk/raster/r.le/r.le.setup/Makefile	2008-08-06 03:28:21 UTC (rev 32551)
@@ -2,8 +2,8 @@
 
 PGM = r.le.setup
 
-LIBES = $(DISPLAYLIB) $(RASTERLIB) $(SITESLIB) $(VECTLIB) $(GISLIB) $(DATETIMELIB) $(VASKLIB) $(CURSES)
-DEPENDENCIES = $(RASTERDEP) $(DISPLAYDEP) $(SITESDEP) $(VECTDEP) $(GISDEP) $(DATETIMEDEP) $(VASKDEP)
+LIBES = $(DISPLAYLIB) $(RASTERLIB) $(SITESLIB) $(VECTLIB) $(GISLIB) $(DATETIMELIB)
+DEPENDENCIES = $(RASTERDEP) $(DISPLAYDEP) $(SITESDEP) $(VECTDEP) $(GISDEP) $(DATETIMEDEP)
 EXTRA_INC = $(VECT_INC)
 EXTRA_CFLAGS = $(VECT_CFLAGS)
 CLEAN_SUBDIRS = polytocell

Modified: grass/trunk/raster3d/r3.mkdspf/main.c
===================================================================
--- grass/trunk/raster3d/r3.mkdspf/main.c	2008-08-06 00:57:07 UTC (rev 32550)
+++ grass/trunk/raster3d/r3.mkdspf/main.c	2008-08-06 03:28:21 UTC (rev 32551)
@@ -89,6 +89,7 @@
     out->key = "dspf";
     out->type = TYPE_STRING;
     out->required = YES;
+    out->gisprompt = "new_file,file,output";
     out->description = _("Name of output display file");
 
     levels = G_define_option();

Modified: grass/trunk/raster3d/r3.mkdspf/r3_find.c
===================================================================
--- grass/trunk/raster3d/r3.mkdspf/r3_find.c	2008-08-06 00:57:07 UTC (rev 32550)
+++ grass/trunk/raster3d/r3.mkdspf/r3_find.c	2008-08-06 03:28:21 UTC (rev 32551)
@@ -30,9 +30,6 @@
 /* return NULL on error: otherwise returns dspout */
 char *check_get_any_dspname(char *dspf, char *g3f, char *mset)
 {
-    char element[200], question[200];
-    static char dspout[200];
-
     if (!G_legal_filename(dspf))
 	return (NULL);
 
@@ -41,18 +38,9 @@
 
     if (mset) {			/* otherwise must be reading only  */
 	if (g3_find_dsp_file(g3f, dspf, mset)) {	/* already exists */
-	    sprintf(question, "\n** %s exists. ok to overwrite? ", dspf);
-	    if (!G_yes(question, 0)) {
-		if (NULL == G_ask_any("", dspout, element, "display", 1))
-		    return (NULL);
-
-		return (dspout);
-	    }
-	    /* or else just print a warning & use it as is */
+	    /* the parser should handle the overwrite check */
 	}
     }
 
-    strcpy(dspout, dspf);
-
-    return (dspout);
+    return dspf;
 }

Modified: grass/trunk/vector/v.transform/Makefile
===================================================================
--- grass/trunk/vector/v.transform/Makefile	2008-08-06 00:57:07 UTC (rev 32550)
+++ grass/trunk/vector/v.transform/Makefile	2008-08-06 03:28:21 UTC (rev 32551)
@@ -5,12 +5,6 @@
 
 include $(MODULE_TOPDIR)/include/Make/Module.make
 
-ifdef MINGW
-EXTRA_LIB=
-else
-EXTRA_LIB=$(VASKLIB) $(CURSES)
-endif
-
 DEPENDENCIES = $(VECTDEP) $(DBMIDEP) $(GISDEP)
 LIBES     = $(VECTLIB) $(DBMILIB) $(TRANSLIB) $(EXTRA_LIB) $(GISLIB)
 EXTRA_INC = $(VECT_INC)

Deleted: grass/trunk/vector/v.transform/ask_trans.c
===================================================================
--- grass/trunk/vector/v.transform/ask_trans.c	2008-08-06 00:57:07 UTC (rev 32550)
+++ grass/trunk/vector/v.transform/ask_trans.c	2008-08-06 03:28:21 UTC (rev 32551)
@@ -1,143 +0,0 @@
-/*
- ****************************************************************************
- *
- * MODULE:       v.transform
- * AUTHOR(S):    See other files as well...
- *               Eric G. Miller <egm2 at jps.net>
- * PURPOSE:      To transform a vector layer's coordinates via a set of tie
- *               points.
- * COPYRIGHT:    (C) 2002 by the GRASS Development Team
- *
- *               This program is free software under the GNU General Public
- *              License (>=v2). Read the file COPYING that comes with GRASS
- *              for details.
- *
- *****************************************************************************/
-/*
- *
- *  ask_transform_coor (n_points) -
- *   Uses Vask to get the sets of coordinates from the user.
- *
- *  shrink_map_coor()  -  condense the arrays used for the transform
- *  library, also turns on the use[] if the coordinate set if valid.
- *
- *  Written by the GRASS Team, 02/16/90, -mh .
- */
-
-#ifndef __MINGW32__
-#include <unistd.h>
-#include <stdio.h>
-#include <grass/gis.h>
-#include <grass/vask.h>
-#include <grass/glocale.h>
-#include "trans.h"
-
-static int shrink_map_coor(void);
-
-int ask_transform_coor(int n_points)
-{
-    int i;
-    int coor_cnt;
-    int at_line;
-    int at_point[MAX_COOR];
-
-    /*  at_point must be an array for Vask  */
-
-    char tmp[82];
-
-
-    /*  number of coordinates we can handle.  this may be the second time
-     *   to this menu and some points may have been registered
-     */
-
-    coor_cnt = MAX_COOR - reg_cnt;
-    V_clear();
-
-    V_line(1, "                               MAP REGISTRATION");
-    V_line(2,
-	   " ------------------------------------------------------------------------");
-    V_line(3,
-	   "|             |        Existing Map          |           New Map         |");
-    V_line(4,
-	   "|   Point #   |   X coord        Y coord     |   X coord        Y coord  |");
-    V_line(5,
-	   " ------------------------------------------------------------------------");
-
-    for (i = 0; i < MAX_COOR; i++) {
-	at_line = i + 7;
-	at_point[i] = i + 1;
-
-	V_const(&at_point[i], 'i', at_line, 6, 6);
-	V_ques(&ax[i], 'd', at_line, 15, 12);
-	V_ques(&ay[i], 'd', at_line, 30, 12);
-	V_ques(&bx[i], 'd', at_line, 45, 12);
-	V_ques(&by[i], 'd', at_line, 60, 12);
-    }
-
-    /*  show min needed and max they can go to  */
-    sprintf(tmp, "    Enter %d to %d points.  Current number of points: %d",
-	    (MIN_COOR > reg_cnt) ? MIN_COOR - reg_cnt : 0, coor_cnt,
-	    n_points);
-    V_line(at_line + 3, tmp);
-
-    V_intrpt_ok();
-
-    /* add message before exit */
-    if (!V_call()) {
-	V_exit();
-	G_message(_("ask_transform_coor():  Leaving session.. \n"));
-	G_sleep(2);
-	return (-1);
-    }
-
-
-    return (shrink_map_coor());
-}
-
-/* 
- *  Condense the arrays and update use[].
- */
-
-
-static int shrink_map_coor(void)
-{
-
-    int i, k;
-
-    for (i = 0, k = 0; i < MAX_COOR; i++) {
-	if (ax[i] == 0.0 || ay[i] == 0.0 || bx[i] == 0.0 || by[i] == 0.0)
-	    continue;
-	use[i] = 1;
-
-	/*  same place count it, but skip it  */
-	if (i == k) {
-	    ++k;
-	    continue;
-	}
-
-	/*  valid point store them  */
-	*(bx + k) = *(bx + i);
-	*(by + k) = *(by + i);
-	*(ax + k) = *(ax + i);
-	*(ay + k) = *(ay + i);
-	*(use + k) = *(use + i);
-	*(residuals + k) = *(residuals + i);
-	++k;
-    }
-
-    /*  now make sure everything else is zero'ed out  */
-    i = (k <= 0) ? 0 : k;
-    for (; i < MAX_COOR; i++) {
-
-	*(bx + i) = 0.0;
-	*(by + i) = 0.0;
-	*(ax + i) = 0.0;
-	*(ay + i) = 0.0;
-	*(use + i) = 0;
-	*(residuals + i) = 0.0;
-    }
-
-    return (k);
-
-}
-#endif /* __MINGW32__ */



More information about the grass-commit mailing list