? config.log
? acconfig.h
? config.status
? bin.i686-pc-linux-gnu
? dist.i686-pc-linux-gnu
? config.cache
? configure.in.mea
? grass51-mea.diff
? db/base/OBJ.i686-pc-linux-gnu
? db/drivers/dbf/OBJ.i686-pc-linux-gnu
? db/drivers/odbc/OBJ.i686-pc-linux-gnu
? display/d.erase/OBJ.i686-pc-linux-gnu
? display/d.mon/cmd/OBJ.i686-pc-linux-gnu
? display/d.mon/pgms/OBJ.i686-pc-linux-gnu
? display/d.path/OBJ.i686-pc-linux-gnu
? display/d.rast/OBJ.i686-pc-linux-gnu
? display/d.vect/OBJ.i686-pc-linux-gnu
? display/d.what.vect/OBJ.i686-pc-linux-gnu
? display/d.zoom/OBJ.i686-pc-linux-gnu
? display/drivers/XDRIVER/XDRIVER24/OBJ.i686-pc-linux-gnu
? display/drivers/lib/OBJ.i686-pc-linux-gnu
? general/g.gisenv/OBJ.i686-pc-linux-gnu
? general/g.mapsets/OBJ.i686-pc-linux-gnu
? general/g.region/cmd/OBJ.i686-pc-linux-gnu
? include/config.h
? include/Make/Platform.make
? lib/D/OBJ.i686-pc-linux-gnu
? lib/bitmap/OBJ.i686-pc-linux-gnu
? lib/btree/OBJ.i686-pc-linux-gnu
? lib/datetime/OBJ.i686-pc-linux-gnu
? lib/db/dbmi/OBJ.i686-pc-linux-gnu
? lib/db/sqlp/OBJ.i686-pc-linux-gnu
? lib/db/sqlp/y.output
? lib/db/sqlp/y.tab.c
? lib/db/sqlp/y.tab.h
? lib/db/sqlp/lex.yy.c
? lib/db/sqlp/test/sqlptest
? lib/db/stubs/OBJ.i686-pc-linux-gnu
? lib/display/OBJ.i686-pc-linux-gnu
? lib/edit/OBJ.i686-pc-linux-gnu
? lib/external/shapelib/OBJ.i686-pc-linux-gnu
? lib/fonts/for_grass/OBJ.i686-pc-linux-gnu
? lib/front.end/OBJ.i686-pc-linux-gnu
? lib/gis/OBJ.i686-pc-linux-gnu
? lib/image/OBJ.i686-pc-linux-gnu
? lib/init/OBJ.i686-pc-linux-gnu
? lib/linkm/OBJ.i686-pc-linux-gnu
? lib/ogsf/OBJ.i686-pc-linux-gnu
? lib/proj/OBJ.i686-pc-linux-gnu
? lib/raster/OBJ.i686-pc-linux-gnu
? lib/vask/OBJ.i686-pc-linux-gnu
? lib/vector/Vlib/OBJ.i686-pc-linux-gnu
? lib/vector/dglib/OBJ.i686-pc-linux-gnu
? lib/vector/diglib/OBJ.i686-pc-linux-gnu
? vector/v.ascii/OBJ.i686-pc-linux-gnu
? vector/v.build/OBJ.i686-pc-linux-gnu
? vector/v.category/OBJ.i686-pc-linux-gnu
? vector/v.convert/OBJ.i686-pc-linux-gnu
? vector/v.mapcalc/OBJ.i686-pc-linux-gnu
? visualization/nviz/src/Makefile
? visualization/nviz/src/OBJ.i686-pc-linux-gnu
Index: configure
===================================================================
RCS file: /home/grass/grassrepository/grass51/configure,v
retrieving revision 1.3
diff -u -r1.3 configure
--- configure	6 May 2002 15:57:16 -0000	1.3
+++ configure	10 Jul 2002 13:28:06 -0000
@@ -937,13 +937,15 @@
 if test "$INC_DIRS"; then
     for dir in $INC_DIRS; do
         if test -d "$dir"; then
-            INCLUDE_DIRS="$INCLUDE_DIRS -I$dir"
+	    if test "x/usr/include" != "x$dir"; then
+		INCLUDE_DIRS="$INCLUDE_DIRS -I$dir"
+	    fi
         else
             echo "configure: warning: *** Include directory $dir does not exist." 1>&2
         fi
     done
     echo $ac_n "checking additional include dirs""... $ac_c" 1>&6
-echo "configure:947: checking additional include dirs" >&5
+echo "configure:949: checking additional include dirs" >&5
     echo "$ac_t""$INCLUDE_DIRS" 1>&6
     CPPFLAGS="$CPPFLAGS $INCLUDE_DIRS"
 fi
@@ -977,7 +979,7 @@
         fi
     done
     echo $ac_n "checking additional library dirs""... $ac_c" 1>&6
-echo "configure:981: checking additional library dirs" >&5
+echo "configure:983: checking additional library dirs" >&5
     echo "$ac_t""$LIBRARY_DIRS" 1>&6
     LDFLAGS="$LDFLAGS $LIBRARY_DIRS"
 fi
@@ -995,7 +997,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:999: checking for a BSD compatible install" >&5
+echo "configure:1001: checking for a BSD compatible install" >&5
 if test -z "$INSTALL"; then
 if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -1050,7 +1052,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:1054: checking for $ac_word" >&5
+echo "configure:1056: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_LEX'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1084,7 +1086,7 @@
   *) ac_lib=l ;;
   esac
   echo $ac_n "checking for yywrap in -l$ac_lib""... $ac_c" 1>&6
-echo "configure:1088: checking for yywrap in -l$ac_lib" >&5
+echo "configure:1090: checking for yywrap in -l$ac_lib" >&5
 ac_lib_var=`echo $ac_lib'_'yywrap | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -1092,7 +1094,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-l$ac_lib  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 1096 "configure"
+#line 1098 "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
@@ -1103,7 +1105,7 @@
 yywrap()
 ; return 0; }
 EOF
-if { (eval echo configure:1107: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1109: \"$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
@@ -1132,7 +1134,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:1136: checking for $ac_word" >&5
+echo "configure:1138: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_YACC'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1176,7 +1178,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:1180: checking for $ac_word" >&5
+echo "configure:1182: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1208,7 +1210,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:1212: checking for $ac_word" >&5
+echo "configure:1214: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_ENV'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1242,7 +1244,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:1246: checking for $ac_word" >&5
+echo "configure:1248: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_F77'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1272,7 +1274,7 @@
 done
 
 echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6
-echo "configure:1276: checking how to run the C preprocessor" >&5
+echo "configure:1278: checking how to run the C preprocessor" >&5
 # On Suns, sometimes $CPP names a directory.
 if test -n "$CPP" && test -d "$CPP"; then
   CPP=
@@ -1287,13 +1289,13 @@
   # On the NeXT, cc -E runs the code through the compiler's parser,
   # not just through cpp.
   cat > conftest.$ac_ext <<EOF
-#line 1291 "configure"
+#line 1293 "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:1297: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1299: \"$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
   :
@@ -1304,13 +1306,13 @@
   rm -rf conftest*
   CPP="${CC-cc} -E -traditional-cpp"
   cat > conftest.$ac_ext <<EOF
-#line 1308 "configure"
+#line 1310 "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:1314: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1316: \"$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
   :
@@ -1321,13 +1323,13 @@
   rm -rf conftest*
   CPP="${CC-cc} -nologo -E"
   cat > conftest.$ac_ext <<EOF
-#line 1325 "configure"
+#line 1327 "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:1331: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1333: \"$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
   :
@@ -1356,7 +1358,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:1360: checking for X" >&5
+echo "configure:1362: checking for X" >&5
 
 # Check whether --with-x or --without-x was given.
 if test "${with_x+set}" = set; then
@@ -1418,12 +1420,12 @@
 
   # First, try using that file with no special directory specified.
 cat > conftest.$ac_ext <<EOF
-#line 1422 "configure"
+#line 1424 "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:1427: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1429: \"$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*
@@ -1492,14 +1494,14 @@
   ac_save_LIBS="$LIBS"
   LIBS="-l$x_direct_test_library $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 1496 "configure"
+#line 1498 "configure"
 #include "confdefs.h"
 
 int main() {
 ${x_direct_test_function}()
 ; return 0; }
 EOF
-if { (eval echo configure:1503: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1505: \"$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.
@@ -1605,17 +1607,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:1609: checking whether -R must be followed by a space" >&5
+echo "configure:1611: 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 1612 "configure"
+#line 1614 "configure"
 #include "confdefs.h"
 
 int main() {
 
 ; return 0; }
 EOF
-if { (eval echo configure:1619: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1621: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   ac_R_nospace=yes
 else
@@ -1631,14 +1633,14 @@
       else
 	LIBS="$ac_xsave_LIBS -R $x_libraries"
 	cat > conftest.$ac_ext <<EOF
-#line 1635 "configure"
+#line 1637 "configure"
 #include "confdefs.h"
 
 int main() {
 
 ; return 0; }
 EOF
-if { (eval echo configure:1642: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1644: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   ac_R_space=yes
 else
@@ -1670,7 +1672,7 @@
     # libraries were built with DECnet support.  And karl@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:1674: checking for dnet_ntoa in -ldnet" >&5
+echo "configure:1676: checking for dnet_ntoa in -ldnet" >&5
 ac_lib_var=`echo dnet'_'dnet_ntoa | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -1678,7 +1680,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-ldnet  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 1682 "configure"
+#line 1684 "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
@@ -1689,7 +1691,7 @@
 dnet_ntoa()
 ; return 0; }
 EOF
