[GRASS-SVN] r57323 - sandbox/martinl
svn_grass at osgeo.org
svn_grass at osgeo.org
Mon Jul 29 08:55:22 PDT 2013
Author: martinl
Date: 2013-07-29 08:55:22 -0700 (Mon, 29 Jul 2013)
New Revision: 57323
Added:
sandbox/martinl/wingrass_643.diff
Log:
wingrass patch for 643
Added: sandbox/martinl/wingrass_643.diff
===================================================================
--- sandbox/martinl/wingrass_643.diff (rev 0)
+++ sandbox/martinl/wingrass_643.diff 2013-07-29 15:55:22 UTC (rev 57323)
@@ -0,0 +1,6353 @@
+Index: configure
+===================================================================
+--- configure (revision 57322)
++++ configure (working copy)
+@@ -1201,9 +1201,14 @@
+ fi
+
+
++if test "$MINGW32" = yes ; then
++ winpwd="$pwd -W"
++else
++ winpwd="$pwd"
++fi
+
+ echo $ac_n "checking for source directory""... $ac_c" 1>&6
+-echo "configure:1207: checking for source directory" >&5
++echo "configure:1212: checking for source directory" >&5
+
+ if test -z "$srcdir" ; then
+ SRCDIR=`$pwd`
+@@ -1214,9 +1219,10 @@
+ echo "$ac_t"""$SRCDIR"" 1>&6
+
+ echo $ac_n "checking for build directory""... $ac_c" 1>&6
+-echo "configure:1218: checking for build directory" >&5
++echo "configure:1223: checking for build directory" >&5
+
+ DSTDIR=`$pwd`
++WINDSTDIR=`$winpwd`
+
+ echo "$ac_t"""$DSTDIR"" 1>&6
+
+@@ -1258,7 +1264,7 @@
+
+ # Set GISBASE and GRASS_BIN
+
+-GISBASE="${DSTDIR}/dist.${ARCH}"
++GISBASE="${WINDSTDIR}/dist.${ARCH}"
+ GRASS_BIN="${DSTDIR}/bin.${ARCH}"
+
+
+@@ -1281,7 +1287,7 @@
+ # Extract the first word of "svnversion", so it can be a program name with args.
+ set dummy svnversion; ac_word=$2
+ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:1285: checking for $ac_word" >&5
++echo "configure:1291: checking for $ac_word" >&5
+
+ case "$SVN_VERSION" in
+ /*)
+@@ -1340,7 +1346,7 @@
+
+
+ echo $ac_n "checking for MacOSX App""... $ac_c" 1>&6
+-echo "configure:1344: checking for MacOSX App" >&5
++echo "configure:1350: checking for MacOSX App" >&5
+ case "$enable_macosx_app" in
+ yes) MACOSX_APP=1 ;;
+ no) MACOSX_APP= ;;
+@@ -1352,7 +1358,7 @@
+ # Check for MacOSX archs
+
+ echo $ac_n "checking for MacOSX architectures""... $ac_c" 1>&6
+-echo "configure:1356: checking for MacOSX architectures" >&5
++echo "configure:1362: checking for MacOSX architectures" >&5
+
+ MACOSX_ARCHS=
+
+@@ -1381,7 +1387,7 @@
+ # Check for MacOSX SDK
+
+ echo $ac_n "checking for MacOSX SDK""... $ac_c" 1>&6
+-echo "configure:1385: checking for MacOSX SDK" >&5
++echo "configure:1391: checking for MacOSX SDK" >&5
+
+ MACOSX_SDK=
+
+@@ -1391,7 +1397,7 @@
+
+ ac_safe=`echo "$with_macosx_sdk/SDKSettings.plist" | sed 'y%./+-%__p_%'`
+ echo $ac_n "checking for $with_macosx_sdk/SDKSettings.plist""... $ac_c" 1>&6
+-echo "configure:1395: checking for $with_macosx_sdk/SDKSettings.plist" >&5
++echo "configure:1401: checking for $with_macosx_sdk/SDKSettings.plist" >&5
+
+ if test "$cross_compiling" = yes; then
+ { echo "configure: error: Cannot check for file existence when cross compiling" 1>&2; exit 1; }
+@@ -1435,7 +1441,7 @@
+
+
+ echo $ac_n "checking how to build libraries""... $ac_c" 1>&6
+-echo "configure:1439: checking how to build libraries" >&5
++echo "configure:1445: 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"
+@@ -1478,7 +1484,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:1482: checking for $ac_word" >&5
++echo "configure:1488: checking for $ac_word" >&5
+
+ if test -n "$RANLIB"; then
+ ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
+@@ -1503,7 +1509,7 @@
+ fi
+
+ echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6
+-echo "configure:1507: checking how to run the C preprocessor" >&5
++echo "configure:1513: checking how to run the C preprocessor" >&5
+ # On Suns, sometimes $CPP names a directory.
+ if test -n "$CPP" && test -d "$CPP"; then
+ CPP=
+@@ -1516,13 +1522,13 @@
+ # On the NeXT, cc -E runs the code through the compiler's parser,
+ # not just through cpp.
+ cat > conftest.$ac_ext <<EOF
+-#line 1520 "configure"
++#line 1526 "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:1526: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:1532: \"$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
+ :
+@@ -1533,13 +1539,13 @@
+ rm -rf conftest*
+ CPP="${CC-cc} -E -traditional-cpp"
+ cat > conftest.$ac_ext <<EOF
+-#line 1537 "configure"
++#line 1543 "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:1543: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:1549: \"$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
+ :
+@@ -1550,13 +1556,13 @@
+ rm -rf conftest*
+ CPP="${CC-cc} -nologo -E"
+ cat > conftest.$ac_ext <<EOF
+-#line 1554 "configure"
++#line 1560 "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:1560: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:1566: \"$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
+ :
+@@ -1584,7 +1590,7 @@
+ # Step 0.a: Enable 64 bit support?
+
+ echo $ac_n "checking if 64bit support is requested""... $ac_c" 1>&6
+-echo "configure:1588: checking if 64bit support is requested" >&5
++echo "configure:1594: 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"
+@@ -1604,7 +1610,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:1608: checking if 64bit Sparc VIS support is requested" >&5
++echo "configure:1614: 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"
+@@ -1628,7 +1634,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:1632: checking system version (for dynamic loading)" >&5
++echo "configure:1638: 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
+@@ -1654,13 +1660,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:1658: checking for dlopen in -ldl" >&5
++echo "configure:1664: 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 1664 "configure"
++#line 1670 "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
+@@ -1671,7 +1677,7 @@
+ dlopen()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:1675: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:1681: \"$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
+@@ -1718,7 +1724,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:1722: checking for $ac_word" >&5
++echo "configure:1728: checking for $ac_word" >&5
+
+ if test -n "$AR"; then
+ ac_cv_prog_AR="$AR" # Let the user override the test.
+@@ -1847,13 +1853,13 @@
+ # known GMT value.
+
+ echo $ac_n "checking for gettimeofday in -lbsd""... $ac_c" 1>&6
+-echo "configure:1851: checking for gettimeofday in -lbsd" >&5
++echo "configure:1857: 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 1857 "configure"
++#line 1863 "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
+@@ -1864,7 +1870,7 @@
+ gettimeofday()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:1868: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:1874: \"$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
+@@ -1905,13 +1911,13 @@
+ # is always linked to, for compatibility.
+ #-----------------------------------------------------------
+ echo $ac_n "checking for inet_ntoa in -lbind""... $ac_c" 1>&6
+-echo "configure:1909: checking for inet_ntoa in -lbind" >&5
++echo "configure:1915: 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 1915 "configure"
++#line 1921 "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
+@@ -1922,7 +1928,7 @@
+ inet_ntoa()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:1926: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:1932: \"$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
+@@ -1983,13 +1989,13 @@
+
+ SHLIB_SUFFIX=".sl"
+ echo $ac_n "checking for shl_load in -ldld""... $ac_c" 1>&6
+-echo "configure:1987: checking for shl_load in -ldld" >&5
++echo "configure:1993: 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 1993 "configure"
++#line 1999 "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
+@@ -2000,7 +2006,7 @@
+ shl_load()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:2004: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:2010: \"$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
+@@ -2065,13 +2071,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:2069: checking for shl_load in -ldld" >&5
++echo "configure:2075: 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 2075 "configure"
++#line 2081 "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
+@@ -2082,7 +2088,7 @@
+ shl_load()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:2086: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:2092: \"$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
+@@ -2204,15 +2210,15 @@
+ else
+ ac_safe=`echo "dld.h" | sed 'y%./+-%__p_%'`
+ echo $ac_n "checking for dld.h""... $ac_c" 1>&6
+-echo "configure:2208: checking for dld.h" >&5
++echo "configure:2214: checking for dld.h" >&5
+
+ cat > conftest.$ac_ext <<EOF
+-#line 2211 "configure"
++#line 2217 "configure"
+ #include "confdefs.h"
+ #include <dld.h>
+ EOF
+ ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+-{ (eval echo configure:2216: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:2222: \"$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*
+@@ -2272,15 +2278,15 @@
+ else
+ ac_safe=`echo "dld.h" | sed 'y%./+-%__p_%'`
+ echo $ac_n "checking for dld.h""... $ac_c" 1>&6
+-echo "configure:2276: checking for dld.h" >&5
++echo "configure:2282: checking for dld.h" >&5
+
+ cat > conftest.$ac_ext <<EOF
+-#line 2279 "configure"
++#line 2285 "configure"
+ #include "confdefs.h"
+ #include <dld.h>
+ EOF
+ ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+-{ (eval echo configure:2284: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:2290: \"$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*
+@@ -2377,9 +2383,9 @@
+ CC_SEARCH_FLAGS=""
+ LD_SEARCH_FLAGS=""
+ echo $ac_n "checking for ELF""... $ac_c" 1>&6
+-echo "configure:2381: checking for ELF" >&5
++echo "configure:2387: checking for ELF" >&5
+ cat > conftest.$ac_ext <<EOF
+-#line 2383 "configure"
++#line 2389 "configure"
+ #include "confdefs.h"
+
+ #ifdef __ELF__
+@@ -2409,15 +2415,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:2413: checking for dlfcn.h" >&5
++echo "configure:2419: checking for dlfcn.h" >&5
+
+ cat > conftest.$ac_ext <<EOF
+-#line 2416 "configure"
++#line 2422 "configure"
+ #include "confdefs.h"
+ #include <dlfcn.h>
+ EOF
+ ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+-{ (eval echo configure:2421: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:2427: \"$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*
+@@ -2441,9 +2447,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:2445: checking for ELF" >&5
++echo "configure:2451: checking for ELF" >&5
+ cat > conftest.$ac_ext <<EOF
+-#line 2447 "configure"
++#line 2453 "configure"
+ #include "confdefs.h"
+
+ #ifdef __ELF__
+@@ -2767,17 +2773,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:2771: checking for ld accepts -Bexport flag" >&5
++echo "configure:2777: checking for ld accepts -Bexport flag" >&5
+ LDFLAGS="${LDFLAGS} -Wl,-Bexport"
+ cat > conftest.$ac_ext <<EOF
+-#line 2774 "configure"
++#line 2780 "configure"
+ #include "confdefs.h"
+
+ int main() {
+ int i;
+ ; return 0; }
+ EOF
+-if { (eval echo configure:2781: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:2787: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+ rm -rf conftest*
+ found=yes
+ else
+@@ -3575,7 +3581,7 @@
+ # Done checking fortran
+
+ echo $ac_n "checking for additional include dirs""... $ac_c" 1>&6
+-echo "configure:3579: checking for additional include dirs" >&5
++echo "configure:3585: 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; }
+@@ -3598,7 +3604,7 @@
+ # With libs option
+
+ echo $ac_n "checking for additional library dirs""... $ac_c" 1>&6
+-echo "configure:3602: checking for additional library dirs" >&5
++echo "configure:3608: 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; }
+@@ -3632,7 +3638,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:3636: checking for a BSD compatible install" >&5
++echo "configure:3642: checking for a BSD compatible install" >&5
+ if test -z "$INSTALL"; then
+
+ IFS="${IFS= }"; ac_save_IFS="$IFS"; IFS=":"
+@@ -3685,7 +3691,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:3689: checking for $ac_word" >&5
++echo "configure:3695: checking for $ac_word" >&5
+
+ if test -n "$LEX"; then
+ ac_cv_prog_LEX="$LEX" # Let the user override the test.
+@@ -3716,13 +3722,13 @@
+ *) ac_lib=l ;;
+ esac
+ echo $ac_n "checking for yywrap in -l$ac_lib""... $ac_c" 1>&6
+-echo "configure:3720: checking for yywrap in -l$ac_lib" >&5
++echo "configure:3726: 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 3726 "configure"
++#line 3732 "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
+@@ -3733,7 +3739,7 @@
+ yywrap()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:3737: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:3743: \"$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
+@@ -3758,7 +3764,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:3762: checking for $ac_word" >&5
++echo "configure:3768: checking for $ac_word" >&5
+
+ case "$LEXPATH" in
+ /*)
+@@ -3798,7 +3804,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:3802: checking for $ac_word" >&5
++echo "configure:3808: checking for $ac_word" >&5
+
+ if test -n "$YACC"; then
+ ac_cv_prog_YACC="$YACC" # Let the user override the test.
+@@ -3829,7 +3835,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:3833: checking for $ac_word" >&5
++echo "configure:3839: checking for $ac_word" >&5
+
+ case "$YACCPATH" in
+ /*)
+@@ -3867,7 +3873,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:3871: checking for $ac_word" >&5
++echo "configure:3877: checking for $ac_word" >&5
+
+ if test -n "$RANLIB"; then
+ ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
+@@ -3896,7 +3902,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:3900: checking for $ac_word" >&5
++echo "configure:3906: checking for $ac_word" >&5
+
+ if test -n "$AR"; then
+ ac_cv_prog_AR="$AR" # Let the user override the test.
+@@ -3927,7 +3933,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:3931: checking for $ac_word" >&5
++echo "configure:3937: checking for $ac_word" >&5
+
+ if test -n "$ENV"; then
+ ac_cv_prog_ENV="$ENV" # Let the user override the test.
+@@ -3956,7 +3962,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:3960: checking for $ac_word" >&5
++echo "configure:3966: checking for $ac_word" >&5
+
+ case "$PERL" in
+ /*)
+@@ -3987,10 +3993,10 @@
+ fi
+
+ echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6
+-echo "configure:3991: checking for ANSI C header files" >&5
++echo "configure:3997: checking for ANSI C header files" >&5
+
+ cat > conftest.$ac_ext <<EOF
+-#line 3994 "configure"
++#line 4000 "configure"
+ #include "confdefs.h"
+ #include <stdlib.h>
+ #include <stdarg.h>
+@@ -3998,7 +4004,7 @@
+ #include <float.h>
+ EOF
+ ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+-{ (eval echo configure:4002: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:4008: \"$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*
+@@ -4015,7 +4021,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 4019 "configure"
++#line 4025 "configure"
+ #include "confdefs.h"
+ #include <string.h>
+ EOF
+@@ -4033,7 +4039,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 4037 "configure"
++#line 4043 "configure"
+ #include "confdefs.h"
+ #include <stdlib.h>
+ EOF
+@@ -4054,7 +4060,7 @@
+ :
+ else
+ cat > conftest.$ac_ext <<EOF
+-#line 4058 "configure"
++#line 4064 "configure"
+ #include "confdefs.h"
+ #include <ctype.h>
+ #define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
+@@ -4065,7 +4071,7 @@
+ exit (0); }
+
+ EOF
+-if { (eval echo configure:4069: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:4075: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+ then
+ :
+ else
+@@ -4092,15 +4098,15 @@
+ do
+ ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
+ echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
+-echo "configure:4096: checking for $ac_hdr" >&5
++echo "configure:4102: checking for $ac_hdr" >&5
+
+ cat > conftest.$ac_ext <<EOF
+-#line 4099 "configure"
++#line 4105 "configure"
+ #include "confdefs.h"
+ #include <$ac_hdr>
+ EOF
+ ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+-{ (eval echo configure:4104: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:4110: \"$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*
+@@ -4129,15 +4135,15 @@
+ do
+ ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
+ echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
+-echo "configure:4133: checking for $ac_hdr" >&5
++echo "configure:4139: checking for $ac_hdr" >&5
+
+ cat > conftest.$ac_ext <<EOF
+-#line 4136 "configure"
++#line 4142 "configure"
+ #include "confdefs.h"
+ #include <$ac_hdr>
+ EOF
+ ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+-{ (eval echo configure:4141: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:4147: \"$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*
+@@ -4166,15 +4172,15 @@
+ do
+ ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
+ echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
+-echo "configure:4170: checking for $ac_hdr" >&5
++echo "configure:4176: checking for $ac_hdr" >&5
+
+ cat > conftest.$ac_ext <<EOF
+-#line 4173 "configure"
++#line 4179 "configure"
+ #include "confdefs.h"
+ #include <$ac_hdr>
+ EOF
+ ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+-{ (eval echo configure:4178: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:4184: \"$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*
+@@ -4203,15 +4209,15 @@
+ do
+ ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
+ echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
+-echo "configure:4207: checking for $ac_hdr" >&5
++echo "configure:4213: checking for $ac_hdr" >&5
+
+ cat > conftest.$ac_ext <<EOF
+-#line 4210 "configure"
++#line 4216 "configure"
+ #include "confdefs.h"
+ #include <$ac_hdr>
+ EOF
+ ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+-{ (eval echo configure:4215: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:4221: \"$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*
+@@ -4240,15 +4246,15 @@
+ do
+ ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
+ echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
+-echo "configure:4244: checking for $ac_hdr" >&5
++echo "configure:4250: checking for $ac_hdr" >&5
+
+ cat > conftest.$ac_ext <<EOF
+-#line 4247 "configure"
++#line 4253 "configure"
+ #include "confdefs.h"
+ #include <$ac_hdr>
+ EOF
+ ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+-{ (eval echo configure:4252: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:4258: \"$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*
+@@ -4274,10 +4280,10 @@
+ done
+
+ echo $ac_n "checking whether time.h and sys/time.h may both be included""... $ac_c" 1>&6
+-echo "configure:4278: checking whether time.h and sys/time.h may both be included" >&5
++echo "configure:4284: checking whether time.h and sys/time.h may both be included" >&5
+
+ cat > conftest.$ac_ext <<EOF
+-#line 4281 "configure"
++#line 4287 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ #include <sys/time.h>
+@@ -4286,7 +4292,7 @@
+ struct tm *tp;
+ ; return 0; }
+ EOF
+-if { (eval echo configure:4290: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:4296: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+ rm -rf conftest*
+ ac_cv_header_time=yes
+ else
+@@ -4306,10 +4312,10 @@
+ fi
+
+ echo $ac_n "checking for off_t""... $ac_c" 1>&6
+-echo "configure:4310: checking for off_t" >&5
++echo "configure:4316: checking for off_t" >&5
+
+ cat > conftest.$ac_ext <<EOF
+-#line 4313 "configure"
++#line 4319 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ #if STDC_HEADERS
+@@ -4336,10 +4342,10 @@
+ fi
+
+ echo $ac_n "checking for uid_t in sys/types.h""... $ac_c" 1>&6
+-echo "configure:4340: checking for uid_t in sys/types.h" >&5
++echo "configure:4346: checking for uid_t in sys/types.h" >&5
+
+ cat > conftest.$ac_ext <<EOF
+-#line 4343 "configure"
++#line 4349 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ EOF
+@@ -4367,10 +4373,10 @@
+ fi
+
+ echo $ac_n "checking return type of signal handlers""... $ac_c" 1>&6
+-echo "configure:4371: checking return type of signal handlers" >&5
++echo "configure:4377: checking return type of signal handlers" >&5
+
+ cat > conftest.$ac_ext <<EOF
+-#line 4374 "configure"
++#line 4380 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ #include <signal.h>
+@@ -4387,7 +4393,7 @@
+ int i;
+ ; return 0; }
+ EOF
+-if { (eval echo configure:4391: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:4397: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+ rm -rf conftest*
+ ac_cv_type_signal=void
+ else
+@@ -4405,10 +4411,10 @@
+
+
+ echo $ac_n "checking for Cygwin environment""... $ac_c" 1>&6
+-echo "configure:4409: checking for Cygwin environment" >&5
++echo "configure:4415: checking for Cygwin environment" >&5
+
+ cat > conftest.$ac_ext <<EOF
+-#line 4412 "configure"
++#line 4418 "configure"
+ #include "confdefs.h"
+
+ int main() {
+@@ -4419,7 +4425,7 @@
+ return __CYGWIN__;
+ ; return 0; }
+ EOF
+-if { (eval echo configure:4423: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:4429: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+ rm -rf conftest*
+ ac_cv_cygwin=yes
+ else
+@@ -4437,10 +4443,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:4441: checking for $ac_func" >&5
++echo "configure:4447: checking for $ac_func" >&5
+
+ cat > conftest.$ac_ext <<EOF
+-#line 4444 "configure"
++#line 4450 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+ which can conflict with char $ac_func(); below. */
+@@ -4463,7 +4469,7 @@
+
+ ; return 0; }
+ EOF
+-if { (eval echo configure:4467: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:4473: \"$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
+@@ -4489,10 +4495,10 @@
+ for ac_func in seteuid setpriority setreuid setruid
+ do
+ echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
+-echo "configure:4493: checking for $ac_func" >&5
++echo "configure:4499: checking for $ac_func" >&5
+
+ cat > conftest.$ac_ext <<EOF
+-#line 4496 "configure"
++#line 4502 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+ which can conflict with char $ac_func(); below. */
+@@ -4515,7 +4521,7 @@
+
+ ; return 0; }
+ EOF
+-if { (eval echo configure:4519: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:4525: \"$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
+@@ -4541,10 +4547,10 @@
+ for ac_func in drand48
+ do
+ echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
+-echo "configure:4545: checking for $ac_func" >&5
++echo "configure:4551: checking for $ac_func" >&5
+
+ cat > conftest.$ac_ext <<EOF
+-#line 4548 "configure"
++#line 4554 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+ which can conflict with char $ac_func(); below. */
+@@ -4567,7 +4573,7 @@
+
+ ; return 0; }
+ EOF
+-if { (eval echo configure:4571: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:4577: \"$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
+@@ -4593,10 +4599,10 @@
+ for ac_func in putenv setenv
+ do
+ echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
+-echo "configure:4597: checking for $ac_func" >&5
++echo "configure:4603: checking for $ac_func" >&5
+
+ cat > conftest.$ac_ext <<EOF
+-#line 4600 "configure"
++#line 4606 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+ which can conflict with char $ac_func(); below. */
+@@ -4619,7 +4625,7 @@
+
+ ; return 0; }
+ EOF
+-if { (eval echo configure:4623: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:4629: \"$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
+@@ -4645,10 +4651,10 @@
+ for ac_func in nanosleep
+ do
+ echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
+-echo "configure:4649: checking for $ac_func" >&5
++echo "configure:4655: checking for $ac_func" >&5
+
+ cat > conftest.$ac_ext <<EOF
+-#line 4652 "configure"
++#line 4658 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+ which can conflict with char $ac_func(); below. */
+@@ -4671,7 +4677,7 @@
+
+ ; return 0; }
+ EOF
+-if { (eval echo configure:4675: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:4681: \"$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
+@@ -4696,13 +4702,13 @@
+
+ if test "$cross_compiling" != "yes" ; then
+ echo $ac_n "checking whether setpgrp takes no argument""... $ac_c" 1>&6
+-echo "configure:4700: checking whether setpgrp takes no argument" >&5
++echo "configure:4706: 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 4706 "configure"
++#line 4712 "configure"
+ #include "confdefs.h"
+
+ #ifdef HAVE_UNISTD_H
+@@ -4722,7 +4728,7 @@
+ }
+
+ EOF
+-if { (eval echo configure:4726: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:4732: \"$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
+@@ -4750,16 +4756,16 @@
+ fi
+
+ echo $ac_n "checking for long long int""... $ac_c" 1>&6
+-echo "configure:4754: checking for long long int" >&5
++echo "configure:4760: checking for long long int" >&5
+ cat > conftest.$ac_ext <<EOF
+-#line 4756 "configure"
++#line 4762 "configure"
+ #include "confdefs.h"
+
+ int main() {
+ long long int x;
+ ; return 0; }
+ EOF
+-if { (eval echo configure:4763: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:4769: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+ rm -rf conftest*
+
+ echo "$ac_t""yes" 1>&6
+@@ -4779,7 +4785,7 @@
+ rm -f conftest*
+
+ echo $ac_n "checking for W11""... $ac_c" 1>&6
+-echo "configure:4783: checking for W11" >&5
++echo "configure:4789: 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; } ;;
+@@ -4807,7 +4813,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:4811: checking for X" >&5
++echo "configure:4817: checking for X" >&5
+
+ # Check whether --with-x or --without-x was given.
+ if test "${with_x+set}" = set; then
+@@ -4867,12 +4873,12 @@
+
+ # First, try using that file with no special directory specified.
+ cat > conftest.$ac_ext <<EOF
+-#line 4871 "configure"
++#line 4877 "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:4876: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:4882: \"$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*
+@@ -4941,14 +4947,14 @@
+ ac_save_LIBS="$LIBS"
+ LIBS="-l$x_direct_test_library $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 4945 "configure"
++#line 4951 "configure"
+ #include "confdefs.h"
+
+ int main() {
+ ${x_direct_test_function}()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:4952: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:4958: \"$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.
+@@ -5053,17 +5059,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:5057: checking whether -R must be followed by a space" >&5
++echo "configure:5063: 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 5060 "configure"
++#line 5066 "configure"
+ #include "confdefs.h"
+
+ int main() {
+
+ ; return 0; }
+ EOF
+-if { (eval echo configure:5067: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:5073: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+ rm -rf conftest*
+ ac_R_nospace=yes
+ else
+@@ -5079,14 +5085,14 @@
+ else
+ LIBS="$ac_xsave_LIBS -R $x_libraries"
+ cat > conftest.$ac_ext <<EOF
+-#line 5083 "configure"
++#line 5089 "configure"
+ #include "confdefs.h"
+
+ int main() {
+
+ ; return 0; }
+ EOF
+-if { (eval echo configure:5090: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:5096: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+ rm -rf conftest*
+ ac_R_space=yes
+ else
+@@ -5118,13 +5124,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:5122: checking for dnet_ntoa in -ldnet" >&5
++echo "configure:5128: 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 5128 "configure"
++#line 5134 "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
+@@ -5135,7 +5141,7 @@
+ dnet_ntoa()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:5139: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:5145: \"$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
+@@ -5156,13 +5162,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:5160: checking for dnet_ntoa in -ldnet_stub" >&5
++echo "configure:5166: 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 5166 "configure"
++#line 5172 "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
+@@ -5173,7 +5179,7 @@
+ dnet_ntoa()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:5177: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:5183: \"$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
+@@ -5201,10 +5207,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:5205: checking for gethostbyname" >&5
++echo "configure:5211: checking for gethostbyname" >&5
+
+ cat > conftest.$ac_ext <<EOF
+-#line 5208 "configure"
++#line 5214 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+ which can conflict with char gethostbyname(); below. */
+@@ -5227,7 +5233,7 @@
+
+ ; return 0; }
+ EOF
+-if { (eval echo configure:5231: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:5237: \"$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
+@@ -5247,13 +5253,13 @@
+
+ if test $ac_cv_func_gethostbyname = no; then
+ echo $ac_n "checking for gethostbyname in -lnsl""... $ac_c" 1>&6
+-echo "configure:5251: checking for gethostbyname in -lnsl" >&5
++echo "configure:5257: 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 5257 "configure"
++#line 5263 "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
+@@ -5264,7 +5270,7 @@
+ gethostbyname()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:5268: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:5274: \"$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
+@@ -5293,10 +5299,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:5297: checking for connect" >&5
++echo "configure:5303: checking for connect" >&5
+
+ cat > conftest.$ac_ext <<EOF
+-#line 5300 "configure"
++#line 5306 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+ which can conflict with char connect(); below. */
+@@ -5319,7 +5325,7 @@
+
+ ; return 0; }
+ EOF
+-if { (eval echo configure:5323: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:5329: \"$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
+@@ -5339,13 +5345,13 @@
+
+ if test $ac_cv_func_connect = no; then
+ echo $ac_n "checking for connect in -lsocket""... $ac_c" 1>&6
+-echo "configure:5343: checking for connect in -lsocket" >&5
++echo "configure:5349: 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 5349 "configure"
++#line 5355 "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
+@@ -5356,7 +5362,7 @@
+ connect()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:5360: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:5366: \"$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
+@@ -5379,10 +5385,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:5383: checking for remove" >&5
++echo "configure:5389: checking for remove" >&5
+
+ cat > conftest.$ac_ext <<EOF
+-#line 5386 "configure"
++#line 5392 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+ which can conflict with char remove(); below. */
+@@ -5405,7 +5411,7 @@
+
+ ; return 0; }
+ EOF
+-if { (eval echo configure:5409: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:5415: \"$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
+@@ -5425,13 +5431,13 @@
+
+ if test $ac_cv_func_remove = no; then
+ echo $ac_n "checking for remove in -lposix""... $ac_c" 1>&6
+-echo "configure:5429: checking for remove in -lposix" >&5
++echo "configure:5435: 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 5435 "configure"
++#line 5441 "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
+@@ -5442,7 +5448,7 @@
+ remove()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:5446: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:5452: \"$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
+@@ -5465,10 +5471,10 @@
+
+ # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay.
+ echo $ac_n "checking for shmat""... $ac_c" 1>&6
+-echo "configure:5469: checking for shmat" >&5
++echo "configure:5475: checking for shmat" >&5
+
+ cat > conftest.$ac_ext <<EOF
+-#line 5472 "configure"
++#line 5478 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+ which can conflict with char shmat(); below. */
+@@ -5491,7 +5497,7 @@
+
+ ; return 0; }
+ EOF
+-if { (eval echo configure:5495: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:5501: \"$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
+@@ -5511,13 +5517,13 @@
+
+ if test $ac_cv_func_shmat = no; then
+ echo $ac_n "checking for shmat in -lipc""... $ac_c" 1>&6
+-echo "configure:5515: checking for shmat in -lipc" >&5
++echo "configure:5521: 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 5521 "configure"
++#line 5527 "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
+@@ -5528,7 +5534,7 @@
+ shmat()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:5532: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:5538: \"$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
+@@ -5560,13 +5566,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:5564: checking for IceConnectionNumber in -lICE" >&5
++echo "configure:5570: 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 5570 "configure"
++#line 5576 "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
+@@ -5577,7 +5583,7 @@
+ IceConnectionNumber()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:5581: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:5587: \"$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
+@@ -5615,7 +5621,7 @@
+
+
+ echo $ac_n "checking whether to use Curses""... $ac_c" 1>&6
+-echo "configure:5619: checking whether to use Curses" >&5
++echo "configure:5625: checking whether to use Curses" >&5
+ echo "$ac_t"""$with_curses"" 1>&6
+ case "$with_curses" in
+ "no") USE_CURSES= ;;
+@@ -5634,15 +5640,15 @@
+ do
+ ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
+ echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
+-echo "configure:5638: checking for $ac_hdr" >&5
++echo "configure:5644: checking for $ac_hdr" >&5
+
+ cat > conftest.$ac_ext <<EOF
+-#line 5641 "configure"
++#line 5647 "configure"
+ #include "confdefs.h"
+ #include <$ac_hdr>
+ EOF
+ ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+-{ (eval echo configure:5646: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:5652: \"$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*
+@@ -5673,10 +5679,10 @@
+
+
+ echo $ac_n "checking curses.h WINDOW structure component""... $ac_c" 1>&6
+-echo "configure:5677: checking curses.h WINDOW structure component" >&5
++echo "configure:5683: checking curses.h WINDOW structure component" >&5
+ CURSES_MAXY=NONE
+ cat > conftest.$ac_ext <<EOF
+-#line 5680 "configure"
++#line 5686 "configure"
+ #include "confdefs.h"
+
+ #include <curses.h>
+@@ -5685,7 +5691,7 @@
+ WINDOW w; w.maxy = 0;
+ ; return 0; }
+ EOF
+-if { (eval echo configure:5689: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:5695: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+ rm -rf conftest*
+ CURSES_MAXY=maxy
+ else
+@@ -5694,7 +5700,7 @@
+ fi
+ rm -f conftest*
+ cat > conftest.$ac_ext <<EOF
+-#line 5698 "configure"
++#line 5704 "configure"
+ #include "confdefs.h"
+
+ #include <curses.h>
+@@ -5703,7 +5709,7 @@
+ WINDOW w; w._maxy = 0;
+ ; return 0; }
+ EOF
+-if { (eval echo configure:5707: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:5713: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+ rm -rf conftest*
+ CURSES_MAXY=_maxy
+ else
+@@ -5719,13 +5725,13 @@
+ echo "$ac_t""$CURSES_MAXY" 1>&6
+
+ echo $ac_n "checking for initscr in -lncurses""... $ac_c" 1>&6
+-echo "configure:5723: checking for initscr in -lncurses" >&5
++echo "configure:5729: 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 5729 "configure"
++#line 5735 "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
+@@ -5736,7 +5742,7 @@
+ initscr()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:5740: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:5746: \"$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
+@@ -5755,13 +5761,13 @@
+ echo "$ac_t""no" 1>&6
+
+ echo $ac_n "checking for initscr in -lcurses""... $ac_c" 1>&6
+-echo "configure:5759: checking for initscr in -lcurses" >&5
++echo "configure:5765: 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 5765 "configure"
++#line 5771 "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
+@@ -5772,7 +5778,7 @@
+ initscr()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:5776: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:5782: \"$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
+@@ -5801,13 +5807,13 @@
+
+
+ echo $ac_n "checking for keypad in -lncurses""... $ac_c" 1>&6
+-echo "configure:5805: checking for keypad in -lncurses" >&5
++echo "configure:5811: 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 5811 "configure"
++#line 5817 "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
+@@ -5818,7 +5824,7 @@
+ keypad()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:5822: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:5828: \"$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
+@@ -5840,13 +5846,13 @@
+ echo "$ac_t""no" 1>&6
+
+ echo $ac_n "checking for keypad in -lcurses""... $ac_c" 1>&6
+-echo "configure:5844: checking for keypad in -lcurses" >&5
++echo "configure:5850: 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 5850 "configure"
++#line 5856 "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
+@@ -5857,7 +5863,7 @@
+ keypad()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:5861: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:5867: \"$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
+@@ -5887,13 +5893,13 @@
+ fi # $USE_CURSES
+
+ echo $ac_n "checking for gtty in -lcompat""... $ac_c" 1>&6
+-echo "configure:5891: checking for gtty in -lcompat" >&5
++echo "configure:5897: 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 5897 "configure"
++#line 5903 "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
+@@ -5904,7 +5910,7 @@
+ gtty()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:5908: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:5914: \"$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
+@@ -5923,13 +5929,13 @@
+ echo "$ac_t""no" 1>&6
+
+ echo $ac_n "checking for gtty in -lbsd-compat""... $ac_c" 1>&6
+-echo "configure:5927: checking for gtty in -lbsd-compat" >&5
++echo "configure:5933: 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 5933 "configure"
++#line 5939 "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
+@@ -5940,7 +5946,7 @@
+ gtty()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:5944: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:5950: \"$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
+@@ -5959,13 +5965,13 @@
+ echo "$ac_t""no" 1>&6
+
+ echo $ac_n "checking for gtty in -lbsd""... $ac_c" 1>&6
+-echo "configure:5963: checking for gtty in -lbsd" >&5
++echo "configure:5969: 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 5969 "configure"
++#line 5975 "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
+@@ -5976,7 +5982,7 @@
+ gtty()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:5980: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:5986: \"$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
+@@ -6010,12 +6016,12 @@
+ LIBS=""
+
+ echo $ac_n "checking for library containing cuserid""... $ac_c" 1>&6
+-echo "configure:6014: checking for library containing cuserid" >&5
++echo "configure:6020: checking for library containing cuserid" >&5
+
+ ac_func_search_save_LIBS="$LIBS"
+ ac_cv_search_cuserid="no"
+ cat > conftest.$ac_ext <<EOF
+-#line 6019 "configure"
++#line 6025 "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
+@@ -6026,7 +6032,7 @@
+ cuserid()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:6030: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:6036: \"$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
+@@ -6037,7 +6043,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 6041 "configure"
++#line 6047 "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
+@@ -6048,7 +6054,7 @@
+ cuserid()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:6052: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:6058: \"$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
+@@ -6074,10 +6080,10 @@
+ # Note: -lxdr -liberty -lws2_32 is for MinGW
+
+ echo $ac_n "checking for xdrmem_create""... $ac_c" 1>&6
+-echo "configure:6078: checking for xdrmem_create" >&5
++echo "configure:6084: checking for xdrmem_create" >&5
+
+ cat > conftest.$ac_ext <<EOF
+-#line 6081 "configure"
++#line 6087 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+ which can conflict with char xdrmem_create(); below. */
+@@ -6100,7 +6106,7 @@
+
+ ; return 0; }
+ EOF
+-if { (eval echo configure:6104: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:6110: \"$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
+@@ -6118,13 +6124,13 @@
+ echo "$ac_t""no" 1>&6
+
+ echo $ac_n "checking for xdrmem_create in -lsun""... $ac_c" 1>&6
+-echo "configure:6122: checking for xdrmem_create in -lsun" >&5
++echo "configure:6128: 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 6128 "configure"
++#line 6134 "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
+@@ -6135,7 +6141,7 @@
+ xdrmem_create()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:6139: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:6145: \"$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
+@@ -6154,13 +6160,13 @@
+ echo "$ac_t""no" 1>&6
+
+ echo $ac_n "checking for xdrmem_create in -lnsl""... $ac_c" 1>&6
+-echo "configure:6158: checking for xdrmem_create in -lnsl" >&5
++echo "configure:6164: 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 6164 "configure"
++#line 6170 "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
+@@ -6171,7 +6177,7 @@
+ xdrmem_create()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:6175: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:6181: \"$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
+@@ -6190,13 +6196,13 @@
+ echo "$ac_t""no" 1>&6
+
+ echo $ac_n "checking for xdrmem_create in -lrpclib""... $ac_c" 1>&6
+-echo "configure:6194: checking for xdrmem_create in -lrpclib" >&5
++echo "configure:6200: 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 6200 "configure"
++#line 6206 "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
+@@ -6207,7 +6213,7 @@
+ xdrmem_create()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:6211: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:6217: \"$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
+@@ -6226,13 +6232,13 @@
+ echo "$ac_t""no" 1>&6
+
+ echo $ac_n "checking for xdrmem_create in -lxdr""... $ac_c" 1>&6
+-echo "configure:6230: checking for xdrmem_create in -lxdr" >&5
++echo "configure:6236: 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 6236 "configure"
++#line 6242 "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
+@@ -6243,7 +6249,7 @@
+ xdrmem_create()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:6247: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:6253: \"$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
+@@ -6277,10 +6283,10 @@
+ for ac_func in asprintf
+ do
+ echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
+-echo "configure:6281: checking for $ac_func" >&5
++echo "configure:6287: checking for $ac_func" >&5
+
+ cat > conftest.$ac_ext <<EOF
+-#line 6284 "configure"
++#line 6290 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+ which can conflict with char $ac_func(); below. */
+@@ -6303,7 +6309,7 @@
+
+ ; return 0; }
+ EOF
+-if { (eval echo configure:6307: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:6313: \"$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
+@@ -6330,10 +6336,10 @@
+
+ # Test if mathlib needs -lm flag or is included with libc
+ echo $ac_n "checking for atan""... $ac_c" 1>&6
+-echo "configure:6334: checking for atan" >&5
++echo "configure:6340: checking for atan" >&5
+
+ cat > conftest.$ac_ext <<EOF
+-#line 6337 "configure"
++#line 6343 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+ which can conflict with char atan(); below. */
+@@ -6356,7 +6362,7 @@
+
+ ; return 0; }
+ EOF
+-if { (eval echo configure:6360: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:6366: \"$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
+@@ -6374,13 +6380,13 @@
+ echo "$ac_t""no" 1>&6
+
+ echo $ac_n "checking for atan in -lm""... $ac_c" 1>&6
+-echo "configure:6378: checking for atan in -lm" >&5
++echo "configure:6384: 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 6384 "configure"
++#line 6390 "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
+@@ -6391,7 +6397,7 @@
+ atan()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:6395: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:6401: \"$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
+@@ -6418,10 +6424,10 @@
+
+
+ echo $ac_n "checking for dlsym""... $ac_c" 1>&6
+-echo "configure:6422: checking for dlsym" >&5
++echo "configure:6428: checking for dlsym" >&5
+
+ cat > conftest.$ac_ext <<EOF
+-#line 6425 "configure"
++#line 6431 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+ which can conflict with char dlsym(); below. */
+@@ -6444,7 +6450,7 @@
+
+ ; return 0; }
+ EOF
+-if { (eval echo configure:6448: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:6454: \"$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
+@@ -6462,13 +6468,13 @@
+ echo "$ac_t""no" 1>&6
+
+ echo $ac_n "checking for dlsym in -ldl""... $ac_c" 1>&6
+-echo "configure:6466: checking for dlsym in -ldl" >&5
++echo "configure:6472: 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 6472 "configure"
++#line 6478 "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
+@@ -6479,7 +6485,7 @@
+ dlsym()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:6483: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:6489: \"$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
+@@ -6506,10 +6512,10 @@
+
+
+ echo $ac_n "checking for iconv""... $ac_c" 1>&6
+-echo "configure:6510: checking for iconv" >&5
++echo "configure:6516: checking for iconv" >&5
+
+ cat > conftest.$ac_ext <<EOF
+-#line 6513 "configure"
++#line 6519 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+ which can conflict with char iconv(); below. */
+@@ -6532,7 +6538,7 @@
+
+ ; return 0; }
+ EOF
+-if { (eval echo configure:6536: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:6542: \"$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
+@@ -6550,13 +6556,13 @@
+ echo "$ac_t""no" 1>&6
+
+ echo $ac_n "checking for iconv in -liconv""... $ac_c" 1>&6
+-echo "configure:6554: checking for iconv in -liconv" >&5
++echo "configure:6560: 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 6560 "configure"
++#line 6566 "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
+@@ -6567,7 +6573,7 @@
+ iconv()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:6571: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:6577: \"$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
+@@ -6586,13 +6592,13 @@
+ echo "$ac_t""no" 1>&6
+
+ echo $ac_n "checking for iconv in -lgiconv""... $ac_c" 1>&6
+-echo "configure:6590: checking for iconv in -lgiconv" >&5
++echo "configure:6596: 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 6596 "configure"
++#line 6602 "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
+@@ -6603,7 +6609,7 @@
+ iconv()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:6607: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:6613: \"$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
+@@ -6622,10 +6628,10 @@
+ echo "$ac_t""no" 1>&6
+
+ echo $ac_n "checking for libiconv""... $ac_c" 1>&6
+-echo "configure:6626: checking for libiconv" >&5
++echo "configure:6632: checking for libiconv" >&5
+
+ cat > conftest.$ac_ext <<EOF
+-#line 6629 "configure"
++#line 6635 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+ which can conflict with char libiconv(); below. */
+@@ -6648,7 +6654,7 @@
+
+ ; return 0; }
+ EOF
+-if { (eval echo configure:6652: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:6658: \"$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
+@@ -6666,13 +6672,13 @@
+ echo "$ac_t""no" 1>&6
+
+ echo $ac_n "checking for libiconv in -liconv""... $ac_c" 1>&6
+-echo "configure:6670: checking for libiconv in -liconv" >&5
++echo "configure:6676: 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 6676 "configure"
++#line 6682 "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
+@@ -6683,7 +6689,7 @@
+ libiconv()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:6687: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:6693: \"$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
+@@ -6702,13 +6708,13 @@
+ echo "$ac_t""no" 1>&6
+
+ echo $ac_n "checking for libiconv in -lgiconv""... $ac_c" 1>&6
+-echo "configure:6706: checking for libiconv in -lgiconv" >&5
++echo "configure:6712: 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 6712 "configure"
++#line 6718 "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
+@@ -6719,7 +6725,7 @@
+ libiconv()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:6723: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:6729: \"$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
+@@ -6756,10 +6762,10 @@
+
+ have_socket=1
+ echo $ac_n "checking for socket""... $ac_c" 1>&6
+-echo "configure:6760: checking for socket" >&5
++echo "configure:6766: checking for socket" >&5
+
+ cat > conftest.$ac_ext <<EOF
+-#line 6763 "configure"
++#line 6769 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+ which can conflict with char socket(); below. */
+@@ -6782,7 +6788,7 @@
+
+ ; return 0; }
+ EOF
+-if { (eval echo configure:6786: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:6792: \"$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
+@@ -6800,13 +6806,13 @@
+ echo "$ac_t""no" 1>&6
+
+ echo $ac_n "checking for socket in -lsocket""... $ac_c" 1>&6
+-echo "configure:6804: checking for socket in -lsocket" >&5
++echo "configure:6810: 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 6810 "configure"
++#line 6816 "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
+@@ -6817,7 +6823,7 @@
+ socket()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:6821: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:6827: \"$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
+@@ -6865,7 +6871,7 @@
+
+
+ echo $ac_n "checking for location of zlib includes""... $ac_c" 1>&6
+-echo "configure:6869: checking for location of zlib includes" >&5
++echo "configure:6875: 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; }
+@@ -6891,15 +6897,15 @@
+ do
+ ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
+ echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
+-echo "configure:6895: checking for $ac_hdr" >&5
++echo "configure:6901: checking for $ac_hdr" >&5
+
+ cat > conftest.$ac_ext <<EOF
+-#line 6898 "configure"
++#line 6904 "configure"
+ #include "confdefs.h"
+ #include <$ac_hdr>
+ EOF
+ ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+-{ (eval echo configure:6903: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:6909: \"$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*
+@@ -6933,7 +6939,7 @@
+
+
+ echo $ac_n "checking for location of zlib library""... $ac_c" 1>&6
+-echo "configure:6937: checking for location of zlib library" >&5
++echo "configure:6943: 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; }
+@@ -6958,13 +6964,13 @@
+
+
+ echo $ac_n "checking for deflate in -lz""... $ac_c" 1>&6
+-echo "configure:6962: checking for deflate in -lz" >&5
++echo "configure:6968: 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 6968 "configure"
++#line 6974 "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
+@@ -6975,7 +6981,7 @@
+ deflate()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:6979: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:6985: \"$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
+@@ -7023,7 +7029,7 @@
+
+
+ echo $ac_n "checking for location of External PROJ.4 includes""... $ac_c" 1>&6
+-echo "configure:7027: checking for location of External PROJ.4 includes" >&5
++echo "configure:7033: 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; }
+@@ -7049,15 +7055,15 @@
+ do
+ ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
+ echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
+-echo "configure:7053: checking for $ac_hdr" >&5
++echo "configure:7059: checking for $ac_hdr" >&5
+
+ cat > conftest.$ac_ext <<EOF
+-#line 7056 "configure"
++#line 7062 "configure"
+ #include "confdefs.h"
+ #include <$ac_hdr>
+ EOF
+ ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+-{ (eval echo configure:7061: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:7067: \"$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*
+@@ -7094,7 +7100,7 @@
+ else
+
+ echo $ac_n "checking External PROJ.4 version""... $ac_c" 1>&6
+-echo "configure:7098: checking External PROJ.4 version" >&5
++echo "configure:7104: checking External PROJ.4 version" >&5
+ ac_save_cppflags="$CPPFLAGS"
+ CPPFLAGS="$PROJINC $CPPFLAGS"
+ if test "$cross_compiling" = yes; then
+@@ -7102,7 +7108,7 @@
+ echo "$ac_t""unknown (cross-compiling)" 1>&6
+ else
+ cat > conftest.$ac_ext <<EOF
+-#line 7106 "configure"
++#line 7112 "configure"
+ #include "confdefs.h"
+
+ #include <stdio.h>
+@@ -7114,7 +7120,7 @@
+ }
+
+ EOF
+-if { (eval echo configure:7118: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:7124: \"$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
+@@ -7139,7 +7145,7 @@
+
+
+ echo $ac_n "checking for location of External PROJ.4 library""... $ac_c" 1>&6
+-echo "configure:7143: checking for location of External PROJ.4 library" >&5
++echo "configure:7149: 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; }
+@@ -7164,13 +7170,13 @@
+
+
+ echo $ac_n "checking for pj_get_def in -lproj""... $ac_c" 1>&6
+-echo "configure:7168: checking for pj_get_def in -lproj" >&5
++echo "configure:7174: 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 7174 "configure"
++#line 7180 "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
+@@ -7181,7 +7187,7 @@
+ pj_get_def()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:7185: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:7191: \"$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
+@@ -7215,7 +7221,7 @@
+
+
+ echo $ac_n "checking for location of External PROJ.4 data files""... $ac_c" 1>&6
+-echo "configure:7219: checking for location of External PROJ.4 data files" >&5
++echo "configure:7225: 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; }
+@@ -7239,14 +7245,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:7243: checking for epsg" >&5
++echo "configure:7249: 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:7250: checking for $PROJSHARE/epsg" >&5
++echo "configure:7256: 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; }
+@@ -7278,7 +7284,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:7282: checking for $ac_word" >&5
++echo "configure:7288: checking for $ac_word" >&5
+
+ case "$NAD2BIN" in
+ /*)
+@@ -7318,7 +7324,7 @@
+
+
+ echo $ac_n "checking whether to use regex""... $ac_c" 1>&6
+-echo "configure:7322: checking whether to use regex" >&5
++echo "configure:7328: checking whether to use regex" >&5
+ echo "$ac_t"""$with_regex"" 1>&6
+ case "$with_regex" in
+ "no") USE_REGEX= ;;
+@@ -7338,7 +7344,7 @@
+
+
+ echo $ac_n "checking for location of regex includes""... $ac_c" 1>&6
+-echo "configure:7342: checking for location of regex includes" >&5
++echo "configure:7348: checking for location of regex includes" >&5
+ case "$with_regex_includes" in
+ y | ye | yes | n | no)
+ { echo "configure: error: *** You must supply a directory to --with-regex-includes." 1>&2; exit 1; }
+@@ -7364,15 +7370,15 @@
+ do
+ ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
+ echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
+-echo "configure:7368: checking for $ac_hdr" >&5
++echo "configure:7374: checking for $ac_hdr" >&5
+
+ cat > conftest.$ac_ext <<EOF
+-#line 7371 "configure"
++#line 7377 "configure"
+ #include "confdefs.h"
+ #include <$ac_hdr>
+ EOF
+ ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+-{ (eval echo configure:7376: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:7382: \"$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*
+@@ -7406,7 +7412,7 @@
+
+
+ echo $ac_n "checking for location of regex library""... $ac_c" 1>&6
+-echo "configure:7410: checking for location of regex library" >&5
++echo "configure:7416: checking for location of regex library" >&5
+ case "$with_regex_libs" in
+ y | ye | yes | n | no)
+ { echo "configure: error: *** You must supply a directory to --with-regex-libs." 1>&2; exit 1; }
+@@ -7431,10 +7437,10 @@
+ LIBS=" $LIBS"
+ LDFLAGS=" $LDFLAGS"
+ echo $ac_n "checking for regcomp""... $ac_c" 1>&6
+-echo "configure:7435: checking for regcomp" >&5
++echo "configure:7441: checking for regcomp" >&5
+
+ cat > conftest.$ac_ext <<EOF
+-#line 7438 "configure"
++#line 7444 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+ which can conflict with char regcomp(); below. */
+@@ -7457,7 +7463,7 @@
+
+ ; return 0; }
+ EOF
+-if { (eval echo configure:7461: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:7467: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+ rm -rf conftest*
+ eval "ac_cv_func_regcomp=yes"
+ else
+@@ -7484,13 +7490,13 @@
+
+
+ echo $ac_n "checking for regcomp in -lregex""... $ac_c" 1>&6
+-echo "configure:7488: checking for regcomp in -lregex" >&5
++echo "configure:7494: checking for regcomp in -lregex" >&5
+ ac_lib_var=`echo regex'_'regcomp | sed 'y%./+-%__p_%'`
+
+ ac_save_LIBS="$LIBS"
+ LIBS="-lregex $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 7494 "configure"
++#line 7500 "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
+@@ -7501,7 +7507,7 @@
+ regcomp()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:7505: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:7511: \"$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
+@@ -7551,7 +7557,7 @@
+
+
+ echo $ac_n "checking whether to use Readline""... $ac_c" 1>&6
+-echo "configure:7555: checking whether to use Readline" >&5
++echo "configure:7561: checking whether to use Readline" >&5
+ echo "$ac_t"""$with_readline"" 1>&6
+ case "$with_readline" in
+ "no") USE_READLINE= ;;
+@@ -7572,7 +7578,7 @@
+
+
+ echo $ac_n "checking for location of Readline includes""... $ac_c" 1>&6
+-echo "configure:7576: checking for location of Readline includes" >&5
++echo "configure:7582: 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; }
+@@ -7598,15 +7604,15 @@
+ do
+ ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
+ echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
+-echo "configure:7602: checking for $ac_hdr" >&5
++echo "configure:7608: checking for $ac_hdr" >&5
+
+ cat > conftest.$ac_ext <<EOF
+-#line 7605 "configure"
++#line 7611 "configure"
+ #include "confdefs.h"
+ #include <$ac_hdr>
+ EOF
+ ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+-{ (eval echo configure:7610: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:7616: \"$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*
+@@ -7642,15 +7648,15 @@
+ do
+ ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
+ echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
+-echo "configure:7646: checking for $ac_hdr" >&5
++echo "configure:7652: checking for $ac_hdr" >&5
+
+ cat > conftest.$ac_ext <<EOF
+-#line 7649 "configure"
++#line 7655 "configure"
+ #include "confdefs.h"
+ #include <$ac_hdr>
+ EOF
+ ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+-{ (eval echo configure:7654: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:7660: \"$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*
+@@ -7684,7 +7690,7 @@
+
+
+ echo $ac_n "checking for location of Readline library""... $ac_c" 1>&6
+-echo "configure:7688: checking for location of Readline library" >&5
++echo "configure:7694: 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; }
+@@ -7709,13 +7715,13 @@
+
+
+ echo $ac_n "checking for readline in -lreadline""... $ac_c" 1>&6
+-echo "configure:7713: checking for readline in -lreadline" >&5
++echo "configure:7719: 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 7719 "configure"
++#line 7725 "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
+@@ -7726,7 +7732,7 @@
+ readline()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:7730: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:7736: \"$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
+@@ -7761,13 +7767,13 @@
+
+
+ echo $ac_n "checking for add_history in -lhistory""... $ac_c" 1>&6
+-echo "configure:7765: checking for add_history in -lhistory" >&5
++echo "configure:7771: 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 7771 "configure"
++#line 7777 "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
+@@ -7778,7 +7784,7 @@
+ add_history()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:7782: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:7788: \"$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
+@@ -7820,7 +7826,7 @@
+ # GDAL option
+
+ echo $ac_n "checking whether to use GDAL""... $ac_c" 1>&6
+-echo "configure:7824: checking whether to use GDAL" >&5
++echo "configure:7830: checking whether to use GDAL" >&5
+
+ GDAL_LIBS=
+ GDAL_CFLAGS=
+@@ -7838,7 +7844,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:7842: checking for $ac_word" >&5
++echo "configure:7848: checking for $ac_word" >&5
+
+ case "$GDAL_CONFIG" in
+ /*)
+@@ -7893,14 +7899,14 @@
+ LIBS="$LIBS $GDAL_LIBS"
+ CFLAGS="$CFLAGS $GDAL_CFLAGS"
+ cat > conftest.$ac_ext <<EOF
+-#line 7897 "configure"
++#line 7903 "configure"
+ #include "confdefs.h"
+ #include <gdal.h>
+ int main() {
+ GDALOpen("foo", GA_ReadOnly);
+ ; return 0; }
+ EOF
+-if { (eval echo configure:7904: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:7910: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+ :
+ else
+ echo "configure: failed program was:" >&5
+@@ -7909,14 +7915,14 @@
+
+ LIBS="$LIBS $GDAL_DEP_LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 7913 "configure"
++#line 7919 "configure"
+ #include "confdefs.h"
+ #include <gdal.h>
+ int main() {
+ GDALOpen("foo", GA_ReadOnly);
+ ; return 0; }
+ EOF
+-if { (eval echo configure:7920: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:7926: \"$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
+@@ -7948,7 +7954,7 @@
+ # GEOS option
+
+ echo $ac_n "checking whether to use GEOS""... $ac_c" 1>&6
+-echo "configure:7952: checking whether to use GEOS" >&5
++echo "configure:7958: checking whether to use GEOS" >&5
+
+ GEOS_LIBS=
+ GGEOS_CFLAGS=
+@@ -7966,7 +7972,7 @@
+ # Extract the first word of "geos-config", so it can be a program name with args.
+ set dummy geos-config; ac_word=$2
+ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:7970: checking for $ac_word" >&5
++echo "configure:7976: checking for $ac_word" >&5
+
+ case "$GEOS_CONFIG" in
+ /*)
+@@ -8014,15 +8020,15 @@
+ do
+ ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
+ echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
+-echo "configure:8018: checking for $ac_hdr" >&5
++echo "configure:8024: checking for $ac_hdr" >&5
+
+ cat > conftest.$ac_ext <<EOF
+-#line 8021 "configure"
++#line 8027 "configure"
+ #include "confdefs.h"
+ #include <$ac_hdr>
+ EOF
+ ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+-{ (eval echo configure:8026: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:8032: \"$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*
+@@ -8061,13 +8067,13 @@
+
+
+ echo $ac_n "checking for initGEOS in -lgeos_c""... $ac_c" 1>&6
+-echo "configure:8065: checking for initGEOS in -lgeos_c" >&5
++echo "configure:8071: checking for initGEOS in -lgeos_c" >&5
+ ac_lib_var=`echo geos_c'_'initGEOS | sed 'y%./+-%__p_%'`
+
+ ac_save_LIBS="$LIBS"
+ LIBS="-lgeos_c $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 8071 "configure"
++#line 8077 "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
+@@ -8078,7 +8084,7 @@
+ initGEOS()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:8082: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:8088: \"$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,7 +8129,7 @@
+
+
+ echo $ac_n "checking whether to use TIFF""... $ac_c" 1>&6
+-echo "configure:8127: checking whether to use TIFF" >&5
++echo "configure:8133: checking whether to use TIFF" >&5
+ echo "$ac_t"""$with_tiff"" 1>&6
+ case "$with_tiff" in
+ "no") USE_TIFF= ;;
+@@ -8143,7 +8149,7 @@
+
+
+ echo $ac_n "checking for location of TIFF includes""... $ac_c" 1>&6
+-echo "configure:8147: checking for location of TIFF includes" >&5
++echo "configure:8153: 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; }
+@@ -8169,15 +8175,15 @@
+ do
+ ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
+ echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
+-echo "configure:8173: checking for $ac_hdr" >&5
++echo "configure:8179: checking for $ac_hdr" >&5
+
+ cat > conftest.$ac_ext <<EOF
+-#line 8176 "configure"
++#line 8182 "configure"
+ #include "confdefs.h"
+ #include <$ac_hdr>
+ EOF
+ ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+-{ (eval echo configure:8181: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:8187: \"$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*
+@@ -8211,7 +8217,7 @@
+
+
+ echo $ac_n "checking for location of TIFF library""... $ac_c" 1>&6
+-echo "configure:8215: checking for location of TIFF library" >&5
++echo "configure:8221: 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; }
+@@ -8242,13 +8248,13 @@
+
+
+ echo $ac_n "checking for TIFFOpen in -ltiff""... $ac_c" 1>&6
+-echo "configure:8246: checking for TIFFOpen in -ltiff" >&5
++echo "configure:8252: 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 8252 "configure"
++#line 8258 "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
+@@ -8259,7 +8265,7 @@
+ TIFFOpen()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:8263: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:8269: \"$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
+@@ -8278,13 +8284,13 @@
+ echo "$ac_t""no" 1>&6
+
+ echo $ac_n "checking for TIFFOpen in -ltiff""... $ac_c" 1>&6
+-echo "configure:8282: checking for TIFFOpen in -ltiff" >&5
++echo "configure:8288: 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 8288 "configure"
++#line 8294 "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
+@@ -8295,7 +8301,7 @@
+ TIFFOpen()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:8299: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:8305: \"$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
+@@ -8314,13 +8320,13 @@
+ echo "$ac_t""no" 1>&6
+
+ echo $ac_n "checking for TIFFOpen in -ltiff""... $ac_c" 1>&6
+-echo "configure:8318: checking for TIFFOpen in -ltiff" >&5
++echo "configure:8324: 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 8324 "configure"
++#line 8330 "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
+@@ -8331,7 +8337,7 @@
+ TIFFOpen()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:8335: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:8341: \"$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
+@@ -8350,13 +8356,13 @@
+ echo "$ac_t""no" 1>&6
+
+ echo $ac_n "checking for TIFFOpen in -ltiff""... $ac_c" 1>&6
+-echo "configure:8354: checking for TIFFOpen in -ltiff" >&5
++echo "configure:8360: 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 8360 "configure"
++#line 8366 "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 +8373,7 @@
+ TIFFOpen()
+ ; 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:8377: \"$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
+@@ -8386,13 +8392,13 @@
+ echo "$ac_t""no" 1>&6
+
+ echo $ac_n "checking for TIFFOpen in -ltiff""... $ac_c" 1>&6
+-echo "configure:8390: checking for TIFFOpen in -ltiff" >&5
++echo "configure:8396: checking for TIFFOpen in -ltiff" >&5
+ ac_lib_var=`echo tiff'_'TIFFOpen | sed 'y%./+-%__p_%'`
+
+ ac_save_LIBS="$LIBS"
+ LIBS="-ltiff -ljpeg $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 8396 "configure"
++#line 8402 "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
+@@ -8403,7 +8409,7 @@
+ TIFFOpen()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:8407: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:8413: \"$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
+@@ -8422,13 +8428,13 @@
+ echo "$ac_t""no" 1>&6
+
+ echo $ac_n "checking for TIFFOpen in -ltiff""... $ac_c" 1>&6
+-echo "configure:8426: checking for TIFFOpen in -ltiff" >&5
++echo "configure:8432: checking for TIFFOpen in -ltiff" >&5
+ ac_lib_var=`echo tiff'_'TIFFOpen | sed 'y%./+-%__p_%'`
+
+ ac_save_LIBS="$LIBS"
+ LIBS="-ltiff -ljpeg $MATHLIB $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 8432 "configure"
++#line 8438 "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
+@@ -8439,7 +8445,7 @@
+ TIFFOpen()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:8443: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:8449: \"$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
+@@ -8458,13 +8464,13 @@
+ echo "$ac_t""no" 1>&6
+
+ echo $ac_n "checking for TIFFOpen in -ltiff""... $ac_c" 1>&6
+-echo "configure:8462: checking for TIFFOpen in -ltiff" >&5
++echo "configure:8468: checking for TIFFOpen in -ltiff" >&5
+ ac_lib_var=`echo tiff'_'TIFFOpen | sed 'y%./+-%__p_%'`
+
+ ac_save_LIBS="$LIBS"
+ LIBS="-ltiff -ljpeg $ZLIB $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 8468 "configure"
++#line 8474 "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
+@@ -8475,7 +8481,7 @@
+ TIFFOpen()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:8479: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:8485: \"$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
+@@ -8494,13 +8500,13 @@
+ echo "$ac_t""no" 1>&6
+
+ echo $ac_n "checking for TIFFOpen in -ltiff""... $ac_c" 1>&6
+-echo "configure:8498: checking for TIFFOpen in -ltiff" >&5
++echo "configure:8504: checking for TIFFOpen in -ltiff" >&5
+ ac_lib_var=`echo tiff'_'TIFFOpen | sed 'y%./+-%__p_%'`
+
+ ac_save_LIBS="$LIBS"
+ LIBS="-ltiff -ljpeg $ZLIB $MATHLIB $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 8504 "configure"
++#line 8510 "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
+@@ -8511,7 +8517,7 @@
+ TIFFOpen()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:8515: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:8521: \"$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
+@@ -8609,7 +8615,7 @@
+
+
+ echo $ac_n "checking whether to use PNG""... $ac_c" 1>&6
+-echo "configure:8613: checking whether to use PNG" >&5
++echo "configure:8619: checking whether to use PNG" >&5
+ echo "$ac_t"""$with_png"" 1>&6
+ case "$with_png" in
+ "no") USE_PNG= ;;
+@@ -8628,7 +8634,7 @@
+
+
+ echo $ac_n "checking for location of PNG includes""... $ac_c" 1>&6
+-echo "configure:8632: checking for location of PNG includes" >&5
++echo "configure:8638: 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; }
+@@ -8654,15 +8660,15 @@
+ do
+ ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
+ echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
+-echo "configure:8658: checking for $ac_hdr" >&5
++echo "configure:8664: checking for $ac_hdr" >&5
+
+ cat > conftest.$ac_ext <<EOF
+-#line 8661 "configure"
++#line 8667 "configure"
+ #include "confdefs.h"
+ #include <$ac_hdr>
+ EOF
+ ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+-{ (eval echo configure:8666: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:8672: \"$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*
+@@ -8696,7 +8702,7 @@
+
+
+ echo $ac_n "checking for location of PNG library""... $ac_c" 1>&6
+-echo "configure:8700: checking for location of PNG library" >&5
++echo "configure:8706: 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; }
+@@ -8721,13 +8727,13 @@
+
+
+ echo $ac_n "checking for png_read_image in -lpng""... $ac_c" 1>&6
+-echo "configure:8725: checking for png_read_image in -lpng" >&5
++echo "configure:8731: 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 8731 "configure"
++#line 8737 "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
+@@ -8738,7 +8744,7 @@
+ png_read_image()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:8742: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:8748: \"$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
+@@ -8780,7 +8786,7 @@
+
+
+ echo $ac_n "checking whether to use PostgreSQL""... $ac_c" 1>&6
+-echo "configure:8784: checking whether to use PostgreSQL" >&5
++echo "configure:8790: checking whether to use PostgreSQL" >&5
+ echo "$ac_t"""$with_postgres"" 1>&6
+ case "$with_postgres" in
+ "no") USE_POSTGRES= ;;
+@@ -8807,7 +8813,7 @@
+
+
+ echo $ac_n "checking for location of PostgreSQL includes""... $ac_c" 1>&6
+-echo "configure:8811: checking for location of PostgreSQL includes" >&5
++echo "configure:8817: 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; }
+@@ -8833,15 +8839,15 @@
+ do
+ ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
+ echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
+-echo "configure:8837: checking for $ac_hdr" >&5
++echo "configure:8843: checking for $ac_hdr" >&5
+
+ cat > conftest.$ac_ext <<EOF
+-#line 8840 "configure"
++#line 8846 "configure"
+ #include "confdefs.h"
+ #include <$ac_hdr>
+ EOF
+ ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+-{ (eval echo configure:8845: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:8851: \"$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*
+@@ -8879,7 +8885,7 @@
+
+
+ echo $ac_n "checking for location of PostgreSQL library""... $ac_c" 1>&6
+-echo "configure:8883: checking for location of PostgreSQL library" >&5
++echo "configure:8889: 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; }
+@@ -8908,13 +8914,13 @@
+
+
+ echo $ac_n "checking for PQsetdbLogin in -lpq""... $ac_c" 1>&6
+-echo "configure:8912: checking for PQsetdbLogin in -lpq" >&5
++echo "configure:8918: 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 8918 "configure"
++#line 8924 "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
+@@ -8925,7 +8931,7 @@
+ PQsetdbLogin()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:8929: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:8935: \"$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
+@@ -8944,13 +8950,13 @@
+ echo "$ac_t""no" 1>&6
+
+ echo $ac_n "checking for PQsetdbLogin in -lpq""... $ac_c" 1>&6
+-echo "configure:8948: checking for PQsetdbLogin in -lpq" >&5
++echo "configure:8954: 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 8954 "configure"
++#line 8960 "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
+@@ -8961,7 +8967,7 @@
+ PQsetdbLogin()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:8965: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:8971: \"$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
+@@ -8980,13 +8986,13 @@
+ echo "$ac_t""no" 1>&6
+
+ echo $ac_n "checking for PQsetdbLogin in -lpq""... $ac_c" 1>&6
+-echo "configure:8984: checking for PQsetdbLogin in -lpq" >&5
++echo "configure:8990: 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 8990 "configure"
++#line 8996 "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
+@@ -8997,7 +9003,7 @@
+ PQsetdbLogin()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:9001: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:9007: \"$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
+@@ -9016,13 +9022,13 @@
+ echo "$ac_t""no" 1>&6
+
+ echo $ac_n "checking for PQsetdbLogin in -lpq""... $ac_c" 1>&6
+-echo "configure:9020: checking for PQsetdbLogin in -lpq" >&5
++echo "configure:9026: 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 9026 "configure"
++#line 9032 "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
+@@ -9033,7 +9039,7 @@
+ PQsetdbLogin()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:9037: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:9043: \"$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
+@@ -9090,13 +9096,13 @@
+ ac_save_ldflags="$LDFLAGS"
+ LDFLAGS="$LDFLAGS $PQLIBPATH"
+ echo $ac_n "checking for PQcmdTuples in -lpq""... $ac_c" 1>&6
+-echo "configure:9094: checking for PQcmdTuples in -lpq" >&5
++echo "configure:9100: 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 9100 "configure"
++#line 9106 "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
+@@ -9107,7 +9113,7 @@
+ PQcmdTuples()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:9111: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:9117: \"$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
+@@ -9129,13 +9135,13 @@
+ echo "$ac_t""no" 1>&6
+
+ echo $ac_n "checking for PQcmdTuples in -lpq""... $ac_c" 1>&6
+-echo "configure:9133: checking for PQcmdTuples in -lpq" >&5
++echo "configure:9139: 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 9139 "configure"
++#line 9145 "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
+@@ -9146,7 +9152,7 @@
+ PQcmdTuples()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:9150: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:9156: \"$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
+@@ -9189,7 +9195,7 @@
+
+
+ echo $ac_n "checking whether to use MySQL""... $ac_c" 1>&6
+-echo "configure:9193: checking whether to use MySQL" >&5
++echo "configure:9199: checking whether to use MySQL" >&5
+ echo "$ac_t"""$with_mysql"" 1>&6
+ case "$with_mysql" in
+ "no") USE_MYSQL= ;;
+@@ -9209,7 +9215,7 @@
+
+
+ echo $ac_n "checking for location of MySQL includes""... $ac_c" 1>&6
+-echo "configure:9213: checking for location of MySQL includes" >&5
++echo "configure:9219: 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; }
+@@ -9235,15 +9241,15 @@
+ do
+ ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
+ echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
+-echo "configure:9239: checking for $ac_hdr" >&5
++echo "configure:9245: checking for $ac_hdr" >&5
+
+ cat > conftest.$ac_ext <<EOF
+-#line 9242 "configure"
++#line 9248 "configure"
+ #include "confdefs.h"
+ #include <$ac_hdr>
+ EOF
+ ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+-{ (eval echo configure:9247: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:9253: \"$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*
+@@ -9280,7 +9286,7 @@
+
+
+ echo $ac_n "checking for location of MySQL library""... $ac_c" 1>&6
+-echo "configure:9284: checking for location of MySQL library" >&5
++echo "configure:9290: 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; }
+@@ -9311,13 +9317,13 @@
+
+
+ echo $ac_n "checking for mysql_query in -lmysqlclient""... $ac_c" 1>&6
+-echo "configure:9315: checking for mysql_query in -lmysqlclient" >&5
++echo "configure:9321: 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 9321 "configure"
++#line 9327 "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
+@@ -9328,7 +9334,7 @@
+ mysql_query()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:9332: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:9338: \"$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
+@@ -9347,13 +9353,13 @@
+ echo "$ac_t""no" 1>&6
+
+ echo $ac_n "checking for mysql_query in -lmysqlclient""... $ac_c" 1>&6
+-echo "configure:9351: checking for mysql_query in -lmysqlclient" >&5
++echo "configure:9357: 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 9357 "configure"
++#line 9363 "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
+@@ -9364,7 +9370,7 @@
+ mysql_query()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:9368: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:9374: \"$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
+@@ -9383,13 +9389,13 @@
+ echo "$ac_t""no" 1>&6
+
+ echo $ac_n "checking for mysql_query in -lmysqlclient""... $ac_c" 1>&6
+-echo "configure:9387: checking for mysql_query in -lmysqlclient" >&5
++echo "configure:9393: 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 9393 "configure"
++#line 9399 "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 +9406,7 @@
+ mysql_query()
+ ; 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:9410: \"$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 +9425,13 @@
+ echo "$ac_t""no" 1>&6
+
+ echo $ac_n "checking for mysql_query in -lmysqlclient""... $ac_c" 1>&6
+-echo "configure:9423: checking for mysql_query in -lmysqlclient" >&5
++echo "configure:9429: 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 9429 "configure"
++#line 9435 "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 +9442,7 @@
+ mysql_query()
+ ; 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:9446: \"$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 +9461,13 @@
+ echo "$ac_t""no" 1>&6
+
+ echo $ac_n "checking for mysql_query in -lmysqlclient""... $ac_c" 1>&6
+-echo "configure:9459: checking for mysql_query in -lmysqlclient" >&5
++echo "configure:9465: 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 9465 "configure"
++#line 9471 "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 +9478,7 @@
+ mysql_query()
+ ; 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:9482: \"$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 +9497,13 @@
+ echo "$ac_t""no" 1>&6
+
+ echo $ac_n "checking for mysql_query in -lmysqlclient""... $ac_c" 1>&6
+-echo "configure:9495: checking for mysql_query in -lmysqlclient" >&5
++echo "configure:9501: 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 9501 "configure"
++#line 9507 "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 +9514,7 @@
+ mysql_query()
+ ; 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:9518: \"$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
+@@ -9527,13 +9533,13 @@
+ echo "$ac_t""no" 1>&6
+
+ echo $ac_n "checking for mysql_query in -lmysqlclient""... $ac_c" 1>&6
+-echo "configure:9531: checking for mysql_query in -lmysqlclient" >&5
++echo "configure:9537: 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 9537 "configure"
++#line 9543 "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
+@@ -9544,7 +9550,7 @@
+ mysql_query()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:9548: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:9554: \"$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
+@@ -9563,13 +9569,13 @@
+ echo "$ac_t""no" 1>&6
+
+ echo $ac_n "checking for mysql_query in -lmysqlclient""... $ac_c" 1>&6
+-echo "configure:9567: checking for mysql_query in -lmysqlclient" >&5
++echo "configure:9573: 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 9573 "configure"
++#line 9579 "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
+@@ -9580,7 +9586,7 @@
+ mysql_query()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:9584: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:9590: \"$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
+@@ -9670,7 +9676,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:9674: checking for $ac_word" >&5
++echo "configure:9680: checking for $ac_word" >&5
+
+ case "$MYSQLD_CONFIG" in
+ /*)
+@@ -9711,10 +9717,10 @@
+
+ LIBS="$MYSQLDLIB $LIBS"
+ echo $ac_n "checking for mysql_server_init""... $ac_c" 1>&6
+-echo "configure:9715: checking for mysql_server_init" >&5
++echo "configure:9721: checking for mysql_server_init" >&5
+
+ cat > conftest.$ac_ext <<EOF
+-#line 9718 "configure"
++#line 9724 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+ which can conflict with char mysql_server_init(); below. */
+@@ -9737,7 +9743,7 @@
+
+ ; return 0; }
+ EOF
+-if { (eval echo configure:9741: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:9747: \"$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
+@@ -9775,7 +9781,7 @@
+
+
+ echo $ac_n "checking whether to use SQLite""... $ac_c" 1>&6
+-echo "configure:9779: checking whether to use SQLite" >&5
++echo "configure:9785: checking whether to use SQLite" >&5
+ echo "$ac_t"""$with_sqlite"" 1>&6
+ case "$with_sqlite" in
+ "no") USE_SQLITE= ;;
+@@ -9795,7 +9801,7 @@
+
+
+ echo $ac_n "checking for location of SQLite includes""... $ac_c" 1>&6
+-echo "configure:9799: checking for location of SQLite includes" >&5
++echo "configure:9805: 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; }
+@@ -9821,15 +9827,15 @@
+ do
+ ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
+ echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
+-echo "configure:9825: checking for $ac_hdr" >&5
++echo "configure:9831: checking for $ac_hdr" >&5
+
+ cat > conftest.$ac_ext <<EOF
+-#line 9828 "configure"
++#line 9834 "configure"
+ #include "confdefs.h"
+ #include <$ac_hdr>
+ EOF
+ ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+-{ (eval echo configure:9833: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:9839: \"$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*
+@@ -9872,7 +9878,7 @@
+
+
+ echo $ac_n "checking for location of SQLite library""... $ac_c" 1>&6
+-echo "configure:9876: checking for location of SQLite library" >&5
++echo "configure:9882: 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; }
+@@ -9901,13 +9907,13 @@
+
+
+ echo $ac_n "checking for sqlite3_open in -lsqlite3""... $ac_c" 1>&6
+-echo "configure:9905: checking for sqlite3_open in -lsqlite3" >&5
++echo "configure:9911: 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 9911 "configure"
++#line 9917 "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
+@@ -9918,7 +9924,7 @@
+ sqlite3_open()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:9922: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:9928: \"$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
+@@ -9937,13 +9943,13 @@
+ echo "$ac_t""no" 1>&6
+
+ echo $ac_n "checking for sqlite3_open in -lsqlite3""... $ac_c" 1>&6
+-echo "configure:9941: checking for sqlite3_open in -lsqlite3" >&5
++echo "configure:9947: checking for sqlite3_open in -lsqlite3" >&5
+ ac_lib_var=`echo sqlite3'_'sqlite3_open | sed 'y%./+-%__p_%'`
+
+ ac_save_LIBS="$LIBS"
+ LIBS="-lsqlite3 $DLLIB $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 9947 "configure"
++#line 9953 "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
+@@ -9954,7 +9960,7 @@
+ sqlite3_open()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:9958: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:9964: \"$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
+@@ -9973,13 +9979,13 @@
+ echo "$ac_t""no" 1>&6
+
+ echo $ac_n "checking for sqlite3_open in -lsqlite3""... $ac_c" 1>&6
+-echo "configure:9977: checking for sqlite3_open in -lsqlite3" >&5
++echo "configure:9983: 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 9983 "configure"
++#line 9989 "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
+@@ -9990,7 +9996,7 @@
+ sqlite3_open()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:9994: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:10000: \"$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
+@@ -10009,13 +10015,13 @@
+ echo "$ac_t""no" 1>&6
+
+ echo $ac_n "checking for sqlite3_open in -lsqlite3""... $ac_c" 1>&6
+-echo "configure:10013: checking for sqlite3_open in -lsqlite3" >&5
++echo "configure:10019: checking for sqlite3_open in -lsqlite3" >&5
+ ac_lib_var=`echo sqlite3'_'sqlite3_open | sed 'y%./+-%__p_%'`
+
+ ac_save_LIBS="$LIBS"
+ LIBS="-lsqlite3 $MATHLIB $DLLIB $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 10019 "configure"
++#line 10025 "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
+@@ -10026,7 +10032,7 @@
+ sqlite3_open()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:10030: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:10036: \"$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
+@@ -10095,7 +10101,7 @@
+
+
+ echo $ac_n "checking whether to use FFMPEG""... $ac_c" 1>&6
+-echo "configure:10099: checking whether to use FFMPEG" >&5
++echo "configure:10105: checking whether to use FFMPEG" >&5
+ echo "$ac_t"""$with_ffmpeg"" 1>&6
+ case "$with_ffmpeg" in
+ "no") USE_FFMPEG= ;;
+@@ -10115,7 +10121,7 @@
+
+
+ echo $ac_n "checking for location of FFMPEG includes""... $ac_c" 1>&6
+-echo "configure:10119: checking for location of FFMPEG includes" >&5
++echo "configure:10125: 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; }
+@@ -10141,15 +10147,15 @@
+ do
+ ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
+ echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
+-echo "configure:10145: checking for $ac_hdr" >&5
++echo "configure:10151: checking for $ac_hdr" >&5
+
+ cat > conftest.$ac_ext <<EOF
+-#line 10148 "configure"
++#line 10154 "configure"
+ #include "confdefs.h"
+ #include <$ac_hdr>
+ EOF
+ ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+-{ (eval echo configure:10153: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:10159: \"$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*
+@@ -10185,15 +10191,15 @@
+ do
+ ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
+ echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
+-echo "configure:10189: checking for $ac_hdr" >&5
++echo "configure:10195: checking for $ac_hdr" >&5
+
+ cat > conftest.$ac_ext <<EOF
+-#line 10192 "configure"
++#line 10198 "configure"
+ #include "confdefs.h"
+ #include <$ac_hdr>
+ EOF
+ ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+-{ (eval echo configure:10197: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:10203: \"$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*
+@@ -10229,15 +10235,15 @@
+ do
+ ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
+ echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
+-echo "configure:10233: checking for $ac_hdr" >&5
++echo "configure:10239: checking for $ac_hdr" >&5
+
+ cat > conftest.$ac_ext <<EOF
+-#line 10236 "configure"
++#line 10242 "configure"
+ #include "confdefs.h"
+ #include <$ac_hdr>
+ EOF
+ ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+-{ (eval echo configure:10241: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:10247: \"$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*
+@@ -10280,7 +10286,7 @@
+
+
+ echo $ac_n "checking for location of FFMPEG library""... $ac_c" 1>&6
+-echo "configure:10284: checking for location of FFMPEG library" >&5
++echo "configure:10290: 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; }
+@@ -10307,13 +10313,13 @@
+
+
+ echo $ac_n "checking for av_free in -lavutil""... $ac_c" 1>&6
+-echo "configure:10311: checking for av_free in -lavutil" >&5
++echo "configure:10317: 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 10317 "configure"
++#line 10323 "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
+@@ -10324,7 +10330,7 @@
+ av_free()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:10328: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:10334: \"$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
+@@ -10343,13 +10349,13 @@
+ echo "$ac_t""no" 1>&6
+
+ echo $ac_n "checking for av_free in -lavutil""... $ac_c" 1>&6
+-echo "configure:10347: checking for av_free in -lavutil" >&5
++echo "configure:10353: 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 10353 "configure"
++#line 10359 "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
+@@ -10360,7 +10366,7 @@
+ av_free()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:10364: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:10370: \"$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
+@@ -10405,13 +10411,13 @@
+
+
+ echo $ac_n "checking for avcodec_register in -lavcodec""... $ac_c" 1>&6
+-echo "configure:10409: checking for avcodec_register in -lavcodec" >&5
++echo "configure:10415: checking for avcodec_register in -lavcodec" >&5
+ ac_lib_var=`echo avcodec'_'avcodec_register | sed 'y%./+-%__p_%'`
+
+ ac_save_LIBS="$LIBS"
+ LIBS="-lavcodec $FFMPEGLIB $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 10415 "configure"
++#line 10421 "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
+@@ -10422,7 +10428,7 @@
+ avcodec_register()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:10426: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:10432: \"$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
+@@ -10441,13 +10447,13 @@
+ echo "$ac_t""no" 1>&6
+
+ echo $ac_n "checking for avcodec_register in -lavcodec""... $ac_c" 1>&6
+-echo "configure:10445: checking for avcodec_register in -lavcodec" >&5
++echo "configure:10451: checking for avcodec_register in -lavcodec" >&5
+ ac_lib_var=`echo avcodec'_'avcodec_register | sed 'y%./+-%__p_%'`
+
+ ac_save_LIBS="$LIBS"
+ LIBS="-lavcodec $FFMPEGLIB $MATHLIB $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 10451 "configure"
++#line 10457 "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
+@@ -10458,7 +10464,7 @@
+ avcodec_register()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:10462: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:10468: \"$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
+@@ -10503,13 +10509,13 @@
+
+
+ echo $ac_n "checking for avformat_alloc_context in -lavformat""... $ac_c" 1>&6
+-echo "configure:10507: checking for avformat_alloc_context in -lavformat" >&5
++echo "configure:10513: checking for avformat_alloc_context in -lavformat" >&5
+ ac_lib_var=`echo avformat'_'avformat_alloc_context | sed 'y%./+-%__p_%'`
+
+ ac_save_LIBS="$LIBS"
+ LIBS="-lavformat $FFMPEGLIB $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 10513 "configure"
++#line 10519 "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
+@@ -10520,7 +10526,7 @@
+ avformat_alloc_context()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:10524: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:10530: \"$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
+@@ -10539,13 +10545,13 @@
+ echo "$ac_t""no" 1>&6
+
+ echo $ac_n "checking for avformat_alloc_context in -lavformat""... $ac_c" 1>&6
+-echo "configure:10543: checking for avformat_alloc_context in -lavformat" >&5
++echo "configure:10549: checking for avformat_alloc_context in -lavformat" >&5
+ ac_lib_var=`echo avformat'_'avformat_alloc_context | sed 'y%./+-%__p_%'`
+
+ ac_save_LIBS="$LIBS"
+ LIBS="-lavformat $FFMPEGLIB $MATHLIB $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 10549 "configure"
++#line 10555 "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
+@@ -10556,7 +10562,7 @@
+ avformat_alloc_context()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:10560: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:10566: \"$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
+@@ -10615,7 +10621,7 @@
+ OPENGL_WINDOWS=
+
+ echo $ac_n "checking whether to use OpenGL""... $ac_c" 1>&6
+-echo "configure:10619: checking whether to use OpenGL" >&5
++echo "configure:10625: checking whether to use OpenGL" >&5
+ echo "$ac_t"""$with_opengl"" 1>&6
+ case "$with_opengl" in
+ n|no)
+@@ -10649,7 +10655,7 @@
+
+
+ echo $ac_n "checking for location of OpenGL includes""... $ac_c" 1>&6
+-echo "configure:10653: checking for location of OpenGL includes" >&5
++echo "configure:10659: 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; }
+@@ -10675,15 +10681,15 @@
+ do
+ ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
+ echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
+-echo "configure:10679: checking for $ac_hdr" >&5
++echo "configure:10685: checking for $ac_hdr" >&5
+
+ cat > conftest.$ac_ext <<EOF
+-#line 10682 "configure"
++#line 10688 "configure"
+ #include "confdefs.h"
+ #include <$ac_hdr>
+ EOF
+ ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+-{ (eval echo configure:10687: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:10693: \"$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*
+@@ -10717,7 +10723,7 @@
+
+
+ echo $ac_n "checking for location of OpenGL library""... $ac_c" 1>&6
+-echo "configure:10721: checking for location of OpenGL library" >&5
++echo "configure:10727: 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; }
+@@ -10746,13 +10752,13 @@
+
+
+ echo $ac_n "checking for glBegin in -lGL""... $ac_c" 1>&6
+-echo "configure:10750: checking for glBegin in -lGL" >&5
++echo "configure:10756: 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 10756 "configure"
++#line 10762 "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
+@@ -10763,7 +10769,7 @@
+ glBegin()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:10767: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:10773: \"$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
+@@ -10782,13 +10788,13 @@
+ echo "$ac_t""no" 1>&6
+
+ echo $ac_n "checking for glBegin in -lGL""... $ac_c" 1>&6
+-echo "configure:10786: checking for glBegin in -lGL" >&5
++echo "configure:10792: 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 10792 "configure"
++#line 10798 "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
+@@ -10799,7 +10805,7 @@
+ glBegin()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:10803: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:10809: \"$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
+@@ -10818,13 +10824,13 @@
+ echo "$ac_t""no" 1>&6
+
+ echo $ac_n "checking for glBegin in -lGL""... $ac_c" 1>&6
+-echo "configure:10822: checking for glBegin in -lGL" >&5
++echo "configure:10828: 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 10828 "configure"
++#line 10834 "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
+@@ -10835,7 +10841,7 @@
+ glBegin()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:10839: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:10845: \"$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
+@@ -10854,13 +10860,13 @@
+ echo "$ac_t""no" 1>&6
+
+ echo $ac_n "checking for glBegin in -lGL""... $ac_c" 1>&6
+-echo "configure:10858: checking for glBegin in -lGL" >&5
++echo "configure:10864: 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 10864 "configure"
++#line 10870 "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
+@@ -10871,7 +10877,7 @@
+ glBegin()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:10875: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:10881: \"$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
+@@ -10933,13 +10939,13 @@
+
+
+ echo $ac_n "checking for gluBeginCurve in -lGLU""... $ac_c" 1>&6
+-echo "configure:10937: checking for gluBeginCurve in -lGLU" >&5
++echo "configure:10943: 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 10943 "configure"
++#line 10949 "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
+@@ -10950,7 +10956,7 @@
+ gluBeginCurve()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:10954: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:10960: \"$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
+@@ -10969,13 +10975,13 @@
+ echo "$ac_t""no" 1>&6
+
+ echo $ac_n "checking for gluBeginCurve in -lGLU""... $ac_c" 1>&6
+-echo "configure:10973: checking for gluBeginCurve in -lGLU" >&5
++echo "configure:10979: 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 10979 "configure"
++#line 10985 "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
+@@ -10986,7 +10992,7 @@
+ gluBeginCurve()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:10990: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:10996: \"$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
+@@ -11030,10 +11036,10 @@
+ ac_save_ldflags="$LDFLAGS"
+ LDFLAGS="$LDFLAGS $OPENGLLIB"
+ echo $ac_n "checking for glXCreatePbuffer""... $ac_c" 1>&6
+-echo "configure:11034: checking for glXCreatePbuffer" >&5
++echo "configure:11040: checking for glXCreatePbuffer" >&5
+
+ cat > conftest.$ac_ext <<EOF
+-#line 11037 "configure"
++#line 11043 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+ which can conflict with char glXCreatePbuffer(); below. */
+@@ -11056,7 +11062,7 @@
+
+ ; return 0; }
+ EOF
+-if { (eval echo configure:11060: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:11066: \"$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
+@@ -11078,10 +11084,10 @@
+ fi
+
+ echo $ac_n "checking for glXCreateGLXPixmap""... $ac_c" 1>&6
+-echo "configure:11082: checking for glXCreateGLXPixmap" >&5
++echo "configure:11088: checking for glXCreateGLXPixmap" >&5
+
+ cat > conftest.$ac_ext <<EOF
+-#line 11085 "configure"
++#line 11091 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+ which can conflict with char glXCreateGLXPixmap(); below. */
+@@ -11104,7 +11110,7 @@
+
+ ; return 0; }
+ EOF
+-if { (eval echo configure:11108: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:11114: \"$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
+@@ -11143,7 +11149,7 @@
+
+
+ echo $ac_n "checking for location of OpenGL includes""... $ac_c" 1>&6
+-echo "configure:11147: checking for location of OpenGL includes" >&5
++echo "configure:11153: 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; }
+@@ -11169,15 +11175,15 @@
+ do
+ ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
+ echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
+-echo "configure:11173: checking for $ac_hdr" >&5
++echo "configure:11179: checking for $ac_hdr" >&5
+
+ cat > conftest.$ac_ext <<EOF
+-#line 11176 "configure"
++#line 11182 "configure"
+ #include "confdefs.h"
+ #include <$ac_hdr>
+ EOF
+ ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+-{ (eval echo configure:11181: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:11187: \"$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*
+@@ -11212,10 +11218,10 @@
+ ac_save_ldflags="$LDFLAGS"
+ LDFLAGS="$with_opengl_libs $LDFLAGS"
+ echo $ac_n "checking for glBegin""... $ac_c" 1>&6
+-echo "configure:11216: checking for glBegin" >&5
++echo "configure:11222: checking for glBegin" >&5
+
+ cat > conftest.$ac_ext <<EOF
+-#line 11219 "configure"
++#line 11225 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+ which can conflict with char glBegin(); below. */
+@@ -11238,7 +11244,7 @@
+
+ ; return 0; }
+ EOF
+-if { (eval echo configure:11242: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:11248: \"$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
+@@ -11253,10 +11259,10 @@
+ echo "$ac_t""yes" 1>&6
+
+ echo $ac_n "checking for gluBeginCurve""... $ac_c" 1>&6
+-echo "configure:11257: checking for gluBeginCurve" >&5
++echo "configure:11263: checking for gluBeginCurve" >&5
+
+ cat > conftest.$ac_ext <<EOF
+-#line 11260 "configure"
++#line 11266 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+ which can conflict with char gluBeginCurve(); below. */
+@@ -11279,7 +11285,7 @@
+
+ ; return 0; }
+ EOF
+-if { (eval echo configure:11283: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:11289: \"$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
+@@ -11323,7 +11329,7 @@
+
+
+ echo $ac_n "checking for location of OpenGL includes""... $ac_c" 1>&6
+-echo "configure:11327: checking for location of OpenGL includes" >&5
++echo "configure:11333: 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; }
+@@ -11349,15 +11355,15 @@
+ do
+ ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
+ echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
+-echo "configure:11353: checking for $ac_hdr" >&5
++echo "configure:11359: checking for $ac_hdr" >&5
+
+ cat > conftest.$ac_ext <<EOF
+-#line 11356 "configure"
++#line 11362 "configure"
+ #include "confdefs.h"
+ #include <$ac_hdr>
+ EOF
+ ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+-{ (eval echo configure:11361: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:11367: \"$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*
+@@ -11391,7 +11397,7 @@
+
+
+ echo $ac_n "checking for location of OpenGL library""... $ac_c" 1>&6
+-echo "configure:11395: checking for location of OpenGL library" >&5
++echo "configure:11401: 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; }
+@@ -11416,18 +11422,18 @@
+ ac_save_ldflags="$LDFLAGS"
+ ac_save_libs="$LIBS"
+ echo $ac_n "checking for OpenGL library""... $ac_c" 1>&6
+-echo "configure:11420: checking for OpenGL library" >&5
++echo "configure:11426: checking for OpenGL library" >&5
+ LDFLAGS="$OPENGL_LIB_PATH $LDFLAGS"
+ LIBS="-lopengl32 "
+ cat > conftest.$ac_ext <<EOF
+-#line 11424 "configure"
++#line 11430 "configure"
+ #include "confdefs.h"
+ #include <GL/gl.h>
+ int main() {
+ glEnd();
+ ; return 0; }
+ EOF
+-if { (eval echo configure:11431: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:11437: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+ rm -rf conftest*
+
+ echo "$ac_t""found" 1>&6
+@@ -11451,18 +11457,18 @@
+ ac_save_ldflags="$LDFLAGS"
+ ac_save_libs="$LIBS"
+ echo $ac_n "checking for GLU library""... $ac_c" 1>&6
+-echo "configure:11455: checking for GLU library" >&5
++echo "configure:11461: checking for GLU library" >&5
+ LDFLAGS="$OPENGL_LIB_PATH $LDFLAGS"
+ LIBS="-lglu32 $OPENGLLIB "
+ cat > conftest.$ac_ext <<EOF
+-#line 11459 "configure"
++#line 11465 "configure"
+ #include "confdefs.h"
+ #include <GL/glu.h>
+ int main() {
+ gluNewQuadric();
+ ; return 0; }
+ EOF
+-if { (eval echo configure:11466: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:11472: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+ rm -rf conftest*
+
+ echo "$ac_t""found" 1>&6
+@@ -11511,7 +11517,7 @@
+
+
+ echo $ac_n "checking whether to use Tcl/Tk""... $ac_c" 1>&6
+-echo "configure:11515: checking whether to use Tcl/Tk" >&5
++echo "configure:11521: checking whether to use Tcl/Tk" >&5
+ echo "$ac_t"""$with_tcltk"" 1>&6
+ case "$with_tcltk" in
+ "no") USE_TCLTK= ;;
+@@ -11531,7 +11537,7 @@
+
+
+ echo $ac_n "checking for location of Tcl/Tk includes""... $ac_c" 1>&6
+-echo "configure:11535: checking for location of Tcl/Tk includes" >&5
++echo "configure:11541: 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; }
+@@ -11557,15 +11563,15 @@
+ do
+ ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
+ echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
+-echo "configure:11561: checking for $ac_hdr" >&5
++echo "configure:11567: checking for $ac_hdr" >&5
+
+ cat > conftest.$ac_ext <<EOF
+-#line 11564 "configure"
++#line 11570 "configure"
+ #include "confdefs.h"
+ #include <$ac_hdr>
+ EOF
+ ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+-{ (eval echo configure:11569: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:11575: \"$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*
+@@ -11602,15 +11608,15 @@
+ do
+ ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
+ echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
+-echo "configure:11606: checking for $ac_hdr" >&5
++echo "configure:11612: checking for $ac_hdr" >&5
+
+ cat > conftest.$ac_ext <<EOF
+-#line 11609 "configure"
++#line 11615 "configure"
+ #include "confdefs.h"
+ #include <$ac_hdr>
+ EOF
+ ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+-{ (eval echo configure:11614: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:11620: \"$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*
+@@ -11643,7 +11649,7 @@
+ # Tcl/Tk version checks
+
+ echo $ac_n "checking Tcl version""... $ac_c" 1>&6
+-echo "configure:11647: checking Tcl version" >&5
++echo "configure:11653: checking Tcl version" >&5
+ ac_save_cppflags="$CPPFLAGS"
+ CPPFLAGS="$TCLINCDIR $CPPFLAGS"
+ if test "$cross_compiling" = yes; then
+@@ -11651,7 +11657,7 @@
+ echo "$ac_t""unknown (cross-compiling)" 1>&6
+ else
+ cat > conftest.$ac_ext <<EOF
+-#line 11655 "configure"
++#line 11661 "configure"
+ #include "confdefs.h"
+
+ #include <stdio.h>
+@@ -11663,7 +11669,7 @@
+ }
+
+ EOF
+-if { (eval echo configure:11667: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:11673: \"$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
+@@ -11681,7 +11687,7 @@
+
+
+ echo $ac_n "checking Tk version""... $ac_c" 1>&6
+-echo "configure:11685: checking Tk version" >&5
++echo "configure:11691: checking Tk version" >&5
+ ac_save_cppflags="$CPPFLAGS"
+ CPPFLAGS="$TCLINCDIR $X_CFLAGS $CPPFLAGS"
+ if test "$cross_compiling" = yes; then
+@@ -11689,7 +11695,7 @@
+ echo "$ac_t""unknown (cross-compiling)" 1>&6
+ else
+ cat > conftest.$ac_ext <<EOF
+-#line 11693 "configure"
++#line 11699 "configure"
+ #include "confdefs.h"
+
+ #include <stdio.h>
+@@ -11701,7 +11707,7 @@
+ }
+
+ EOF
+-if { (eval echo configure:11705: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:11711: \"$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
+@@ -11732,7 +11738,7 @@
+
+
+ echo $ac_n "checking for location of Tcl/Tk library""... $ac_c" 1>&6
+-echo "configure:11736: checking for location of Tcl/Tk library" >&5
++echo "configure:11742: 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; }
+@@ -11772,13 +11778,13 @@
+
+
+ echo $ac_n "checking for Tcl_Init in -ltcl""... $ac_c" 1>&6
+-echo "configure:11776: checking for Tcl_Init in -ltcl" >&5
++echo "configure:11782: 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 11782 "configure"
++#line 11788 "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
+@@ -11789,7 +11795,7 @@
+ Tcl_Init()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:11793: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:11799: \"$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
+@@ -11808,13 +11814,13 @@
+ echo "$ac_t""no" 1>&6
+
+ echo $ac_n "checking for Tcl_Init in -ltcl""... $ac_c" 1>&6
+-echo "configure:11812: checking for Tcl_Init in -ltcl" >&5
++echo "configure:11818: 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 11818 "configure"
++#line 11824 "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
+@@ -11825,7 +11831,7 @@
+ Tcl_Init()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:11829: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:11835: \"$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
+@@ -11852,13 +11858,13 @@
+
+
+ echo $ac_n "checking for Tcl_Init in -ltcl$tcltk_ver""... $ac_c" 1>&6
+-echo "configure:11856: checking for Tcl_Init in -ltcl$tcltk_ver" >&5
++echo "configure:11862: 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 11862 "configure"
++#line 11868 "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
+@@ -11869,7 +11875,7 @@
+ Tcl_Init()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:11873: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:11879: \"$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
+@@ -11888,13 +11894,13 @@
+ echo "$ac_t""no" 1>&6
+
+ echo $ac_n "checking for Tcl_Init in -ltcl$tcltk_ver""... $ac_c" 1>&6
+-echo "configure:11892: checking for Tcl_Init in -ltcl$tcltk_ver" >&5
++echo "configure:11898: 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 11898 "configure"
++#line 11904 "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
+@@ -11905,7 +11911,7 @@
+ Tcl_Init()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:11909: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:11915: \"$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
+@@ -11932,13 +11938,13 @@
+
+
+ echo $ac_n "checking for Tcl_Init in -ltcl$tcltk_ver2""... $ac_c" 1>&6
+-echo "configure:11936: checking for Tcl_Init in -ltcl$tcltk_ver2" >&5
++echo "configure:11942: 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 11942 "configure"
++#line 11948 "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
+@@ -11949,7 +11955,7 @@
+ Tcl_Init()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:11953: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:11959: \"$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
+@@ -11968,13 +11974,13 @@
+ echo "$ac_t""no" 1>&6
+
+ echo $ac_n "checking for Tcl_Init in -ltcl$tcltk_ver2""... $ac_c" 1>&6
+-echo "configure:11972: checking for Tcl_Init in -ltcl$tcltk_ver2" >&5
++echo "configure:11978: 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 11978 "configure"
++#line 11984 "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
+@@ -11985,7 +11991,7 @@
+ Tcl_Init()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:11989: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:11995: \"$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
+@@ -12063,13 +12069,13 @@
+
+
+ echo $ac_n "checking for Tk_MainWindow in -ltk""... $ac_c" 1>&6
+-echo "configure:12067: checking for Tk_MainWindow in -ltk" >&5
++echo "configure:12073: 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 12073 "configure"
++#line 12079 "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
+@@ -12080,7 +12086,7 @@
+ Tk_MainWindow()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:12084: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:12090: \"$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
+@@ -12099,13 +12105,13 @@
+ echo "$ac_t""no" 1>&6
+
+ echo $ac_n "checking for Tk_MainWindow in -ltk""... $ac_c" 1>&6
+-echo "configure:12103: checking for Tk_MainWindow in -ltk" >&5
++echo "configure:12109: 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 12109 "configure"
++#line 12115 "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
+@@ -12116,7 +12122,7 @@
+ Tk_MainWindow()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:12120: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:12126: \"$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
+@@ -12143,13 +12149,13 @@
+
+
+ echo $ac_n "checking for Tk_MainWindow in -ltk$tcltk_ver""... $ac_c" 1>&6
+-echo "configure:12147: checking for Tk_MainWindow in -ltk$tcltk_ver" >&5
++echo "configure:12153: 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 12153 "configure"
++#line 12159 "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
+@@ -12160,7 +12166,7 @@
+ Tk_MainWindow()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:12164: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:12170: \"$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
+@@ -12179,13 +12185,13 @@
+ echo "$ac_t""no" 1>&6
+
+ echo $ac_n "checking for Tk_MainWindow in -ltk$tcltk_ver""... $ac_c" 1>&6
+-echo "configure:12183: checking for Tk_MainWindow in -ltk$tcltk_ver" >&5
++echo "configure:12189: 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 12189 "configure"
++#line 12195 "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
+@@ -12196,7 +12202,7 @@
+ Tk_MainWindow()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:12200: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:12206: \"$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
+@@ -12223,13 +12229,13 @@
+
+
+ echo $ac_n "checking for Tk_MainWindow in -ltk$tcltk_ver2""... $ac_c" 1>&6
+-echo "configure:12227: checking for Tk_MainWindow in -ltk$tcltk_ver2" >&5
++echo "configure:12233: 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 12233 "configure"
++#line 12239 "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
+@@ -12240,7 +12246,7 @@
+ Tk_MainWindow()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:12244: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:12250: \"$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
+@@ -12259,13 +12265,13 @@
+ echo "$ac_t""no" 1>&6
+
+ echo $ac_n "checking for Tk_MainWindow in -ltk$tcltk_ver2""... $ac_c" 1>&6
+-echo "configure:12263: checking for Tk_MainWindow in -ltk$tcltk_ver2" >&5
++echo "configure:12269: 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 12269 "configure"
++#line 12275 "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
+@@ -12276,7 +12282,7 @@
+ Tk_MainWindow()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:12280: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:12286: \"$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
+@@ -12366,13 +12372,13 @@
+ do
+ # add only if in MACOSX_ARCHS
+ echo $ac_n "checking for Tcl_Init in -l$tlib""... $ac_c" 1>&6
+-echo "configure:12370: checking for Tcl_Init in -l$tlib" >&5
++echo "configure:12376: checking for Tcl_Init in -l$tlib" >&5
+ ac_lib_var=`echo $tlib'_'Tcl_Init | sed 'y%./+-%__p_%'`
+
+ ac_save_LIBS="$LIBS"
+ LIBS="-l$tlib -arch $a $MACOSX_SDK $TCLTKLIBPATH $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 12376 "configure"
++#line 12382 "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
+@@ -12383,7 +12389,7 @@
+ Tcl_Init()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:12387: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:12393: \"$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
+@@ -12432,7 +12438,7 @@
+
+
+ echo $ac_n "checking whether to use ODBC""... $ac_c" 1>&6
+-echo "configure:12436: checking whether to use ODBC" >&5
++echo "configure:12442: checking whether to use ODBC" >&5
+ echo "$ac_t"""$with_odbc"" 1>&6
+ case "$with_odbc" in
+ "no") USE_ODBC= ;;
+@@ -12451,7 +12457,7 @@
+
+
+ echo $ac_n "checking for location of ODBC includes""... $ac_c" 1>&6
+-echo "configure:12455: checking for location of ODBC includes" >&5
++echo "configure:12461: 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; }
+@@ -12477,15 +12483,15 @@
+ do
+ ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
+ echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
+-echo "configure:12481: checking for $ac_hdr" >&5
++echo "configure:12487: checking for $ac_hdr" >&5
+
+ cat > conftest.$ac_ext <<EOF
+-#line 12484 "configure"
++#line 12490 "configure"
+ #include "confdefs.h"
+ #include <$ac_hdr>
+ EOF
+ ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+-{ (eval echo configure:12489: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:12495: \"$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*
+@@ -12519,7 +12525,7 @@
+
+
+ echo $ac_n "checking for location of ODBC library""... $ac_c" 1>&6
+-echo "configure:12523: checking for location of ODBC library" >&5
++echo "configure:12529: 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; }
+@@ -12544,13 +12550,13 @@
+
+
+ echo $ac_n "checking for SQLConnect in -lodbc""... $ac_c" 1>&6
+-echo "configure:12548: checking for SQLConnect in -lodbc" >&5
++echo "configure:12554: 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 12554 "configure"
++#line 12560 "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
+@@ -12561,7 +12567,7 @@
+ SQLConnect()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:12565: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:12571: \"$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
+@@ -12586,13 +12592,13 @@
+
+
+ echo $ac_n "checking for SQLConnect in -liodbc""... $ac_c" 1>&6
+-echo "configure:12590: checking for SQLConnect in -liodbc" >&5
++echo "configure:12596: 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 12596 "configure"
++#line 12602 "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
+@@ -12603,7 +12609,7 @@
+ SQLConnect()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:12607: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:12613: \"$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
+@@ -12628,11 +12634,11 @@
+ ac_save_ldflags="$LDFLAGS"
+ ac_save_libs="$LIBS"
+ echo $ac_n "checking for ODBC library""... $ac_c" 1>&6
+-echo "configure:12632: checking for ODBC library" >&5
++echo "configure:12638: checking for ODBC library" >&5
+ LDFLAGS="$ODBCLIB $LDFLAGS"
+ LIBS="-lodbc32 "
+ cat > conftest.$ac_ext <<EOF
+-#line 12636 "configure"
++#line 12642 "configure"
+ #include "confdefs.h"
+ #include <windows.h>
+ #include <sql.h>
+@@ -12640,7 +12646,7 @@
+ SQLAllocEnv((SQLHENV *)0);
+ ; return 0; }
+ EOF
+-if { (eval echo configure:12644: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:12650: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+ rm -rf conftest*
+
+ echo "$ac_t""found" 1>&6
+@@ -12689,7 +12695,7 @@
+
+
+ echo $ac_n "checking whether to use FFTW""... $ac_c" 1>&6
+-echo "configure:12693: checking whether to use FFTW" >&5
++echo "configure:12699: checking whether to use FFTW" >&5
+ echo "$ac_t"""$with_fftw"" 1>&6
+ case "$with_fftw" in
+ "no") USE_FFTW= ;;
+@@ -12708,7 +12714,7 @@
+
+
+ echo $ac_n "checking for location of FFTW includes""... $ac_c" 1>&6
+-echo "configure:12712: checking for location of FFTW includes" >&5
++echo "configure:12718: 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; }
+@@ -12734,15 +12740,15 @@
+ do
+ ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
+ echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
+-echo "configure:12738: checking for $ac_hdr" >&5
++echo "configure:12744: checking for $ac_hdr" >&5
+
+ cat > conftest.$ac_ext <<EOF
+-#line 12741 "configure"
++#line 12747 "configure"
+ #include "confdefs.h"
+ #include <$ac_hdr>
+ EOF
+ ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+-{ (eval echo configure:12746: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:12752: \"$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*
+@@ -12770,15 +12776,15 @@
+ do
+ ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
+ echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
+-echo "configure:12774: checking for $ac_hdr" >&5
++echo "configure:12780: checking for $ac_hdr" >&5
+
+ cat > conftest.$ac_ext <<EOF
+-#line 12777 "configure"
++#line 12783 "configure"
+ #include "confdefs.h"
+ #include <$ac_hdr>
+ EOF
+ ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+-{ (eval echo configure:12782: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:12788: \"$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*
+@@ -12806,15 +12812,15 @@
+ do
+ ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
+ echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
+-echo "configure:12810: checking for $ac_hdr" >&5
++echo "configure:12816: checking for $ac_hdr" >&5
+
+ cat > conftest.$ac_ext <<EOF
+-#line 12813 "configure"
++#line 12819 "configure"
+ #include "confdefs.h"
+ #include <$ac_hdr>
+ EOF
+ ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+-{ (eval echo configure:12818: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:12824: \"$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*
+@@ -12860,7 +12866,7 @@
+
+
+ echo $ac_n "checking for location of FFTW library""... $ac_c" 1>&6
+-echo "configure:12864: checking for location of FFTW library" >&5
++echo "configure:12870: 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; }
+@@ -12885,13 +12891,13 @@
+
+
+ echo $ac_n "checking for fftw_execute in -lfftw3""... $ac_c" 1>&6
+-echo "configure:12889: checking for fftw_execute in -lfftw3" >&5
++echo "configure:12895: 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 12895 "configure"
++#line 12901 "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
+@@ -12902,7 +12908,7 @@
+ fftw_execute()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:12906: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:12912: \"$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
+@@ -12927,13 +12933,13 @@
+
+
+ echo $ac_n "checking for fftwnd_one in -lfftw""... $ac_c" 1>&6
+-echo "configure:12931: checking for fftwnd_one in -lfftw" >&5
++echo "configure:12937: 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 12937 "configure"
++#line 12943 "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
+@@ -12944,7 +12950,7 @@
+ fftwnd_one()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:12948: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:12954: \"$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
+@@ -12969,13 +12975,13 @@
+
+
+ echo $ac_n "checking for fftwnd_one in -ldfftw""... $ac_c" 1>&6
+-echo "configure:12973: checking for fftwnd_one in -ldfftw" >&5
++echo "configure:12979: 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 12979 "configure"
++#line 12985 "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
+@@ -12986,7 +12992,7 @@
+ fftwnd_one()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:12990: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:12996: \"$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
+@@ -13043,7 +13049,7 @@
+
+
+ echo $ac_n "checking whether to use BLAS""... $ac_c" 1>&6
+-echo "configure:13047: checking whether to use BLAS" >&5
++echo "configure:13053: checking whether to use BLAS" >&5
+ echo "$ac_t"""$with_blas"" 1>&6
+ case "$with_blas" in
+ "no") USE_BLAS= ;;
+@@ -13064,7 +13070,7 @@
+
+
+ echo $ac_n "checking for location of BLAS includes""... $ac_c" 1>&6
+-echo "configure:13068: checking for location of BLAS includes" >&5
++echo "configure:13074: 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; }
+@@ -13084,7 +13090,7 @@
+
+
+ echo $ac_n "checking for location of BLAS library""... $ac_c" 1>&6
+-echo "configure:13088: checking for location of BLAS library" >&5
++echo "configure:13094: 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; }
+@@ -13110,15 +13116,15 @@
+ do
+ ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
+ echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
+-echo "configure:13114: checking for $ac_hdr" >&5
++echo "configure:13120: checking for $ac_hdr" >&5
+
+ cat > conftest.$ac_ext <<EOF
+-#line 13117 "configure"
++#line 13123 "configure"
+ #include "confdefs.h"
+ #include <$ac_hdr>
+ EOF
+ ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+-{ (eval echo configure:13122: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:13128: \"$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*
+@@ -13153,13 +13159,13 @@
+
+
+ echo $ac_n "checking for dnrm2_ in -lblas""... $ac_c" 1>&6
+-echo "configure:13157: checking for dnrm2_ in -lblas" >&5
++echo "configure:13163: 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 13163 "configure"
++#line 13169 "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
+@@ -13170,7 +13176,7 @@
+ dnrm2_()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:13174: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:13180: \"$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
+@@ -13189,13 +13195,13 @@
+ echo "$ac_t""no" 1>&6
+
+ echo $ac_n "checking for dnrm2_ in -lblas""... $ac_c" 1>&6
+-echo "configure:13193: checking for dnrm2_ in -lblas" >&5
++echo "configure:13199: 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 13199 "configure"
++#line 13205 "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
+@@ -13206,7 +13212,7 @@
+ dnrm2_()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:13210: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:13216: \"$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
+@@ -13250,13 +13256,13 @@
+ save_LDFLAGS="$LDFLAGS"
+ LDFLAGS="$BLASLIB $LDFLAGS"
+ echo $ac_n "checking for ATL_xerbla in -latlas""... $ac_c" 1>&6
+-echo "configure:13254: checking for ATL_xerbla in -latlas" >&5
++echo "configure:13260: 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 13260 "configure"
++#line 13266 "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
+@@ -13267,7 +13273,7 @@
+ ATL_xerbla()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:13271: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:13277: \"$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
+@@ -13282,13 +13288,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:13286: checking for sgemm_ in -lf77blas" >&5
++echo "configure:13292: 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 13292 "configure"
++#line 13298 "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
+@@ -13299,7 +13305,7 @@
+ sgemm_()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:13303: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:13309: \"$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
+@@ -13314,13 +13320,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:13318: checking for cblas_dgemm in -lcblas" >&5
++echo "configure:13324: 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 13324 "configure"
++#line 13330 "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
+@@ -13331,7 +13337,7 @@
+ cblas_dgemm()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:13335: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:13341: \"$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
+@@ -13377,16 +13383,16 @@
+ save_LIBS="$LIBS"
+ LIBS="$vlib_flags $LIBS"
+ echo $ac_n "checking for sgemm in $vlib_flags""... $ac_c" 1>&6
+-echo "configure:13381: checking for sgemm in $vlib_flags" >&5
++echo "configure:13387: checking for sgemm in $vlib_flags" >&5
+ cat > conftest.$ac_ext <<EOF
+-#line 13383 "configure"
++#line 13389 "configure"
+ #include "confdefs.h"
+
+ int main() {
+ sgemm
+ ; return 0; }
+ EOF
+-if { (eval echo configure:13390: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:13396: \"$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
+@@ -13404,13 +13410,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:13408: checking for sgemm_ in -lblas" >&5
++echo "configure:13414: 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 13414 "configure"
++#line 13420 "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
+@@ -13421,7 +13427,7 @@
+ sgemm_()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:13425: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:13431: \"$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
+@@ -13436,13 +13442,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:13440: checking for dgemm_ in -ldgemm" >&5
++echo "configure:13446: 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 13446 "configure"
++#line 13452 "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
+@@ -13453,7 +13459,7 @@
+ dgemm_()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:13457: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:13463: \"$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
+@@ -13468,13 +13474,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:13472: checking for sgemm_ in -lsgemm" >&5
++echo "configure:13478: 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 13478 "configure"
++#line 13484 "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
+@@ -13485,7 +13491,7 @@
+ sgemm_()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:13489: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:13495: \"$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
+@@ -13519,13 +13525,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:13523: checking for acosp in -lsunmath" >&5
++echo "configure:13529: 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 13529 "configure"
++#line 13535 "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
+@@ -13536,7 +13542,7 @@
+ acosp()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:13540: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:13546: \"$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
+@@ -13551,13 +13557,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:13555: checking for sgemm_ in -lsunperf" >&5
++echo "configure:13561: 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 13561 "configure"
++#line 13567 "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
+@@ -13568,7 +13574,7 @@
+ sgemm_()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:13572: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:13578: \"$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
+@@ -13598,13 +13604,13 @@
+ # Generic BLAS library
+ if test $blas_ok = no; then
+ echo $ac_n "checking for sgemm_ in -lblas""... $ac_c" 1>&6
+-echo "configure:13602: checking for sgemm_ in -lblas" >&5
++echo "configure:13608: 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 13608 "configure"
++#line 13614 "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
+@@ -13615,7 +13621,7 @@
+ sgemm_()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:13619: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:13625: \"$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
+@@ -13654,7 +13660,7 @@
+
+
+ echo $ac_n "checking whether to use LAPACK""... $ac_c" 1>&6
+-echo "configure:13658: checking whether to use LAPACK" >&5
++echo "configure:13664: checking whether to use LAPACK" >&5
+ echo "$ac_t"""$with_lapack"" 1>&6
+ case "$with_lapack" in
+ "no") USE_LAPACK= ;;
+@@ -13679,7 +13685,7 @@
+
+
+ echo $ac_n "checking for location of LAPACK includes""... $ac_c" 1>&6
+-echo "configure:13683: checking for location of LAPACK includes" >&5
++echo "configure:13689: 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; }
+@@ -13699,7 +13705,7 @@
+
+
+ echo $ac_n "checking for location of LAPACK library""... $ac_c" 1>&6
+-echo "configure:13703: checking for location of LAPACK library" >&5
++echo "configure:13709: 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; }
+@@ -13725,15 +13731,15 @@
+ do
+ ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
+ echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
+-echo "configure:13729: checking for $ac_hdr" >&5
++echo "configure:13735: checking for $ac_hdr" >&5
+
+ cat > conftest.$ac_ext <<EOF
+-#line 13732 "configure"
++#line 13738 "configure"
+ #include "confdefs.h"
+ #include <$ac_hdr>
+ EOF
+ ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+-{ (eval echo configure:13737: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:13743: \"$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*
+@@ -13765,10 +13771,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:13769: checking for dsegv_" >&5
++echo "configure:13775: checking for dsegv_" >&5
+
+ cat > conftest.$ac_ext <<EOF
+-#line 13772 "configure"
++#line 13778 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+ which can conflict with char dsegv_(); below. */
+@@ -13791,7 +13797,7 @@
+
+ ; return 0; }
+ EOF
+-if { (eval echo configure:13795: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:13801: \"$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
+@@ -13818,13 +13824,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:13822: checking for desgv_ in -llapack" >&5
++echo "configure:13828: 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 13828 "configure"
++#line 13834 "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
+@@ -13835,7 +13841,7 @@
+ desgv_()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:13839: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:13845: \"$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
+@@ -13867,13 +13873,13 @@
+
+
+ echo $ac_n "checking for dgesv_ in -llapack""... $ac_c" 1>&6
+-echo "configure:13871: checking for dgesv_ in -llapack" >&5
++echo "configure:13877: 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 13877 "configure"
++#line 13883 "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
+@@ -13884,7 +13890,7 @@
+ dgesv_()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:13888: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:13894: \"$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
+@@ -13903,13 +13909,13 @@
+ echo "$ac_t""no" 1>&6
+
+ echo $ac_n "checking for dgesv_ in -llapack""... $ac_c" 1>&6
+-echo "configure:13907: checking for dgesv_ in -llapack" >&5
++echo "configure:13913: 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 13913 "configure"
++#line 13919 "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
+@@ -13920,7 +13926,7 @@
+ dgesv_()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:13924: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:13930: \"$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
+@@ -13976,7 +13982,7 @@
+
+
+ echo $ac_n "checking whether to use Motif""... $ac_c" 1>&6
+-echo "configure:13980: checking whether to use Motif" >&5
++echo "configure:13986: checking whether to use Motif" >&5
+ echo "$ac_t"""$with_motif"" 1>&6
+ case "$with_motif" in
+ "no") USE_MOTIF= ;;
+@@ -13995,7 +14001,7 @@
+
+
+ echo $ac_n "checking for location of Motif includes""... $ac_c" 1>&6
+-echo "configure:13999: checking for location of Motif includes" >&5
++echo "configure:14005: 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; }
+@@ -14021,15 +14027,15 @@
+ do
+ ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
+ echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
+-echo "configure:14025: checking for $ac_hdr" >&5
++echo "configure:14031: checking for $ac_hdr" >&5
+
+ cat > conftest.$ac_ext <<EOF
+-#line 14028 "configure"
++#line 14034 "configure"
+ #include "confdefs.h"
+ #include <$ac_hdr>
+ EOF
+ ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+-{ (eval echo configure:14033: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:14039: \"$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*
+@@ -14063,7 +14069,7 @@
+
+
+ echo $ac_n "checking for location of Motif library""... $ac_c" 1>&6
+-echo "configure:14067: checking for location of Motif library" >&5
++echo "configure:14073: 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; }
+@@ -14088,13 +14094,13 @@
+
+
+ echo $ac_n "checking for XmStringCreate in -lXm""... $ac_c" 1>&6
+-echo "configure:14092: checking for XmStringCreate in -lXm" >&5
++echo "configure:14098: 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 14098 "configure"
++#line 14104 "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
+@@ -14105,7 +14111,7 @@
+ XmStringCreate()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:14109: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:14115: \"$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
+@@ -14146,7 +14152,7 @@
+
+
+ echo $ac_n "checking whether to use Cairo""... $ac_c" 1>&6
+-echo "configure:14150: checking whether to use Cairo" >&5
++echo "configure:14156: checking whether to use Cairo" >&5
+ echo "$ac_t"""$with_cairo"" 1>&6
+ case "$with_cairo" in
+ "no") USE_CAIRO= ;;
+@@ -14178,7 +14184,7 @@
+
+
+ echo $ac_n "checking for location of cairo includes""... $ac_c" 1>&6
+-echo "configure:14182: checking for location of cairo includes" >&5
++echo "configure:14188: checking for location of cairo includes" >&5
+ case "$with_cairo_includes" in
+ y | ye | yes | n | no)
+ { echo "configure: error: *** You must supply a directory to --with-cairo-includes." 1>&2; exit 1; }
+@@ -14204,15 +14210,15 @@
+ do
+ ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
+ echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
+-echo "configure:14208: checking for $ac_hdr" >&5
++echo "configure:14214: checking for $ac_hdr" >&5
+
+ cat > conftest.$ac_ext <<EOF
+-#line 14211 "configure"
++#line 14217 "configure"
+ #include "confdefs.h"
+ #include <$ac_hdr>
+ EOF
+ ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+-{ (eval echo configure:14216: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:14222: \"$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*
+@@ -14248,7 +14254,7 @@
+
+
+ echo $ac_n "checking for location of cairo library""... $ac_c" 1>&6
+-echo "configure:14252: checking for location of cairo library" >&5
++echo "configure:14258: checking for location of cairo library" >&5
+ case "$with_cairo_libs" in
+ y | ye | yes | n | no)
+ { echo "configure: error: *** You must supply a directory to --with-cairo-libs." 1>&2; exit 1; }
+@@ -14268,7 +14274,7 @@
+
+
+ echo $ac_n "checking for cairo linking flags""... $ac_c" 1>&6
+-echo "configure:14272: checking for cairo linking flags" >&5
++echo "configure:14278: checking for cairo linking flags" >&5
+ case "$with_cairo_ldflags" in
+ y | ye | yes | n | no)
+ { echo "configure: error: *** You must supply a directory to --with-cairo-ldflags." 1>&2; exit 1; }
+@@ -14284,10 +14290,10 @@
+ LIBS=" $CAIROLIB $LIBS"
+ LDFLAGS=" $LDFLAGS"
+ echo $ac_n "checking for cairo_create""... $ac_c" 1>&6
+-echo "configure:14288: checking for cairo_create" >&5
++echo "configure:14294: checking for cairo_create" >&5
+
+ cat > conftest.$ac_ext <<EOF
+-#line 14291 "configure"
++#line 14297 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+ which can conflict with char cairo_create(); below. */
+@@ -14310,7 +14316,7 @@
+
+ ; return 0; }
+ EOF
+-if { (eval echo configure:14314: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:14320: \"$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
+@@ -14344,10 +14350,10 @@
+ LIBS=" $CAIROLIB $LIBS"
+ LDFLAGS=" $LDFLAGS"
+ echo $ac_n "checking for cairo_xlib_surface_create_with_xrender_format""... $ac_c" 1>&6
+-echo "configure:14348: checking for cairo_xlib_surface_create_with_xrender_format" >&5
++echo "configure:14354: checking for cairo_xlib_surface_create_with_xrender_format" >&5
+
+ cat > conftest.$ac_ext <<EOF
+-#line 14351 "configure"
++#line 14357 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+ which can conflict with char cairo_xlib_surface_create_with_xrender_format(); below. */
+@@ -14370,7 +14376,7 @@
+
+ ; return 0; }
+ EOF
+-if { (eval echo configure:14374: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:14380: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+ rm -rf conftest*
+ eval "ac_cv_func_cairo_xlib_surface_create_with_xrender_format=yes"
+ else
+@@ -14403,10 +14409,10 @@
+ LIBS=" $CAIROLIB $LIBS"
+ LDFLAGS=" $LDFLAGS"
+ echo $ac_n "checking for cairo_xlib_surface_get_xrender_format""... $ac_c" 1>&6
+-echo "configure:14407: checking for cairo_xlib_surface_get_xrender_format" >&5
++echo "configure:14413: checking for cairo_xlib_surface_get_xrender_format" >&5
+
+ cat > conftest.$ac_ext <<EOF
+-#line 14410 "configure"
++#line 14416 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+ which can conflict with char cairo_xlib_surface_get_xrender_format(); below. */
+@@ -14429,7 +14435,7 @@
+
+ ; return 0; }
+ EOF
+-if { (eval echo configure:14433: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:14439: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+ rm -rf conftest*
+ eval "ac_cv_func_cairo_xlib_surface_get_xrender_format=yes"
+ else
+@@ -14471,7 +14477,7 @@
+
+
+ echo $ac_n "checking whether to use GLw""... $ac_c" 1>&6
+-echo "configure:14475: checking whether to use GLw" >&5
++echo "configure:14481: checking whether to use GLw" >&5
+ echo "$ac_t"""$with_glw"" 1>&6
+ case "$with_glw" in
+ "no") USE_GLW= ;;
+@@ -14490,7 +14496,7 @@
+
+
+ echo $ac_n "checking for location of GLw includes""... $ac_c" 1>&6
+-echo "configure:14494: checking for location of GLw includes" >&5
++echo "configure:14500: 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; }
+@@ -14516,15 +14522,15 @@
+ do
+ ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
+ echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
+-echo "configure:14520: checking for $ac_hdr" >&5
++echo "configure:14526: checking for $ac_hdr" >&5
+
+ cat > conftest.$ac_ext <<EOF
+-#line 14523 "configure"
++#line 14529 "configure"
+ #include "confdefs.h"
+ #include <$ac_hdr>
+ EOF
+ ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+-{ (eval echo configure:14528: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:14534: \"$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*
+@@ -14552,15 +14558,15 @@
+ do
+ ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
+ echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
+-echo "configure:14556: checking for $ac_hdr" >&5
++echo "configure:14562: checking for $ac_hdr" >&5
+
+ cat > conftest.$ac_ext <<EOF
+-#line 14559 "configure"
++#line 14565 "configure"
+ #include "confdefs.h"
+ #include <$ac_hdr>
+ EOF
+ ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+-{ (eval echo configure:14564: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:14570: \"$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*
+@@ -14600,7 +14606,7 @@
+
+
+ echo $ac_n "checking for location of GLw library""... $ac_c" 1>&6
+-echo "configure:14604: checking for location of GLw library" >&5
++echo "configure:14610: 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; }
+@@ -14625,13 +14631,13 @@
+
+
+ echo $ac_n "checking for GLwCreateMDrawingArea in -lGLw""... $ac_c" 1>&6
+-echo "configure:14629: checking for GLwCreateMDrawingArea in -lGLw" >&5
++echo "configure:14635: 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 14635 "configure"
++#line 14641 "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
+@@ -14642,7 +14648,7 @@
+ GLwCreateMDrawingArea()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:14646: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:14652: \"$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
+@@ -14667,13 +14673,13 @@
+
+
+ echo $ac_n "checking for GLwCreateM1DrawingArea in -lGLw""... $ac_c" 1>&6
+-echo "configure:14671: checking for GLwCreateM1DrawingArea in -lGLw" >&5
++echo "configure:14677: 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 14677 "configure"
++#line 14683 "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
+@@ -14684,7 +14690,7 @@
+ GLwCreateM1DrawingArea()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:14688: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:14694: \"$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
+@@ -14709,13 +14715,13 @@
+
+
+ echo $ac_n "checking for GLwCreateM2DrawingArea in -lGLw""... $ac_c" 1>&6
+-echo "configure:14713: checking for GLwCreateM2DrawingArea in -lGLw" >&5
++echo "configure:14719: 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 14719 "configure"
++#line 14725 "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
+@@ -14726,7 +14732,7 @@
+ GLwCreateM2DrawingArea()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:14730: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:14736: \"$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
+@@ -14751,13 +14757,13 @@
+
+
+ echo $ac_n "checking for GLwCreateMDrawingArea in -lGLwM""... $ac_c" 1>&6
+-echo "configure:14755: checking for GLwCreateMDrawingArea in -lGLwM" >&5
++echo "configure:14761: 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 14761 "configure"
++#line 14767 "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
+@@ -14768,7 +14774,7 @@
+ GLwCreateMDrawingArea()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:14772: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:14778: \"$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
+@@ -14793,13 +14799,13 @@
+
+
+ echo $ac_n "checking for GLwCreateM1DrawingArea in -lGLwM""... $ac_c" 1>&6
+-echo "configure:14797: checking for GLwCreateM1DrawingArea in -lGLwM" >&5
++echo "configure:14803: 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 14803 "configure"
++#line 14809 "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
+@@ -14810,7 +14816,7 @@
+ GLwCreateM1DrawingArea()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:14814: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:14820: \"$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
+@@ -14835,13 +14841,13 @@
+
+
+ echo $ac_n "checking for GLwCreateM2DrawingArea in -lGLwM""... $ac_c" 1>&6
+-echo "configure:14839: checking for GLwCreateM2DrawingArea in -lGLwM" >&5
++echo "configure:14845: 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 14845 "configure"
++#line 14851 "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
+@@ -14852,7 +14858,7 @@
+ GLwCreateM2DrawingArea()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:14856: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:14862: \"$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
+@@ -14879,13 +14885,13 @@
+
+
+ echo $ac_n "checking for GLwCreateMDrawingArea in -lMesaGLw""... $ac_c" 1>&6
+-echo "configure:14883: checking for GLwCreateMDrawingArea in -lMesaGLw" >&5
++echo "configure:14889: 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 14889 "configure"
++#line 14895 "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
+@@ -14896,7 +14902,7 @@
+ GLwCreateMDrawingArea()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:14900: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:14906: \"$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
+@@ -14915,13 +14921,13 @@
+ echo "$ac_t""no" 1>&6
+
+ echo $ac_n "checking for GLwCreateMDrawingArea in -lMesaGLw""... $ac_c" 1>&6
+-echo "configure:14919: checking for GLwCreateMDrawingArea in -lMesaGLw" >&5
++echo "configure:14925: 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 14925 "configure"
++#line 14931 "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
+@@ -14932,7 +14938,7 @@
+ GLwCreateMDrawingArea()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:14936: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:14942: \"$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
+@@ -14959,13 +14965,13 @@
+
+
+ echo $ac_n "checking for GLwCreateMDrawingArea in -lMesaGLwM""... $ac_c" 1>&6
+-echo "configure:14963: checking for GLwCreateMDrawingArea in -lMesaGLwM" >&5
++echo "configure:14969: 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 14969 "configure"
++#line 14975 "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
+@@ -14976,7 +14982,7 @@
+ GLwCreateMDrawingArea()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:14980: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:14986: \"$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
+@@ -14995,13 +15001,13 @@
+ echo "$ac_t""no" 1>&6
+
+ echo $ac_n "checking for GLwCreateMDrawingArea in -lMesaGLwM""... $ac_c" 1>&6
+-echo "configure:14999: checking for GLwCreateMDrawingArea in -lMesaGLwM" >&5
++echo "configure:15005: 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 15005 "configure"
++#line 15011 "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
+@@ -15012,7 +15018,7 @@
+ GLwCreateMDrawingArea()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:15016: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:15022: \"$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
+@@ -15125,7 +15131,7 @@
+
+
+ echo $ac_n "checking whether to use FreeType""... $ac_c" 1>&6
+-echo "configure:15129: checking whether to use FreeType" >&5
++echo "configure:15135: checking whether to use FreeType" >&5
+ echo "$ac_t"""$with_freetype"" 1>&6
+ case "$with_freetype" in
+ "no") USE_FREETYPE= ;;
+@@ -15144,7 +15150,7 @@
+
+
+ echo $ac_n "checking for location of FreeType includes""... $ac_c" 1>&6
+-echo "configure:15148: checking for location of FreeType includes" >&5
++echo "configure:15154: 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; }
+@@ -15170,15 +15176,15 @@
+ do
+ ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
+ echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
+-echo "configure:15174: checking for $ac_hdr" >&5
++echo "configure:15180: checking for $ac_hdr" >&5
+
+ cat > conftest.$ac_ext <<EOF
+-#line 15177 "configure"
++#line 15183 "configure"
+ #include "confdefs.h"
+ #include <$ac_hdr>
+ EOF
+ ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+-{ (eval echo configure:15182: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:15188: \"$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*
+@@ -15212,7 +15218,7 @@
+
+
+ echo $ac_n "checking for location of FreeType library""... $ac_c" 1>&6
+-echo "configure:15216: checking for location of FreeType library" >&5
++echo "configure:15222: 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; }
+@@ -15237,13 +15243,13 @@
+
+
+ echo $ac_n "checking for FT_Init_FreeType in -lfreetype""... $ac_c" 1>&6
+-echo "configure:15241: checking for FT_Init_FreeType in -lfreetype" >&5
++echo "configure:15247: 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 15247 "configure"
++#line 15253 "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
+@@ -15254,7 +15260,7 @@
+ FT_Init_FreeType()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:15258: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:15264: \"$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
+@@ -15295,7 +15301,7 @@
+
+
+ echo $ac_n "checking whether to use NLS""... $ac_c" 1>&6
+-echo "configure:15299: checking whether to use NLS" >&5
++echo "configure:15305: checking whether to use NLS" >&5
+ echo "$ac_t"""$with_nls"" 1>&6
+ case "$with_nls" in
+ "no") USE_NLS= ;;
+@@ -15315,10 +15321,10 @@
+
+
+ echo $ac_n "checking for gettext""... $ac_c" 1>&6
+-echo "configure:15319: checking for gettext" >&5
++echo "configure:15325: checking for gettext" >&5
+
+ cat > conftest.$ac_ext <<EOF
+-#line 15322 "configure"
++#line 15328 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+ which can conflict with char gettext(); below. */
+@@ -15341,7 +15347,7 @@
+
+ ; return 0; }
+ EOF
+-if { (eval echo configure:15345: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:15351: \"$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
+@@ -15359,13 +15365,13 @@
+ echo "$ac_t""no" 1>&6
+
+ echo $ac_n "checking for gettext in -lintl""... $ac_c" 1>&6
+-echo "configure:15363: checking for gettext in -lintl" >&5
++echo "configure:15369: 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 15369 "configure"
++#line 15375 "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
+@@ -15376,7 +15382,7 @@
+ gettext()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:15380: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:15386: \"$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
+@@ -15411,7 +15417,7 @@
+
+
+ echo $ac_n "checking whether to use C++""... $ac_c" 1>&6
+-echo "configure:15415: checking whether to use C++" >&5
++echo "configure:15421: checking whether to use C++" >&5
+ echo "$ac_t"""$with_cxx"" 1>&6
+ case "$with_cxx" in
+ "no") USE_CXX= ;;
+@@ -15427,7 +15433,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:15431: checking for $ac_word" >&5
++echo "configure:15437: checking for $ac_word" >&5
+
+ if test -n "$CXX"; then
+ ac_cv_prog_CXX="$CXX" # Let the user override the test.
+@@ -15456,7 +15462,7 @@
+
+
+ echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works""... $ac_c" 1>&6
+-echo "configure:15460: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5
++echo "configure:15466: 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.
+@@ -15467,12 +15473,12 @@
+
+ cat > conftest.$ac_ext << EOF
+
+-#line 15471 "configure"
++#line 15477 "configure"
+ #include "confdefs.h"
+
+ int main(){return(0);}
+ EOF
+-if { (eval echo configure:15476: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:15482: \"$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
+@@ -15498,19 +15504,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:15502: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5
++echo "configure:15508: 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:15507: checking whether we are using GNU C++" >&5
++echo "configure:15513: 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:15514: \"$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:15520: \"$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
+@@ -15528,7 +15534,7 @@
+ ac_save_CXXFLAGS="$CXXFLAGS"
+ CXXFLAGS=
+ echo $ac_n "checking whether ${CXX-g++} accepts -g""... $ac_c" 1>&6
+-echo "configure:15532: checking whether ${CXX-g++} accepts -g" >&5
++echo "configure:15538: checking whether ${CXX-g++} accepts -g" >&5
+
+ echo 'void f(){}' > conftest.cc
+ if test -z "`${CXX-g++} -g -c conftest.cc 2>&1`"; then
+@@ -15569,7 +15575,7 @@
+
+
+ echo $ac_n "checking whether to use openDWG""... $ac_c" 1>&6
+-echo "configure:15573: checking whether to use openDWG" >&5
++echo "configure:15579: checking whether to use openDWG" >&5
+ echo "$ac_t"""$with_opendwg"" 1>&6
+ case "$with_opendwg" in
+ "no") USE_OPENDWG= ;;
+@@ -15589,7 +15595,7 @@
+
+
+ echo $ac_n "checking for location of openDGW includes""... $ac_c" 1>&6
+-echo "configure:15593: checking for location of openDGW includes" >&5
++echo "configure:15599: 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; }
+@@ -15615,15 +15621,15 @@
+ do
+ ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
+ echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
+-echo "configure:15619: checking for $ac_hdr" >&5
++echo "configure:15625: checking for $ac_hdr" >&5
+
+ cat > conftest.$ac_ext <<EOF
+-#line 15622 "configure"
++#line 15628 "configure"
+ #include "confdefs.h"
+ #include <$ac_hdr>
+ EOF
+ ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+-{ (eval echo configure:15627: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:15633: \"$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*
+@@ -15657,7 +15663,7 @@
+
+
+ echo $ac_n "checking for location of openDWG library""... $ac_c" 1>&6
+-echo "configure:15661: checking for location of openDWG library" >&5
++echo "configure:15667: 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; }
+@@ -15704,7 +15710,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:15708: checking for special C compiler options needed for large files" >&5
++echo "configure:15714: checking for special C compiler options needed for large files" >&5
+
+ ac_cv_sys_largefile_CC=no
+ largefile_cc_opt=""
+@@ -15712,7 +15718,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 15716 "configure"
++#line 15722 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ /* Check that off_t can represent 2**63 - 1 correctly.
+@@ -15728,7 +15734,7 @@
+
+ ; return 0; }
+ EOF
+-if { (eval echo configure:15732: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:15738: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+ :
+ else
+ echo "configure: failed program was:" >&5
+@@ -15737,7 +15743,7 @@
+ ac_save_CC="${CC-cc}"
+ CC="$CC -n32"
+ cat > conftest.$ac_ext <<EOF
+-#line 15741 "configure"
++#line 15747 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ /* Check that off_t can represent 2**63 - 1 correctly.
+@@ -15753,7 +15759,7 @@
+
+ ; return 0; }
+ EOF
+-if { (eval echo configure:15757: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:15763: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+ rm -rf conftest*
+ ac_cv_sys_largefile_CC=' -n32'
+ else
+@@ -15773,11 +15779,11 @@
+ fi
+
+ echo $ac_n "checking for _FILE_OFFSET_BITS value needed for large files""... $ac_c" 1>&6
+-echo "configure:15777: checking for _FILE_OFFSET_BITS value needed for large files" >&5
++echo "configure:15783: checking for _FILE_OFFSET_BITS value needed for large files" >&5
+
+ ac_cv_sys_file_offset_bits=no
+ cat > conftest.$ac_ext <<EOF
+-#line 15781 "configure"
++#line 15787 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ /* Check that off_t can represent 2**63 - 1 correctly.
+@@ -15793,14 +15799,14 @@
+
+ ; return 0; }
+ EOF
+-if { (eval echo configure:15797: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:15803: \"$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 15804 "configure"
++#line 15810 "configure"
+ #include "confdefs.h"
+ #define _FILE_OFFSET_BITS 64
+ #include <sys/types.h>
+@@ -15818,7 +15824,7 @@
+
+ ; return 0; }
+ EOF
+-if { (eval echo configure:15822: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:15828: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+ rm -rf conftest*
+ ac_cv_sys_file_offset_bits=64
+ else
+@@ -15837,11 +15843,11 @@
+
+ fi
+ echo $ac_n "checking for _LARGE_FILES value needed for large files""... $ac_c" 1>&6
+-echo "configure:15841: checking for _LARGE_FILES value needed for large files" >&5
++echo "configure:15847: checking for _LARGE_FILES value needed for large files" >&5
+
+ ac_cv_sys_large_files=no
+ cat > conftest.$ac_ext <<EOF
+-#line 15845 "configure"
++#line 15851 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ /* Check that off_t can represent 2**63 - 1 correctly.
+@@ -15857,14 +15863,14 @@
+
+ ; return 0; }
+ EOF
+-if { (eval echo configure:15861: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:15867: \"$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 15868 "configure"
++#line 15874 "configure"
+ #include "confdefs.h"
+ #define _LARGE_FILES 1
+ #include <sys/types.h>
+@@ -15882,7 +15888,7 @@
+
+ ; return 0; }
+ EOF
+-if { (eval echo configure:15886: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:15892: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+ rm -rf conftest*
+ ac_cv_sys_large_files=1
+ else
+@@ -15901,25 +15907,25 @@
+
+ fi
+ echo $ac_n "checking for _LARGEFILE_SOURCE value needed for large files""... $ac_c" 1>&6
+-echo "configure:15905: checking for _LARGEFILE_SOURCE value needed for large files" >&5
++echo "configure:15911: checking for _LARGEFILE_SOURCE value needed for large files" >&5
+
+ ac_cv_sys_largefile_source=no
+ cat > conftest.$ac_ext <<EOF
+-#line 15909 "configure"
++#line 15915 "configure"
+ #include "confdefs.h"
+ #include <stdio.h>
+ int main() {
+ return !fseeko;
+ ; return 0; }
+ EOF
+-if { (eval echo configure:15916: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:15922: \"$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 15923 "configure"
++#line 15929 "configure"
+ #include "confdefs.h"
+ #define _LARGEFILE_SOURCE 1
+ #include <stdio.h>
+@@ -15928,7 +15934,7 @@
+ return !fseeko;
+ ; return 0; }
+ EOF
+-if { (eval echo configure:15932: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:15938: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+ rm -rf conftest*
+ ac_cv_sys_largefile_source=1
+ else
+@@ -15949,10 +15955,10 @@
+ fi
+
+ echo $ac_n "checking if system supports Large Files at all""... $ac_c" 1>&6
+-echo "configure:15953: checking if system supports Large Files at all" >&5
++echo "configure:15959: checking if system supports Large Files at all" >&5
+
+ cat > conftest.$ac_ext <<EOF
+-#line 15956 "configure"
++#line 15962 "configure"
+ #include "confdefs.h"
+ #include <stdio.h>
+ #include <sys/types.h>
+@@ -15984,7 +15990,7 @@
+ #endif
+ ; return 0; }
+ EOF
+-if { (eval echo configure:15988: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:15994: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+ rm -rf conftest*
+ ac_cv_largefiles=yes
+ else
+@@ -16013,7 +16019,7 @@
+ # Python check
+
+ echo $ac_n "checking whether to use Python""... $ac_c" 1>&6
+-echo "configure:16017: checking whether to use Python" >&5
++echo "configure:16023: checking whether to use Python" >&5
+
+ PYTHONINC=
+ PYTHONCFLAGS=
+@@ -16033,7 +16039,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:16037: checking for $ac_word" >&5
++echo "configure:16043: checking for $ac_word" >&5
+
+ case "$PY_CONFIG" in
+ /*)
+@@ -16075,15 +16081,15 @@
+ do
+ ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
+ echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
+-echo "configure:16079: checking for $ac_hdr" >&5
++echo "configure:16085: checking for $ac_hdr" >&5
+
+ cat > conftest.$ac_ext <<EOF
+-#line 16082 "configure"
++#line 16088 "configure"
+ #include "confdefs.h"
+ #include <$ac_hdr>
+ EOF
+ ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+-{ (eval echo configure:16087: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:16093: \"$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*
+@@ -16153,7 +16159,7 @@
+ # Enable wxWidgets support (for wxGUI)
+
+ echo $ac_n "checking whether to use wxWidgets""... $ac_c" 1>&6
+-echo "configure:16157: checking whether to use wxWidgets" >&5
++echo "configure:16163: checking whether to use wxWidgets" >&5
+
+ WXVERSION=
+ WXWIDGETSCXXFLAGS=
+@@ -16174,7 +16180,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:16178: checking for $ac_word" >&5
++echo "configure:16184: checking for $ac_word" >&5
+
+ case "$WX_CONFIG" in
+ /*)
+@@ -16222,7 +16228,7 @@
+ REQWX="2.8.1"
+
+ echo $ac_n "checking wxWidgets version""... $ac_c" 1>&6
+-echo "configure:16226: checking wxWidgets version" >&5
++echo "configure:16232: checking wxWidgets version" >&5
+ if WXVERSION=`"$WX_CONFIG" --version`; then
+ echo "$ac_t""$WXVERSION" 1>&6
+ else
+@@ -16245,15 +16251,15 @@
+ do
+ ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
+ echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
+-echo "configure:16249: checking for $ac_hdr" >&5
++echo "configure:16255: checking for $ac_hdr" >&5
+
+ cat > conftest.$ac_ext <<EOF
+-#line 16252 "configure"
++#line 16258 "configure"
+ #include "confdefs.h"
+ #include <$ac_hdr>
+ EOF
+ ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+-{ (eval echo configure:16257: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:16263: \"$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*
+Index: configure.in
+===================================================================
+--- configure.in (revision 57322)
++++ configure.in (working copy)
+@@ -64,11 +64,11 @@
+
+ AC_PATH_PROG(pwd, pwd, pwd)
+
+-dnl if test "$MINGW32" = yes ; then
+-dnl winpwd="$pwd -W"
+-dnl else
+-dnl winpwd="$pwd"
+-dnl fi
++if test "$MINGW32" = yes ; then
++ winpwd="$pwd -W"
++else
++ winpwd="$pwd"
++fi
+
+ AC_MSG_CHECKING(for source directory)
+
+@@ -83,7 +83,7 @@
+ AC_MSG_CHECKING(for build directory)
+
+ DSTDIR=`$pwd`
+-dnl WINDSTDIR=`$winpwd`
++WINDSTDIR=`$winpwd`
+
+ AC_MSG_RESULT("$DSTDIR")
+
+@@ -107,8 +107,7 @@
+
+ # Set GISBASE and GRASS_BIN
+
+-dnl GISBASE="${WINDSTDIR}/dist.${ARCH}
+-GISBASE="${DSTDIR}/dist.${ARCH}"
++GISBASE="${WINDSTDIR}/dist.${ARCH}"
+ GRASS_BIN="${DSTDIR}/bin.${ARCH}"
+
+ AC_SUBST(GISBASE)
More information about the grass-commit
mailing list