-if { (eval echo configure:1693: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1695: \"$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
@@ -1711,7 +1713,7 @@
 
     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:1715: checking for dnet_ntoa in -ldnet_stub" >&5
+echo "configure:1717: checking for dnet_ntoa in -ldnet_stub" >&5
 ac_lib_var=`echo dnet_stub'_'dnet_ntoa | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -1719,7 +1721,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-ldnet_stub  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 1723 "configure"
+#line 1725 "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
@@ -1730,7 +1732,7 @@
 dnet_ntoa()
 ; return 0; }
 EOF
-if { (eval echo configure:1734: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1736: \"$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
@@ -1759,12 +1761,12 @@
     # The nsl library prevents programs from opening the X display
     # on Irix 5.2, according to dickey@clark.net.
     echo $ac_n "checking for gethostbyname""... $ac_c" 1>&6
-echo "configure:1763: checking for gethostbyname" >&5
+echo "configure:1765: checking for gethostbyname" >&5
 if eval "test \"`echo '$''{'ac_cv_func_gethostbyname'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 1768 "configure"
+#line 1770 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char gethostbyname(); below.  */
@@ -1787,7 +1789,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:1791: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1793: \"$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
@@ -1808,7 +1810,7 @@
 
     if test $ac_cv_func_gethostbyname = no; then
       echo $ac_n "checking for gethostbyname in -lnsl""... $ac_c" 1>&6
-echo "configure:1812: checking for gethostbyname in -lnsl" >&5
+echo "configure:1814: checking for gethostbyname in -lnsl" >&5
 ac_lib_var=`echo nsl'_'gethostbyname | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -1816,7 +1818,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lnsl  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 1820 "configure"
+#line 1822 "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
@@ -1827,7 +1829,7 @@
 gethostbyname()
 ; return 0; }
 EOF
-if { (eval echo configure:1831: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1833: \"$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
@@ -1857,12 +1859,12 @@
     # -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:1861: checking for connect" >&5
+echo "configure:1863: checking for connect" >&5
 if eval "test \"`echo '$''{'ac_cv_func_connect'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 1866 "configure"
+#line 1868 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char connect(); below.  */
@@ -1885,7 +1887,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:1889: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1891: \"$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
@@ -1906,7 +1908,7 @@
 
     if test $ac_cv_func_connect = no; then
       echo $ac_n "checking for connect in -lsocket""... $ac_c" 1>&6
-echo "configure:1910: checking for connect in -lsocket" >&5
+echo "configure:1912: checking for connect in -lsocket" >&5
 ac_lib_var=`echo socket'_'connect | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -1914,7 +1916,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lsocket $X_EXTRA_LIBS $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 1918 "configure"
+#line 1920 "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
@@ -1925,7 +1927,7 @@
 connect()
 ; return 0; }
 EOF
-if { (eval echo configure:1929: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1931: \"$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
@@ -1949,12 +1951,12 @@
 
     # gomez@mi.uni-erlangen.de says -lposix is necessary on A/UX.
     echo $ac_n "checking for remove""... $ac_c" 1>&6
-echo "configure:1953: checking for remove" >&5
+echo "configure:1955: checking for remove" >&5
 if eval "test \"`echo '$''{'ac_cv_func_remove'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 1958 "configure"
+#line 1960 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char remove(); below.  */
@@ -1977,7 +1979,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:1981: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1983: \"$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
@@ -1998,7 +2000,7 @@
 
     if test $ac_cv_func_remove = no; then
       echo $ac_n "checking for remove in -lposix""... $ac_c" 1>&6
-echo "configure:2002: checking for remove in -lposix" >&5
+echo "configure:2004: checking for remove in -lposix" >&5
 ac_lib_var=`echo posix'_'remove | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -2006,7 +2008,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lposix  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 2010 "configure"
+#line 2012 "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
@@ -2017,7 +2019,7 @@
 remove()
 ; return 0; }
 EOF
-if { (eval echo configure:2021: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2023: \"$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
@@ -2041,12 +2043,12 @@
 
     # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay.
     echo $ac_n "checking for shmat""... $ac_c" 1>&6
-echo "configure:2045: checking for shmat" >&5
+echo "configure:2047: checking for shmat" >&5
 if eval "test \"`echo '$''{'ac_cv_func_shmat'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 2050 "configure"
+#line 2052 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char shmat(); below.  */
@@ -2069,7 +2071,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:2073: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2075: \"$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
@@ -2090,7 +2092,7 @@
 
     if test $ac_cv_func_shmat = no; then
       echo $ac_n "checking for shmat in -lipc""... $ac_c" 1>&6
-echo "configure:2094: checking for shmat in -lipc" >&5
+echo "configure:2096: checking for shmat in -lipc" >&5
 ac_lib_var=`echo ipc'_'shmat | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -2098,7 +2100,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lipc  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 2102 "configure"
+#line 2104 "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
@@ -2109,7 +2111,7 @@
 shmat()
 ; return 0; }
 EOF
-if { (eval echo configure:2113: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2115: \"$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
@@ -2142,7 +2144,7 @@
   # libraries we check for below, so use a different variable.
   #  --interran@uluru.Stanford.EDU, kb@cs.umb.edu.
   echo $ac_n "checking for IceConnectionNumber in -lICE""... $ac_c" 1>&6
-echo "configure:2146: checking for IceConnectionNumber in -lICE" >&5
+echo "configure:2148: checking for IceConnectionNumber in -lICE" >&5
 ac_lib_var=`echo ICE'_'IceConnectionNumber | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -2150,7 +2152,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lICE $X_EXTRA_LIBS $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 2154 "configure"
+#line 2156 "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
@@ -2161,7 +2163,7 @@
 IceConnectionNumber()
 ; return 0; }
 EOF
-if { (eval echo configure:2165: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2167: \"$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
@@ -2186,12 +2188,12 @@
 fi
 
 echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6
-echo "configure:2190: checking for ANSI C header files" >&5
+echo "configure:2192: checking for ANSI C header files" >&5
 if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 2195 "configure"
+#line 2197 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 #include <stdarg.h>
@@ -2199,7 +2201,7 @@
 #include <float.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2203: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:2205: \"$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*
@@ -2216,7 +2218,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 2220 "configure"
+#line 2222 "configure"
 #include "confdefs.h"
 #include <string.h>
 EOF
@@ -2234,7 +2236,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 2238 "configure"
+#line 2240 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 EOF
@@ -2255,7 +2257,7 @@
   :
 else
   cat > conftest.$ac_ext <<EOF
-#line 2259 "configure"
+#line 2261 "configure"
 #include "confdefs.h"
 #include <ctype.h>
 #define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
@@ -2266,7 +2268,7 @@
 exit (0); }
 
 EOF
-if { (eval echo configure:2270: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:2272: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   :
 else
@@ -2293,17 +2295,17 @@
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:2297: checking for $ac_hdr" >&5
+echo "configure:2299: checking for $ac_hdr" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 2302 "configure"
+#line 2304 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2307: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:2309: \"$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*
@@ -2333,17 +2335,17 @@
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:2337: checking for $ac_hdr" >&5
+echo "configure:2339: checking for $ac_hdr" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 2342 "configure"
+#line 2344 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2347: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:2349: \"$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*
@@ -2373,17 +2375,17 @@
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:2377: checking for $ac_hdr" >&5
+echo "configure:2379: checking for $ac_hdr" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 2382 "configure"
+#line 2384 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2387: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:2389: \"$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*
@@ -2410,12 +2412,12 @@
 done
 
 echo $ac_n "checking whether time.h and sys/time.h may both be included""... $ac_c" 1>&6
-echo "configure:2414: checking whether time.h and sys/time.h may both be included" >&5
+echo "configure:2416: checking whether time.h and sys/time.h may both be included" >&5
 if eval "test \"`echo '$''{'ac_cv_header_time'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 2419 "configure"
+#line 2421 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <sys/time.h>
@@ -2424,7 +2426,7 @@
 struct tm *tp;
 ; return 0; }
 EOF
-if { (eval echo configure:2428: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2430: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_header_time=yes
 else
@@ -2445,12 +2447,12 @@
 fi
 
 echo $ac_n "checking for off_t""... $ac_c" 1>&6
-echo "configure:2449: checking for off_t" >&5
+echo "configure:2451: checking for off_t" >&5
 if eval "test \"`echo '$''{'ac_cv_type_off_t'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 2454 "configure"
+#line 2456 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #if STDC_HEADERS
@@ -2478,12 +2480,12 @@
 fi
 
 echo $ac_n "checking for uid_t in sys/types.h""... $ac_c" 1>&6
-echo "configure:2482: checking for uid_t in sys/types.h" >&5
+echo "configure:2484: checking for uid_t in sys/types.h" >&5
 if eval "test \"`echo '$''{'ac_cv_type_uid_t'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 2487 "configure"
+#line 2489 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 EOF
@@ -2512,12 +2514,12 @@
 fi
 
 echo $ac_n "checking return type of signal handlers""... $ac_c" 1>&6
-echo "configure:2516: checking return type of signal handlers" >&5
+echo "configure:2518: checking return type of signal handlers" >&5
 if eval "test \"`echo '$''{'ac_cv_type_signal'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 2521 "configure"
+#line 2523 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <signal.h>
@@ -2534,7 +2536,7 @@
 int i;
 ; return 0; }
 EOF
-if { (eval echo configure:2538: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2540: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_type_signal=void
 else
@@ -2553,12 +2555,12 @@
 
 
 echo $ac_n "checking for Cygwin environment""... $ac_c" 1>&6
-echo "configure:2557: checking for Cygwin environment" >&5
+echo "configure:2559: checking for Cygwin environment" >&5
 if eval "test \"`echo '$''{'ac_cv_cygwin'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 2562 "configure"
+#line 2564 "configure"
 #include "confdefs.h"
 
 int main() {
@@ -2569,7 +2571,7 @@
 return __CYGWIN__;
 ; return 0; }
 EOF
-if { (eval echo configure:2573: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2575: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_cygwin=yes
 else
@@ -2588,7 +2590,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:2592: checking for $ac_word" >&5
+echo "configure:2594: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_PERL'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2624,10 +2626,10 @@
 
 
 echo $ac_n "checking curses.h WINDOW structure component""... $ac_c" 1>&6
-echo "configure:2628: checking curses.h WINDOW structure component" >&5
+echo "configure:2630: checking curses.h WINDOW structure component" >&5
 CURSES_MAXY=NONE
 cat > conftest.$ac_ext <<EOF
-#line 2631 "configure"
+#line 2633 "configure"
 #include "confdefs.h"
 
 #include <curses.h>
@@ -2637,7 +2639,7 @@
 w.maxy = 0;
 ; return 0; }
 EOF
-if { (eval echo configure:2641: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2643: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   CURSES_MAXY=maxy
 else
@@ -2646,7 +2648,7 @@
 fi
 rm -f conftest*
 cat > conftest.$ac_ext <<EOF
-#line 2650 "configure"
+#line 2652 "configure"
 #include "confdefs.h"
 
 #include <curses.h>
@@ -2656,7 +2658,7 @@
 w._maxy = 0;
 ; return 0; }
 EOF
-if { (eval echo configure:2660: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2662: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   CURSES_MAXY=_maxy
 else
@@ -2674,12 +2676,12 @@
 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:2678: checking for $ac_func" >&5
+echo "configure:2680: checking for $ac_func" >&5
 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 2683 "configure"
+#line 2685 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -2702,7 +2704,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:2706: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2708: \"$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
@@ -2729,12 +2731,12 @@
 for ac_func in seteuid setpriority setreuid setruid
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:2733: checking for $ac_func" >&5
+echo "configure:2735: checking for $ac_func" >&5
 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 2738 "configure"
+#line 2740 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -2757,7 +2759,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:2761: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2763: \"$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
@@ -2782,7 +2784,7 @@
 done
 
 echo $ac_n "checking whether setpgrp takes no argument""... $ac_c" 1>&6
-echo "configure:2786: checking whether setpgrp takes no argument" >&5
+echo "configure:2788: checking whether setpgrp takes no argument" >&5
 if eval "test \"`echo '$''{'ac_cv_func_setpgrp_void'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2790,7 +2792,7 @@
   { echo "configure: error: cannot check setpgrp if cross compiling" 1>&2; exit 1; }
 else
   cat > conftest.$ac_ext <<EOF
-#line 2794 "configure"
+#line 2796 "configure"
 #include "confdefs.h"
 
 #ifdef HAVE_UNISTD_H
@@ -2810,7 +2812,7 @@
 }
 
 EOF
-if { (eval echo configure:2814: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:2816: \"$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
@@ -2837,7 +2839,7 @@
 CURSESLIB=
 if test -z "${CURSESLIB}"; then
 echo $ac_n "checking for initscr in -lncurses""... $ac_c" 1>&6
-echo "configure:2841: checking for initscr in -lncurses" >&5
+echo "configure:2843: checking for initscr in -lncurses" >&5
 ac_lib_var=`echo ncurses'_'initscr | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -2845,7 +2847,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lncurses  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 2849 "configure"
+#line 2851 "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
@@ -2856,7 +2858,7 @@
 initscr()
 ; return 0; }
 EOF
-if { (eval echo configure:2860: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2862: \"$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
@@ -2879,7 +2881,7 @@
 fi
 if test -z "${CURSESLIB}"; then
 echo $ac_n "checking for initscr in -lcurses""... $ac_c" 1>&6
-echo "configure:2883: checking for initscr in -lcurses" >&5
+echo "configure:2885: checking for initscr in -lcurses" >&5
 ac_lib_var=`echo curses'_'initscr | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -2887,7 +2889,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lcurses  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 2891 "configure"
+#line 2893 "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
@@ -2898,7 +2900,7 @@
 initscr()
 ; return 0; }
 EOF
-if { (eval echo configure:2902: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2904: \"$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
@@ -2924,7 +2926,7 @@
 COMPATLIB=
 if test -z "${COMPATLIB}"; then
 echo $ac_n "checking for gtty in -lcompat""... $ac_c" 1>&6
-echo "configure:2928: checking for gtty in -lcompat" >&5
+echo "configure:2930: checking for gtty in -lcompat" >&5
 ac_lib_var=`echo compat'_'gtty | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -2932,7 +2934,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lcompat  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 2936 "configure"
+#line 2938 "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
@@ -2943,7 +2945,7 @@
 gtty()
 ; return 0; }
 EOF
-if { (eval echo configure:2947: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2949: \"$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
@@ -2969,7 +2971,7 @@
 TERMLIB=
 if test -z "${TERMLIB}"; then
 echo $ac_n "checking for tgetent in -ltermlib""... $ac_c" 1>&6
-echo "configure:2973: checking for tgetent in -ltermlib" >&5
+echo "configure:2975: checking for tgetent in -ltermlib" >&5
 ac_lib_var=`echo termlib'_'tgetent | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -2977,7 +2979,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-ltermlib  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 2981 "configure"
+#line 2983 "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
@@ -2988,7 +2990,7 @@
 tgetent()
 ; return 0; }
 EOF
-if { (eval echo configure:2992: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2994: \"$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
@@ -3014,7 +3016,7 @@
 XDRLIB=
 if test -z "${XDRLIB}"; then
 echo $ac_n "checking for xdrmem_create in -lsun""... $ac_c" 1>&6
-echo "configure:3018: checking for xdrmem_create in -lsun" >&5
+echo "configure:3020: checking for xdrmem_create in -lsun" >&5
 ac_lib_var=`echo sun'_'xdrmem_create | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -3022,7 +3024,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lsun  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 3026 "configure"
+#line 3028 "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
@@ -3033,7 +3035,7 @@
 xdrmem_create()
 ; return 0; }
 EOF
-if { (eval echo configure:3037: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3039: \"$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
@@ -3056,7 +3058,7 @@
 fi
 if test -z "${XDRLIB}"; then
 echo $ac_n "checking for xdrmem_create in -lnsl""... $ac_c" 1>&6
-echo "configure:3060: checking for xdrmem_create in -lnsl" >&5
+echo "configure:3062: checking for xdrmem_create in -lnsl" >&5
 ac_lib_var=`echo nsl'_'xdrmem_create | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -3064,7 +3066,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lnsl  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 3068 "configure"
+#line 3070 "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
@@ -3075,7 +3077,7 @@
 xdrmem_create()
 ; return 0; }
 EOF
-if { (eval echo configure:3079: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3081: \"$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
@@ -3098,7 +3100,7 @@
 fi
 if test -z "${XDRLIB}"; then
 echo $ac_n "checking for xdrmem_create in -lrpclib""... $ac_c" 1>&6
-echo "configure:3102: checking for xdrmem_create in -lrpclib" >&5
+echo "configure:3104: checking for xdrmem_create in -lrpclib" >&5
 ac_lib_var=`echo rpclib'_'xdrmem_create | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -3106,7 +3108,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lrpclib  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 3110 "configure"
+#line 3112 "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
@@ -3117,7 +3119,7 @@
 xdrmem_create()
 ; return 0; }
 EOF
-if { (eval echo configure:3121: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3123: \"$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
@@ -3141,7 +3143,7 @@
 # IRIX and glibc2.2 have this in C lib as well, so check
 if test "${XDRLIB}"; then
 echo $ac_n "checking for xdrmem_create in -lc""... $ac_c" 1>&6
-echo "configure:3145: checking for xdrmem_create in -lc" >&5
+echo "configure:3147: checking for xdrmem_create in -lc" >&5
 ac_lib_var=`echo c'_'xdrmem_create | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -3149,7 +3151,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lc  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 3153 "configure"
+#line 3155 "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
@@ -3160,7 +3162,7 @@
 xdrmem_create()
 ; return 0; }
 EOF
-if { (eval echo configure:3164: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3166: \"$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
@@ -3187,7 +3189,7 @@
 # Test if mathlib needs -lm flag or is included with libc
 MATHLIB="-lm"
 echo $ac_n "checking for atan in -lc""... $ac_c" 1>&6
-echo "configure:3191: checking for atan in -lc" >&5
+echo "configure:3193: checking for atan in -lc" >&5
 ac_lib_var=`echo c'_'atan | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -3195,7 +3197,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lc  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 3199 "configure"
+#line 3201 "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
@@ -3206,7 +3208,7 @@
 atan()
 ; return 0; }
 EOF
-if { (eval echo configure:3210: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3212: \"$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
@@ -3228,7 +3230,7 @@
 
 if test "$MATHLIB"; then
     echo $ac_n "checking for atan in -lm""... $ac_c" 1>&6
-echo "configure:3232: checking for atan in -lm" >&5
+echo "configure:3234: checking for atan in -lm" >&5
 ac_lib_var=`echo m'_'atan | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -3236,7 +3238,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lm  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 3240 "configure"
+#line 3242 "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
@@ -3247,7 +3249,7 @@
 atan()
 ; return 0; }
 EOF
-if { (eval echo configure:3251: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3253: \"$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
@@ -3287,7 +3289,7 @@
 
 DLLIB=
 echo $ac_n "checking for dlsym in -ldl""... $ac_c" 1>&6
-echo "configure:3291: checking for dlsym in -ldl" >&5
+echo "configure:3293: checking for dlsym in -ldl" >&5
 ac_lib_var=`echo dl'_'dlsym | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -3295,7 +3297,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-ldl  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 3299 "configure"
+#line 3301 "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
@@ -3306,7 +3308,7 @@
 dlsym()
 ; return 0; }
 EOF
-if { (eval echo configure:3310: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3312: \"$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
@@ -3335,7 +3337,7 @@
 ZLIB=
 # With zlib includes directory:
 echo $ac_n "checking for location of zlib includes""... $ac_c" 1>&6
-echo "configure:3339: checking for location of zlib includes" >&5
+echo "configure:3341: checking for location of zlib includes" >&5
 # Check whether --with-zlib-includes or --without-zlib-includes was given.
 if test "${with_zlib_includes+set}" = set; then
   withval="$with_zlib_includes"
@@ -3355,7 +3357,10 @@
     for dir in $zlib_inc_dirs; do
 #        if test -d "$dir" && test -f "$dir/zlib.h"; then
         if test -d "$dir"; then
-            ZLIBINCPATH="$ZLIBINCPATH -I${dir}"
+	    if test "x/usr/include" != "x$dir"; then
+		ZLIBINCPATH="$ZLIBINCPATH -I${dir}"
+	    fi
+	    ZLIBINCOK=1
         else
             echo "configure: warning: *** zlib includes directory $dir does not exist." 1>&2
         fi
@@ -3363,33 +3368,38 @@
 else
     for dir in $my_inc_dirs; do
         if test -d "$dir" && test -f "$dir/zlib.h"; then
-            ZLIBINCPATH="$ZLIBINCPATH -I$dir"
+	    if test "x/usr/include" != "x$dir"; then
+		ZLIBINCPATH="-I$dir"
+	    fi
+	    ZLIBINCOK=1
 	    break
         fi
     done
 fi
 
 
+if test "x$ZLIBINCPATH" == "x-I/usr/include"; then
+    ZLIBINCPATH=
+fi
 echo "$ac_t""$ZLIBINCPATH" 1>&6
 
-
 ac_save_cppflags="$CPPFLAGS"
 CPPFLAGS="$CPPFLAGS $ZLIBINCPATH"
 for ac_hdr in zlib.h
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:3383: checking for $ac_hdr" >&5
+echo "configure:3393: checking for $ac_hdr" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 3388 "configure"
+#line 3398 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:3393: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:3403: \"$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*
@@ -3419,7 +3429,7 @@
 
 # With zlib library directory:
 echo $ac_n "checking for location of zlib lib""... $ac_c" 1>&6
-echo "configure:3423: checking for location of zlib lib" >&5
+echo "configure:3433: checking for location of zlib lib" >&5
 # Check whether --with-zlib-libs or --without-zlib-libs was given.
 if test "${with_zlib_libs+set}" = set; then
   withval="$with_zlib_libs"
@@ -3456,14 +3466,16 @@
 echo "$ac_t""$ZLIBLIBPATH" 1>&6
 
 
-if test -z "$ZLIBINCPATH" || test -z "$ZLIBLIBPATH" ; then
+if test -z "$ZLIBINCOK" || test -z "$ZLIBLIBPATH" ; then
     { echo "configure: error: *** Could not find zlib library. This lib is required." 1>&2; exit 1; }
 fi
 
 
+
+
 if test -z "${ZLIB}"; then
     echo $ac_n "checking for deflate in -lz""... $ac_c" 1>&6
-echo "configure:3467: checking for deflate in -lz" >&5
+echo "configure:3479: checking for deflate in -lz" >&5
 ac_lib_var=`echo z'_'deflate | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -3471,7 +3483,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lz  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 3475 "configure"
+#line 3487 "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
@@ -3482,7 +3494,7 @@
 deflate()
 ; return 0; }
 EOF
-if { (eval echo configure:3486: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3498: \"$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
@@ -3526,30 +3538,34 @@
 if test "$tiff_inc_dirs"; then
     for dir in $tiff_inc_dirs; do
         if test -d "$dir"; then
-            TIFF_INCLUDE_DIRS="$TIFF_INCLUDE_DIRS -I$dir"
+	    TIFF_INCLUDE_DIRS="-I$dir"
         else
             echo "configure: warning: *** TIFF include directory $dir does not exist." 1>&2
         fi
     done
     echo $ac_n "checking TIFF include dirs""... $ac_c" 1>&6
-echo "configure:3536: checking TIFF include dirs" >&5
+echo "configure:3548: checking TIFF include dirs" >&5
     echo "$ac_t""$TIFF_INCLUDE_DIRS" 1>&6
 fi
 
 if test -z "$TIFF_INCLUDE_DIRS"; then
     echo $ac_n "checking TIFF include dirs""... $ac_c" 1>&6
-echo "configure:3542: checking TIFF include dirs" >&5
+echo "configure:3554: checking TIFF include dirs" >&5
     for dir in $my_inc_dirs; do
         if test -z "$TIFF_INCLUDE_DIRS" && test -d "$dir" && test -f "$dir/tiffio.h"; then
-            TIFF_INCLUDE_DIRS="-I$dir"
+	    TIFF_INCLUDE_DIRS="-I$dir"
+	    TIFFIOH_OK=1
 	    break
         fi
     done
     echo "$ac_t""$TIFF_INCLUDE_DIRS" 1>&6
 fi
-if test -z "$TIFF_INCLUDE_DIRS"; then
+if test -z "$TIFFIOH_OK"; then
 	echo "configure: warning: *** Could not find 'tiffio.h'." 1>&2
 fi
+if test "x$TIFF_INCLUDE_DIRS" == "x-I/usr/include"; then
+    TIFF_INCLUDE_DIRS=
+fi
 
 
 # Check whether --with-tiff-libs or --without-tiff-libs was given.
@@ -3576,13 +3592,13 @@
         fi
     done
     echo $ac_n "checking additional TIFF library dirs""... $ac_c" 1>&6
-echo "configure:3580: checking additional TIFF library dirs" >&5
+echo "configure:3596: checking additional TIFF library dirs" >&5
     echo "$ac_t""$TIFF_LIBRARY_DIRS" 1>&6
 fi
 
 if test -z "$TIFF_LIBRARY_DIRS"; then
     echo $ac_n "checking TIFF library dirs""... $ac_c" 1>&6
-echo "configure:3586: checking TIFF library dirs" >&5
+echo "configure:3602: checking TIFF library dirs" >&5
     for dir in $my_lib_dirs; do
         if test -z "$TIFF_LIBRARY_DIRS" && test -d "$dir" && (test -f "$dir/libtiff.a" || test -f "$dir/libtiff.so"); then
             TIFF_LIBRARY_DIRS="-L$dir"
@@ -3599,7 +3615,7 @@
 ldflags_save="$LDFLAGS"
 LDFLAGS="$LDFLAGS $MATHLIB $TIFF_LIBRARY_DIRS"
 echo $ac_n "checking for TIFFOpen in -ltiff""... $ac_c" 1>&6
-echo "configure:3603: checking for TIFFOpen in -ltiff" >&5
+echo "configure:3619: checking for TIFFOpen in -ltiff" >&5
 ac_lib_var=`echo tiff'_'TIFFOpen | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -3607,7 +3623,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-ltiff  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 3611 "configure"
+#line 3627 "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
@@ -3618,7 +3634,7 @@
 TIFFOpen()
 ; return 0; }
 EOF
-if { (eval echo configure:3622: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3638: \"$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
@@ -3647,7 +3663,7 @@
 # Do we want to build with a static GDAL?  
 
 echo $ac_n "checking check if we should build directly against GDAL""... $ac_c" 1>&6
-echo "configure:3651: checking check if we should build directly against GDAL" >&5
+echo "configure:3667: checking check if we should build directly against GDAL" >&5
 
 # Check whether --with-gdal or --without-gdal was given.
 if test "${with_gdal+set}" = set; then
@@ -3666,7 +3682,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:3670: checking for $ac_word" >&5
+echo "configure:3686: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_GDAL_CONFIG'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -3738,10 +3754,13 @@
 tcltk_ver=
 
 TCLINCDIR=
+TCLINCLOK=
 if test "$tclincdir" ; then
     for dir in $tclincdir; do
         if test -d "$dir"; then
-            TCLINCDIR="$TCLINCDIR -I${dir}"
+	    if test "x/usr/include" != "x$dir"; then
+		TCLINCDIR="-I${dir}"
+	    fi
             if test -f "$dir/tcl.h"; then
                 grep_cmd="grep TCL_VERSION ${dir}/tcl.h"
                 tcltk_ver=`$grep_cmd | sed -e 's/^\(.*\)\"\(.*\)\"$/\2/'`
@@ -3751,20 +3770,20 @@
         fi
     done
     echo $ac_n "checking Tcl include dirs""... $ac_c" 1>&6
-echo "configure:3755: checking Tcl include dirs" >&5
+echo "configure:3774: checking Tcl include dirs" >&5
     echo "$ac_t""$TCLINCDIR" 1>&6
 fi
 # NEEDS else check known places ...
 if test -z "$TCLINCDIR" ; then
     echo $ac_n "checking Tcl include dirs""... $ac_c" 1>&6
-echo "configure:3761: checking Tcl include dirs" >&5
+echo "configure:3780: checking Tcl include dirs" >&5
     tk_try="tcl8.3 tcl8.2 tcl8.1 tcl8.0"
     for my_dir in $my_inc_dirs; do
         if test -z "$TCLINCDIR" && test -d $my_dir; then
             if test -z "$TCLINCDIR" && test -f "$my_dir/tcl.h"; then
                 grep_cmd="grep TCL_VERSION ${my_dir}/tcl.h"
                 tcltk_ver=`$grep_cmd | sed -e 's/^\(.*\)\"\(.*\)\"$/\2/'`
-                TCLINCDIR="-I${my_dir}"
+		TCLINCDIR="-I${my_dir}"
             fi
             for dir in $tk_try; do
                 if test -z "$TCLINCDIR" && test -d "$my_dir/$dir" && test -f "$my_dir/$dir/tcl.h"; then
@@ -3780,13 +3799,20 @@
 if test -z "$TCLINCDIR" ; then
     echo "configure: warning: *** Did not find tcl.h, maybe okay..." 1>&2
 fi
+if test "x$TCLINCDIR" == "x-I/usr/include"; then
+    TCLINCDIR=
+fi
 
 
 TKINCDIR=
-if test $tkincdir ; then
+TKINCOK=
+if test -n "$tkincdir"; then
     for dir in $tkincdir; do
         if test -d "${dir}"; then
-            TKINCDIR="$TKINCDIR -I${dir}"
+	    TKINCOK=1
+	    if test x/usr/include != "x$dir"; then
+		TKINCDIR="$TKINCDIR -I${dir}"
+	    fi
             if test -f "${dir}/tk.h"; then
                 grep_cmd="grep TK_VERSION ${dir}/tk.h"
                 tcltk_ver=`$grep_cmd | sed -e 's/^\(.*\)\"\(.*\)\"$/\2/'`
@@ -3796,19 +3822,21 @@
         fi
     done
     echo $ac_n "checking Tk include dirs""... $ac_c" 1>&6
-echo "configure:3800: checking Tk include dirs" >&5
+echo "configure:3826: checking Tk include dirs" >&5
     echo "$ac_t""$TKINCDIR" 1>&6
 fi
-if test -z "$TKINCDIR" ; then
+if test -z "$TKINCOK" ; then
     echo $ac_n "checking Tk include dirs""... $ac_c" 1>&6
-echo "configure:3805: checking Tk include dirs" >&5
+echo "configure:3831: checking Tk include dirs" >&5
     tk_try="tk8.3 tk8.2 tk8.1 tk8.0"
     for my_dir in $my_inc_dirs; do
         if test -z "$TKINCDIR" && test -d $my_dir; then
             if test -z "$TKINCDIR" && test -f "$my_dir/tk.h"; then
                 grep_cmd="grep TK_VERSION ${my_dir}/tk.h"
                 tcltk_ver=`$grep_cmd | sed -e 's/^\(.*\)\"\(.*\)\"$/\2/'`
-                TKINCDIR="-I${my_dir}"
+		TKINCDIR="-I${my_dir}"
+		TKINCOK=1
+		break
             fi
             for dir in $tk_try; do
                 if test -z "$TKINCDIR" && test -d "$my_dir/$dir" && test -f "$my_dir/$dir/tk.h"; then
@@ -3822,9 +3850,12 @@
     echo "$ac_t""$TKINCDIR" 1>&6
 fi
 
-if test -z "$TKINCDIR" ; then
+if test -z "$TKINCOK" ; then
     echo "configure: warning: *** Did not find tk.h, maybe okay..." 1>&2
 fi
+if test "x-I/usr/include" == "x$TKINCDIR"; then
+    TKINCDIR=
+fi
 
 
 # FreeBSD and CygWin don't have a "dot" between major/minor version number
@@ -3857,13 +3888,13 @@
         fi
     done
     echo $ac_n "checking additional Tcl and Tk library dirs""... $ac_c" 1>&6
-echo "configure:3861: checking additional Tcl and Tk library dirs" >&5
+echo "configure:3892: checking additional Tcl and Tk library dirs" >&5
     echo "$ac_t""$TCLTKLIBPATH" 1>&6
 fi
 
 if test -z "$TCLTKLIBPATH"; then
     echo $ac_n "checking Tcl/Tk library dirs""... $ac_c" 1>&6
-echo "configure:3867: checking Tcl/Tk library dirs" >&5
+echo "configure:3898: checking Tcl/Tk library dirs" >&5
     for dir in $my_lib_dirs; do
         if test -z "$TCLTKLIBPATH" && test -d "$dir" && ((test -f "$dir/libtcl$tcltk_ver.a" && test -f "$dir/libtk$tcltk_ver.a") || (test -f "$dir/libtcl$tcltk_ver.so" && test -f "$dir/libtk$tcltk_ver.so")) ; then
             TCLTKLIBPATH="-L$dir"
@@ -3881,7 +3912,7 @@
     ac_save_ldflags="$LDFLAGS"
     LDFLAGS="$LDFLAGS $TCLTKLIBPATH $X_LIBS -lXt -ltcl$tcltk_ver"
     echo $ac_n "checking for Tk_MainWindow in -l"tk$tcltk_ver"""... $ac_c" 1>&6
-echo "configure:3885: checking for Tk_MainWindow in -l"tk$tcltk_ver"" >&5
+echo "configure:3916: checking for Tk_MainWindow in -l"tk$tcltk_ver"" >&5
 ac_lib_var=`echo "tk$tcltk_ver"'_'Tk_MainWindow | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -3889,7 +3920,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-l"tk$tcltk_ver"  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 3893 "configure"
+#line 3924 "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
@@ -3900,7 +3931,7 @@
 Tk_MainWindow()
 ; return 0; }
 EOF
-if { (eval echo configure:3904: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3935: \"$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
@@ -3941,7 +3972,7 @@
 	"" | y | ye | yes)
 	    SYSV=-DSYSV
 	    echo $ac_n "checking for SYSV""... $ac_c" 1>&6
-echo "configure:3945: checking for SYSV" >&5
+echo "configure:3976: checking for SYSV" >&5
 	    echo "$ac_t""$SYSV" 1>&6
 	  ;;
 	n | no)
@@ -3965,7 +3996,7 @@
 	"" | y | ye | yes)
 	    USE_TERMIO=-DUSE_TERMIO
 	    echo $ac_n "checking for USE_TERMIO""... $ac_c" 1>&6
-echo "configure:3969: checking for USE_TERMIO" >&5
+echo "configure:4000: checking for USE_TERMIO" >&5
 	    echo "$ac_t""$USE_TERMIO" 1>&6
 	  ;;
 	n | no)
@@ -4083,10 +4114,12 @@
 	
 if test "$pg_includes"; then
     echo $ac_n "checking libpq-fe.h""... $ac_c" 1>&6
-echo "configure:4087: checking libpq-fe.h" >&5
+echo "configure:4118: checking libpq-fe.h" >&5
     for dir in $pg_includes; do
         if test -d "$dir" && test -f "$dir/libpq-fe.h"; then
-            PQINCPATH="$PQINCPATH -I$dir"
+	    if test "x$dir" != "x/usr/include"; then
+		PQINCPATH="$PQINCPATH -I$dir"
+	    fi
         fi
     done
     echo "$ac_t""$PQINCPATH" 1>&6
@@ -4094,7 +4127,7 @@
 
 if test "$pg_libs"; then
     echo $ac_n "checking libpq path""... $ac_c" 1>&6
-echo "configure:4098: checking libpq path" >&5
+echo "configure:4131: checking libpq path" >&5
     for dir in $pg_libs; do
         if test -d "$dir"; then
             PQLIBPATH="$PQLIBPATH -L$dir"
@@ -4108,22 +4141,25 @@
     if test -z "$PQINCPATH"; then
         my_pginc_path="/usr/include /usr/include/pgsql /usr/include/postgresql /usr/local/include /usr/local/pgsql/include /opt/pgsql/include"
         echo $ac_n "checking libpq-fe.h""... $ac_c" 1>&6
-echo "configure:4112: checking libpq-fe.h" >&5
+echo "configure:4145: checking libpq-fe.h" >&5
         for dir in $my_pginc_path; do
             if test -d "$dir" && test -f "$dir/libpq-fe.h"; then
-                PQINCPATH="$PQINCPATH -I$dir"
+	        if test "$dir" != "/usr/include"; then
+		   PQINCPATH="$PQINCPATH -I$dir"
+		fi
+		PQINCOK=1
 		break
             fi
         done
         echo "$ac_t""$PQINCPATH" 1>&6
-        if test -z "$PQINCPATH"; then
+        if test -z "$PQINCOK"; then
             echo "configure: warning: *** libpq-fe.h not found, but needed for PostgreSQL support" 1>&2
         fi
     fi
     if test -z "$PQLIBPATH"; then
     	my_pglib_path="/usr/lib /usr/local/lib /usr/local/pgsql/lib /usr/lib/pgsql /usr/lib/postgres /opt/pgsql/lib"
         echo $ac_n "checking libpq paths""... $ac_c" 1>&6
-echo "configure:4127: checking libpq paths" >&5
+echo "configure:4163: checking libpq paths" >&5
         for dir in $my_pglib_path; do
             if test -d "$dir" && ( test -f "$dir/libpq.a" || test -f "$dir/libpq.so" ) ; then
             	PQLIBPATH="$PQLIBPATH -L$dir"
@@ -4138,7 +4174,7 @@
     ac_save_ldflags=${LDFLAGS}
     LDFLAGS="$LDFLAGS $PQLIBPATH"
     echo $ac_n "checking for PQcmdTuples in -lpq""... $ac_c" 1>&6
-echo "configure:4142: checking for PQcmdTuples in -lpq" >&5
+echo "configure:4178: checking for PQcmdTuples in -lpq" >&5
 ac_lib_var=`echo pq'_'PQcmdTuples | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -4146,7 +4182,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lpq  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 4150 "configure"
+#line 4186 "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
@@ -4157,7 +4193,7 @@
 PQcmdTuples()
 ; return 0; }
 EOF
-if { (eval echo configure:4161: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4197: \"$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
@@ -4271,13 +4307,17 @@
 fi
 if test -n "$opengl_includes"; then
     echo $ac_n "checking GL/gl.h and GL/GLwMDrawA.h""... $ac_c" 1>&6
-echo "configure:4275: checking GL/gl.h and GL/GLwMDrawA.h" >&5
+echo "configure:4311: checking GL/gl.h and GL/GLwMDrawA.h" >&5
     for dir in $opengl_includes; do
-        if test -d "$dir" && test -f "$dir/GL/gl.h"; then
-            OPENGLINC="$OPENGLINC -I$dir"
+        if test -d "$dir" -a -f "$dir/GL/gl.h"; then
+            OPENGLINC="-I$dir"
+	    break
         fi
-        if test -d "$dir" && test -f "$dir/GL/GLwMDrawA.h"; then
-            OPENGLwINC="$OPENGLwINC -I$dir"
+    done
+    for dir in $opengl_includes; do
+        if test -d "$dir" -a -f "$dir/GL/GLwMDrawA.h"; then
+            OPENGLwINC="-I$dir"
+	    break
         fi
     done
     if test -z "$OPENGLINC"; then
@@ -4314,7 +4354,7 @@
     ac_save_ldflags="$LDFLAGS"
     LDFLAGS="$LDFLAGS $MATHLIB $OPENGLLIB"
     echo $ac_n "checking for glBegin in -lGL""... $ac_c" 1>&6
-echo "configure:4318: checking for glBegin in -lGL" >&5
+echo "configure:4358: checking for glBegin in -lGL" >&5
 ac_lib_var=`echo GL'_'glBegin | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -4322,7 +4362,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lGL  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 4326 "configure"
+#line 4366 "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
@@ -4333,7 +4373,7 @@
 glBegin()
 ; return 0; }
 EOF
-if { (eval echo configure:4337: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4377: \"$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
@@ -4358,7 +4398,7 @@
     ac_save_ldflags="$LDFLAGS"
     LDFLAGS="$LDFLAGS $MATHLIB $OPENGLLIB"
     echo $ac_n "checking for gluBeginCurve in -lGLU""... $ac_c" 1>&6
-echo "configure:4362: checking for gluBeginCurve in -lGLU" >&5
+echo "configure:4402: checking for gluBeginCurve in -lGLU" >&5
 ac_lib_var=`echo GLU'_'gluBeginCurve | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -4366,7 +4406,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lGLU  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 4370 "configure"
+#line 4410 "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
@@ -4377,7 +4417,7 @@
 gluBeginCurve()
 ; return 0; }
 EOF
-if { (eval echo configure:4381: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4421: \"$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
@@ -4402,7 +4442,7 @@
     ac_save_ldflags="$LDFLAGS"
     LDFLAGS="$LDFLAGS $MATHLIB $OPENGLLIB $OPENGLULIB $X_LIBS -lXt -lXm"
     echo $ac_n "checking for GLwDrawingAreaMakeCurrent in -lGLw""... $ac_c" 1>&6
-echo "configure:4406: checking for GLwDrawingAreaMakeCurrent in -lGLw" >&5
+echo "configure:4446: checking for GLwDrawingAreaMakeCurrent in -lGLw" >&5
 ac_lib_var=`echo GLw'_'GLwDrawingAreaMakeCurrent | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -4410,7 +4450,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lGLw  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 4414 "configure"
+#line 4454 "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
@@ -4421,7 +4461,7 @@
 GLwDrawingAreaMakeCurrent()
 ; return 0; }
 EOF
-if { (eval echo configure:4425: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4465: \"$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
@@ -4442,7 +4482,7 @@
 fi
 
     echo $ac_n "checking for GLwCreateMDrawingArea in -lGLwM""... $ac_c" 1>&6
-echo "configure:4446: checking for GLwCreateMDrawingArea in -lGLwM" >&5
+echo "configure:4486: checking for GLwCreateMDrawingArea in -lGLwM" >&5
 ac_lib_var=`echo GLwM'_'GLwCreateMDrawingArea | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -4450,7 +4490,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lGLwM  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 4454 "configure"
+#line 4494 "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
@@ -4461,7 +4501,7 @@
 GLwCreateMDrawingArea()
 ; return 0; }
 EOF
-if { (eval echo configure:4465: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4505: \"$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
@@ -4484,6 +4524,13 @@
     LDFLAGS=${ac_save_ldflags}
 fi
 
+if test "x$OPENGLINC" == "x-I/usr/include"; then
+    OPENGLINC=
+fi
+if test "x$OPENGLwINC" == "x-I/usr/include"; then
+    OPENGLwINC=
+fi
+
 
 
 
@@ -4532,7 +4579,9 @@
 else
     for dir in $my_inc_dirs; do
         if test -d "$dir" && test -f "$dir/sql.h"; then
-            ODBCINC="$ODBCINC -I$dir"
+	    if test "$dir" != "/usr/include"; then
+		ODBCINC="$ODBCINC -I$dir"
+	    fi
 	    break
 	elif test -d "$dir/odbc" && test -f "$dir/odbc/sql.h"; then
             ODBCINC="$ODBCINC -I$dir/odbc"
@@ -4545,17 +4594,17 @@
 CPPFLAGS="$CPPFLAGS $ODBCINC"
 ac_safe=`echo "sql.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for sql.h""... $ac_c" 1>&6
-echo "configure:4549: checking for sql.h" >&5
+echo "configure:4598: checking for sql.h" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 4554 "configure"
+#line 4603 "configure"
 #include "confdefs.h"
 #include <sql.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:4559: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:4608: \"$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*
@@ -4581,7 +4630,7 @@
 
 
 echo $ac_n "checking for location of odbc lib""... $ac_c" 1>&6
-echo "configure:4585: checking for location of odbc lib" >&5
+echo "configure:4634: checking for location of odbc lib" >&5
 if test "$odbc_libs"; then
     for dir in $odbc_libs; do
         if test -d "$dir" && test -f "$dir/sql.h"; then
@@ -4650,7 +4699,9 @@
 else
     for dir in $my_inc_dirs; do
         if test -d "$dir" && test -f "$dir/jpeglib.h"; then
-            JPEGINCPATH="$JPEGINCPATH -I$dir"
+	    if test "$dir" != "/usr/include"; then
+		JPEGINCPATH="$JPEGINCPATH -I$dir"
+	    fi
 	    break
         fi
     done
@@ -4679,17 +4730,17 @@
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:4683: checking for $ac_hdr" >&5
+echo "configure:4734: checking for $ac_hdr" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 4688 "configure"
+#line 4739 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:4693: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:4744: \"$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*
@@ -4720,7 +4771,7 @@
 ac_save_ldflags="$LDFLAGS"
 LDFLAGS="$LDFLAGS $JPEGLIBPATH"
 echo $ac_n "checking for jpeg_start_compress in -ljpeg""... $ac_c" 1>&6
-echo "configure:4724: checking for jpeg_start_compress in -ljpeg" >&5
+echo "configure:4775: checking for jpeg_start_compress in -ljpeg" >&5
 ac_lib_var=`echo jpeg'_'jpeg_start_compress | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -4728,7 +4779,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-ljpeg  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 4732 "configure"
+#line 4783 "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
@@ -4739,7 +4790,7 @@
 jpeg_start_compress()
 ; return 0; }
 EOF
-if { (eval echo configure:4743: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4794: \"$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
@@ -4816,7 +4867,7 @@
 fi
 
 echo $ac_n "checking for XDriver""... $ac_c" 1>&6
-echo "configure:4820: checking for XDriver" >&5
+echo "configure:4871: checking for XDriver" >&5
 echo "$ac_t""$XDRIVER" 1>&6
 
 
@@ -4987,8 +5038,8 @@
 s%@MATHLIB@%$MATHLIB%g
 s%@BINDIR@%$BINDIR%g
 s%@DLLIB@%$DLLIB%g
-s%@ZLIBINCPATH@%$ZLIBINCPATH%g
 s%@ZLIBLIBPATH@%$ZLIBLIBPATH%g
+s%@ZLIBINCPATH@%$ZLIBINCPATH%g
 s%@ZLIB@%$ZLIB%g
 s%@TIFF_INCLUDE_DIRS@%$TIFF_INCLUDE_DIRS%g
 s%@TIFF_LIBRARY_DIRS@%$TIFF_LIBRARY_DIRS%g
Index: configure.in
===================================================================
RCS file: /home/grass/grassrepository/grass51/configure.in,v
retrieving revision 1.3
diff -u -r1.3 configure.in
--- configure.in	6 May 2002 15:57:16 -0000	1.3
+++ configure.in	10 Jul 2002 13:28:07 -0000
@@ -77,7 +77,9 @@
 if test "$INC_DIRS"; then
     for dir in $INC_DIRS; do
         if test -d "$dir"; then
-            INCLUDE_DIRS="$INCLUDE_DIRS -I$dir"
+	    if test "x/usr/include" != "x$dir"; then
+		INCLUDE_DIRS="$INCLUDE_DIRS -I$dir"
+	    fi
         else
             AC_MSG_WARN([*** Include directory $dir does not exist.])
         fi
@@ -258,7 +260,10 @@
     for dir in $zlib_inc_dirs; do
 #        if test -d "$dir" && test -f "$dir/zlib.h"; then
         if test -d "$dir"; then
-            ZLIBINCPATH="$ZLIBINCPATH -I${dir}"
+	    if test "x/usr/include" != "x$dir"; then
+		ZLIBINCPATH="$ZLIBINCPATH -I${dir}"
+	    fi
+	    ZLIBINCOK=1
         else
             AC_MSG_WARN([*** zlib includes directory $dir does not exist.])
         fi
@@ -266,15 +271,20 @@
 else
     for dir in $my_inc_dirs; do
         if test -d "$dir" && test -f "$dir/zlib.h"; then
-            ZLIBINCPATH="$ZLIBINCPATH -I$dir"
+	    if test "x/usr/include" != "x$dir"; then
+		ZLIBINCPATH="-I$dir"
+	    fi
+	    ZLIBINCOK=1
 	    break
         fi
     done
 fi
 
 
+if test "x$ZLIBINCPATH" == "x-I/usr/include"; then
+    ZLIBINCPATH=
+fi
 AC_MSG_RESULT($ZLIBINCPATH)
-AC_SUBST(ZLIBINCPATH)
 
 ac_save_cppflags="$CPPFLAGS"
 CPPFLAGS="$CPPFLAGS $ZLIBINCPATH"
@@ -317,10 +327,12 @@
 AC_MSG_RESULT($ZLIBLIBPATH)
 AC_SUBST(ZLIBLIBPATH)
 
-if test -z "$ZLIBINCPATH" || test -z "$ZLIBLIBPATH" ; then
+if test -z "$ZLIBINCOK" || test -z "$ZLIBLIBPATH" ; then
     AC_MSG_ERROR([*** Could not find zlib library. This lib is required.])
 fi
 
+AC_SUBST(ZLIBINCPATH)
+
 
 if test -z "${ZLIB}"; then
     AC_CHECK_LIB(z, deflate, ZLIB=-lz)
@@ -346,7 +358,7 @@
 if test "$tiff_inc_dirs"; then
     for dir in $tiff_inc_dirs; do
         if test -d "$dir"; then
-            TIFF_INCLUDE_DIRS="$TIFF_INCLUDE_DIRS -I$dir"
+	    TIFF_INCLUDE_DIRS="-I$dir"
         else
             AC_MSG_WARN([*** TIFF include directory $dir does not exist.])
         fi
@@ -359,15 +371,19 @@
     AC_MSG_CHECKING(TIFF include dirs)
     for dir in $my_inc_dirs; do
         if test -z "$TIFF_INCLUDE_DIRS" && test -d "$dir" && test -f "$dir/tiffio.h"; then
-            TIFF_INCLUDE_DIRS="-I$dir"
+	    TIFF_INCLUDE_DIRS="-I$dir"
+	    TIFFIOH_OK=1
 	    break
         fi
     done
     AC_MSG_RESULT($TIFF_INCLUDE_DIRS)
 fi
-if test -z "$TIFF_INCLUDE_DIRS"; then
+if test -z "$TIFFIOH_OK"; then
 	AC_MSG_WARN([*** Could not find 'tiffio.h'.])
 fi
+if test "x$TIFF_INCLUDE_DIRS" == "x-I/usr/include"; then
+    TIFF_INCLUDE_DIRS=
+fi
 AC_SUBST(TIFF_INCLUDE_DIRS)
 
 AC_ARG_WITH(tiff-libs,
@@ -470,10 +486,13 @@
 tcltk_ver=
 
 TCLINCDIR=
+TCLINCLOK=
 if test "$tclincdir" ; then
     for dir in $tclincdir; do
         if test -d "$dir"; then
-            TCLINCDIR="$TCLINCDIR -I${dir}"
+	    if test "x/usr/include" != "x$dir"; then
+		TCLINCDIR="-I${dir}"
+	    fi
             if test -f "$dir/tcl.h"; then
                 grep_cmd="grep TCL_VERSION ${dir}/tcl.h"
                 tcltk_ver=`$grep_cmd | sed -e 's/^\(.*\)\"\(.*\)\"$/\2/'`
@@ -494,7 +513,7 @@
             if test -z "$TCLINCDIR" && test -f "$my_dir/tcl.h"; then
                 grep_cmd="grep TCL_VERSION ${my_dir}/tcl.h"
                 tcltk_ver=`$grep_cmd | sed -e 's/^\(.*\)\"\(.*\)\"$/\2/'`
-                TCLINCDIR="-I${my_dir}"
+		TCLINCDIR="-I${my_dir}"
             fi
             for dir in $tk_try; do
                 if test -z "$TCLINCDIR" && test -d "$my_dir/$dir" && test -f "$my_dir/$dir/tcl.h"; then
@@ -510,13 +529,20 @@
 if test -z "$TCLINCDIR" ; then
     AC_MSG_WARN([*** Did not find tcl.h, maybe okay...])
 fi
+if test "x$TCLINCDIR" == "x-I/usr/include"; then
+    TCLINCDIR=
+fi
 AC_SUBST(TCLINCDIR)
 
 TKINCDIR=
-if test $tkincdir ; then
+TKINCOK=
+if test -n "$tkincdir"; then
     for dir in $tkincdir; do
         if test -d "${dir}"; then
-            TKINCDIR="$TKINCDIR -I${dir}"
+	    TKINCOK=1
+	    if test x/usr/include != "x$dir"; then
+		TKINCDIR="$TKINCDIR -I${dir}"
+	    fi
             if test -f "${dir}/tk.h"; then
                 grep_cmd="grep TK_VERSION ${dir}/tk.h"
                 tcltk_ver=`$grep_cmd | sed -e 's/^\(.*\)\"\(.*\)\"$/\2/'`
@@ -528,7 +554,7 @@
     AC_MSG_CHECKING(Tk include dirs)
     AC_MSG_RESULT($TKINCDIR)
 fi
-if test -z "$TKINCDIR" ; then
+if test -z "$TKINCOK" ; then
     AC_MSG_CHECKING(Tk include dirs)
     tk_try="tk8.3 tk8.2 tk8.1 tk8.0"
     for my_dir in $my_inc_dirs; do
@@ -536,7 +562,9 @@
             if test -z "$TKINCDIR" && test -f "$my_dir/tk.h"; then
                 grep_cmd="grep TK_VERSION ${my_dir}/tk.h"
                 tcltk_ver=`$grep_cmd | sed -e 's/^\(.*\)\"\(.*\)\"$/\2/'`
-                TKINCDIR="-I${my_dir}"
+		TKINCDIR="-I${my_dir}"
+		TKINCOK=1
+		break
             fi
             for dir in $tk_try; do
                 if test -z "$TKINCDIR" && test -d "$my_dir/$dir" && test -f "$my_dir/$dir/tk.h"; then
@@ -550,9 +578,12 @@
     AC_MSG_RESULT($TKINCDIR)
 fi
 
-if test -z "$TKINCDIR" ; then
+if test -z "$TKINCOK" ; then
     AC_MSG_WARN([*** Did not find tk.h, maybe okay...])
 fi
+if test "x-I/usr/include" == "x$TKINCDIR"; then
+    TKINCDIR=
+fi
 AC_SUBST(TKINCDIR)
 
 # FreeBSD and CygWin don't have a "dot" between major/minor version number
@@ -752,7 +783,9 @@
     AC_MSG_CHECKING(libpq-fe.h)
     for dir in $pg_includes; do
         if test -d "$dir" && test -f "$dir/libpq-fe.h"; then
-            PQINCPATH="$PQINCPATH -I$dir"
+	    if test "x$dir" != "x/usr/include"; then
+		PQINCPATH="$PQINCPATH -I$dir"
+	    fi
         fi
     done
     AC_MSG_RESULT($PQINCPATH)
@@ -775,12 +808,15 @@
         AC_MSG_CHECKING(libpq-fe.h)
         for dir in $my_pginc_path; do
             if test -d "$dir" && test -f "$dir/libpq-fe.h"; then
-                PQINCPATH="$PQINCPATH -I$dir"
+	        if test "$dir" != "/usr/include"; then
+		   PQINCPATH="$PQINCPATH -I$dir"
+		fi
+		PQINCOK=1
 		break
             fi
         done
         AC_MSG_RESULT($PQINCPATH)
-        if test -z "$PQINCPATH"; then
+        if test -z "$PQINCOK"; then
             AC_MSG_WARN([*** libpq-fe.h not found, but needed for PostgreSQL support])
         fi
     fi
@@ -881,11 +917,15 @@
 if test -n "$opengl_includes"; then
     AC_MSG_CHECKING(GL/gl.h and GL/GLwMDrawA.h)
     for dir in $opengl_includes; do
-        if test -d "$dir" && test -f "$dir/GL/gl.h"; then
-            OPENGLINC="$OPENGLINC -I$dir"
+        if test -d "$dir" -a -f "$dir/GL/gl.h"; then
+            OPENGLINC="-I$dir"
+	    break
         fi
-        if test -d "$dir" && test -f "$dir/GL/GLwMDrawA.h"; then
-            OPENGLwINC="$OPENGLwINC -I$dir"
+    done
+    for dir in $opengl_includes; do
+        if test -d "$dir" -a -f "$dir/GL/GLwMDrawA.h"; then
+            OPENGLwINC="-I$dir"
+	    break
         fi
     done
     if test -z "$OPENGLINC"; then
@@ -936,6 +976,13 @@
     LDFLAGS=${ac_save_ldflags}
 fi
 
+if test "x$OPENGLINC" == "x-I/usr/include"; then
+    OPENGLINC=
+fi
+if test "x$OPENGLwINC" == "x-I/usr/include"; then
+    OPENGLwINC=
+fi
+
 AC_SUBST(OPENGLINC)
 AC_SUBST(OPENGLwINC)
 AC_SUBST(OPENGLLIB)
@@ -980,7 +1027,9 @@
 else
     for dir in $my_inc_dirs; do
         if test -d "$dir" && test -f "$dir/sql.h"; then
-            ODBCINC="$ODBCINC -I$dir"
+	    if test "$dir" != "/usr/include"; then
+		ODBCINC="$ODBCINC -I$dir"
+	    fi
 	    break
 	elif test -d "$dir/odbc" && test -f "$dir/odbc/sql.h"; then
             ODBCINC="$ODBCINC -I$dir/odbc"
@@ -1059,7 +1108,9 @@
 else
     for dir in $my_inc_dirs; do
         if test -d "$dir" && test -f "$dir/jpeglib.h"; then
-            JPEGINCPATH="$JPEGINCPATH -I$dir"
+	    if test "$dir" != "/usr/include"; then
+		JPEGINCPATH="$JPEGINCPATH -I$dir"
+	    fi
 	    break
         fi
     done
Index: include/config.h.in
===================================================================
RCS file: /home/grass/grassrepository/grass51/include/config.h.in,v
retrieving revision 1.2
diff -u -r1.2 config.h.in
--- include/config.h.in	19 Mar 2002 09:44:09 -0000	1.2
+++ include/config.h.in	10 Jul 2002 13:28:07 -0000
@@ -1,133 +1,109 @@
+/* include/config.h.in.  Generated automatically from configure.in by autoheader.  */
 
-/*
- * config.h.in
- */
-
-#ifndef _config_h
-#define _config_h
-
-#define GDEBUG 1
-
-/* define if standard C headers exist:  headers are
- * stdlib.h, stdarg.h, string.h, and float.h */
-
-/* define if curses.h exists */
-#undef HAVE_CURSES_H
-
-/* define if limits.h exists */
-#undef HAVE_LIMITS_H
-
-/* define if termio.h exists */
-#undef HAVE_TERMIO_H
-
-/* define if termios.h exists */
-#undef HAVE_TERMIOS_H
-
-/* define if unistd.h exists */
-#undef HAVE_UNISTD_H
-
-/* define if values.h exists */
-#undef HAVE_VALUES_H
-
-/* define if zlib.h exists */
-#undef HAVE_ZLIB_H
+/* Define to `int' if <sys/types.h> doesn't define.  */
+#undef gid_t
 
-/* define if sys/ioctl.h exists */
-#undef HAVE_SYS_IOCTL_H
+/* Define to `long' if <sys/types.h> doesn't define.  */
+#undef off_t
 
-/* define if sys/mtio.h exists */
-#undef HAVE_SYS_MTIO_H
+/* Define as the return type of signal handlers (int or void).  */
+#undef RETSIGTYPE
 
-/* define if sys/resource.h exists */
-#undef HAVE_SYS_RESOURCE_H
+/* Define if the `setpgrp' function takes no argument.  */
+#undef SETPGRP_VOID
 
-/* define if sys/time.h exists */
-#undef HAVE_SYS_TIME_H
+/* Define if you have the ANSI C header files.  */
+#undef STDC_HEADERS
 
-/* define if time.h and sys/time.h can be included together */
+/* Define if you can safely include both <sys/time.h> and <time.h>.  */
 #undef TIME_WITH_SYS_TIME
 
-/* define if sys/timeb.h exists */
-#undef HAVE_SYS_TIMEB_H
-
-/* define if sys/types.h exists */
-#undef HAVE_SYS_TYPES_H
-
-/* define if sys/utsname.h exists */
-#undef HAVE_SYS_UTSNAME_H
-
-/* define gid_t type */
-#undef gid_t
-
-/* define off_t type */
-#undef off_t
-
-/* define uid_t type */
+/* Define to `int' if <sys/types.h> doesn't define.  */
 #undef uid_t
 
-/* Define the return type of signal handlers */
-#define RETSIGTYPE int
+/* Define if the X Window System is missing or not being used.  */
+#undef X_DISPLAY_MISSING
 
-/* define curses.h WINDOW structure component */
-#define CURSES_MAXY @CURSES_MAXY@
+#undef CURSES_MAXY
+#undef HAVE_POSTGRES
+#undef HAVE_POSTGRES_H
+#undef HAVE_PQCMDTUPLES
+#undef USE_G_SOCKS
 
-/* define if ftime() exists */
+/* Define if you have the ftime function.  */
 #undef HAVE_FTIME
 
-/* define if gethostname() exists */
+/* Define if you have the gethostname function.  */
 #undef HAVE_GETHOSTNAME
 
-/* define if gettimeofday() exists */
+/* Define if you have the gettimeofday function.  */
 #undef HAVE_GETTIMEOFDAY
 
-/* define if lseek() exists */
+/* Define if you have the lseek function.  */
 #undef HAVE_LSEEK
 
+/* Define if you have the nice function.  */
+#undef HAVE_NICE
 
-/* define if time() exists */
-#undef HAVE_TIME
-
-/* define if uname() exists */
-#undef HAVE_UNAME
-
-/* define if seteuid() exists */
+/* Define if you have the seteuid function.  */
 #undef HAVE_SETEUID
 
-/* define if setpriority() exists */
+/* Define if you have the setpriority function.  */
 #undef HAVE_SETPRIORITY
 
-/* define if setreuid() exists */
+/* Define if you have the setreuid function.  */
 #undef HAVE_SETREUID
 
-/* define if setruid() exists */
+/* Define if you have the setruid function.  */
 #undef HAVE_SETRUID
 
-/* define if setpgrp() takes no argument */
-#undef SETPGRP_VOID
+/* Define if you have the time function.  */
+#undef HAVE_TIME
 
-/* define if PNG support exists */
-#undef HAVE_PNG
+/* Define if you have the uname function.  */
+#undef HAVE_UNAME
 
-/* define if PQcmdTuples in lpq */
-#undef HAVE_PQCMDTUPLES
+/* Define if you have the <curses.h> header file.  */
+#undef HAVE_CURSES_H
 
-/* define if jpeglib.h exists */
+/* Define if you have the <jpeglib.h> header file.  */
 #undef HAVE_JPEGLIB_H
 
-/* define if postgres exists */
-#undef HAVE_POSTGRES
-#undef HAVE_POSTGRES_H
+/* Define if you have the <limits.h> header file.  */
+#undef HAVE_LIMITS_H
 
-/* Whether or not we are using G_socks for display communications */
-#undef USE_G_SOCKS
+/* Define if you have the <sys/ioctl.h> header file.  */
+#undef HAVE_SYS_IOCTL_H
+
+/* Define if you have the <sys/mtio.h> header file.  */
+#undef HAVE_SYS_MTIO_H
 
-/*
- * configuration information solely dependent on the above
- * nothing below this point should need changing
- */
-
-#if defined(HAVE_VALUES_H) && !defined(HAVE_LIMITS_H)
-#define INT_MIN -MAXINT
-#endif
+/* Define if you have the <sys/resource.h> header file.  */
+#undef HAVE_SYS_RESOURCE_H
+
+/* Define if you have the <sys/time.h> header file.  */
+#undef HAVE_SYS_TIME_H
+
+/* Define if you have the <sys/timeb.h> header file.  */
+#undef HAVE_SYS_TIMEB_H
+
+/* Define if you have the <sys/types.h> header file.  */
+#undef HAVE_SYS_TYPES_H
+
+/* Define if you have the <sys/utsname.h> header file.  */
+#undef HAVE_SYS_UTSNAME_H
 
-#endif /* _config_h */
+/* Define if you have the <termio.h> header file.  */
+#undef HAVE_TERMIO_H
+
+/* Define if you have the <termios.h> header file.  */
+#undef HAVE_TERMIOS_H
+
+/* Define if you have the <unistd.h> header file.  */
+#undef HAVE_UNISTD_H
+
+/* Define if you have the <values.h> header file.  */
+#undef HAVE_VALUES_H
+
+/* Define if you have the <zlib.h> header file.  */
+#undef HAVE_ZLIB_H
Index: include/Make/Platform.make.in
===================================================================
RCS file: /home/grass/grassrepository/grass51/include/Make/Platform.make.in,v
retrieving revision 1.1
diff -u -r1.1 Platform.make.in
--- include/Make/Platform.make.in	6 Jan 2002 17:38:13 -0000	1.1
+++ include/Make/Platform.make.in	10 Jul 2002 13:28:08 -0000
@@ -84,8 +84,8 @@
 ODBCLIB             = @ODBCLIB@
 
 #Image formats:
-PNGINC              = -I/usr/X11R6/include/ -I/usr/include/gr -I/usr/local/include -I/usr/include
-PNGLIB              = -L/usr/local/lib -L/usr/X11R6/lib -L/usr/lib
+PNGINC              = #-I/usr/X11R6/include/ -I/usr/include/gr -I/usr/local/include
+PNGLIB              = #-L/usr/local/lib -L/usr/X11R6/lib -L/usr/lib
 
 JPEGINCPATH         = @JPEGINCPATH@
 JPEGLIBPATH         = @JPEGLIBPATH@
Index: lib/proj/Makefile
===================================================================
RCS file: /home/grass/grassrepository/grass51/lib/proj/Makefile,v
retrieving revision 1.3
diff -u -r1.3 Makefile
--- lib/proj/Makefile	4 Jun 2002 13:37:44 -0000	1.3
+++ lib/proj/Makefile	10 Jul 2002 13:28:08 -0000
@@ -11,7 +11,7 @@
 conic = \
 	PJ_aea.o PJ_bipc.o PJ_bonne.o PJ_eqdc.o \
 	PJ_imw_p.o PJ_lcc.o PJ_mpoly.o PJ_poly.o \
-	PJ_rpoly.o PJ_sconics.o PJ_krovak.o PJ_krovakgis.o
+	PJ_rpoly.o PJ_sconics.o # PJ_krovak.o PJ_krovakgis.o
 
 cylinder = \
 	PJ_cass.o PJ_cc.o PJ_cea.o PJ_eqc.o \
