added ghc ebuild: Glasgow Haskell Compiler

author: George Shapovalov <george@gentoo.org> 2002-06-10 07:28:30 +0000
committer: George Shapovalov <george@gentoo.org> 2002-06-10 07:28:30 +0000
commit: cb635bcb470fa06028d48312d10772f441f5c870 (patch)
tree: fa9c5c57064fd0470fb8a25faa2800dbc2a04e62 /dev-lang/ghc
parent: new version (diff)
download: historical-cb635bcb470fa06028d48312d10772f441f5c870.tar.gz
historical-cb635bcb470fa06028d48312d10772f441f5c870.tar.bz2
historical-cb635bcb470fa06028d48312d10772f441f5c870.zip
6 files changed, 5028 insertions, 0 deletions
diff --git a/dev-lang/ghc/ChangeLog b/dev-lang/ghc/ChangeLog
new file mode 100644
index 000000000000..5736b04a4ebf
--- /dev/null
+++ b/dev-lang/ghc/ChangeLog
@@ -0,0 +1,18 @@
+# ChangeLog for dev-lang/ghc
+# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ghc/ChangeLog,v 1.1 2002/06/10 07:28:29 george Exp $
+
+*ghc-5.02.3.ebuild (09 Jun 2002)
+  
+  09 Jun 2002; George Shapovalov <george@gentoo.org> all :
+  
+  First submission
+  From the home page:
+
+  The Glasgow Haskell Compiler is a robust, fully-featured, optimising compiler 
+  and interactive environment for Haskell 98, GHC compiles Haskell to either 
+  native code or C.  It implements numerous experimental language extensions 
+  to Haskell 98; for example: concurrency, a foreign language interface, 
+  multi-parameter type classes, scoped type variables, existential and universal 
+  quantification, unboxed types, exceptions, weak pointers, and so on.  GHC comes 
+  with a generational garbage collector, and a space and time profiler. 
diff --git a/dev-lang/ghc/files/digest-ghc-5.02.3 b/dev-lang/ghc/files/digest-ghc-5.02.3
new file mode 100644
index 000000000000..644249bee14f
--- /dev/null
+++ b/dev-lang/ghc/files/digest-ghc-5.02.3
@@ -0,0 +1,3 @@
+MD5 c5199db1c12cc633970dfe920f50244d ghc-4.08.2-src.tar.bz2 2920865
+MD5 d25dd1062b09af699f8361fb35394587 ghc-4.08.2-x86-hc.tar.bz2 3901838
+MD5 b0f4a3865076b6153514c945c63ab300 ghc-5.02.3-src.tar.bz2 4016975
diff --git a/dev-lang/ghc/files/ghc-4.08.2-gentoo.patch b/dev-lang/ghc/files/ghc-4.08.2-gentoo.patch
new file mode 100644
index 000000000000..c841247cd5bc
--- /dev/null
+++ b/dev-lang/ghc/files/ghc-4.08.2-gentoo.patch
@@ -0,0 +1,40 @@
+diff -Nur ghc-4.08.2/distrib/hc-build ghc-4.08.2-patched/distrib/hc-build
+--- ghc-4.08.2/distrib/hc-build	Wed Aug  9 13:09:43 2000
++++ ghc-4.08.2-patched/distrib/hc-build	Thu May 23 14:08:55 2002
+@@ -9,6 +9,23 @@
+ 
+ configopts="$*"
+ 
++# check for GNU make (if not explicitly specified through $GMAKE)
++#
++if [ -z "$GMAKE" ]; then
++  MAKENAMES="gmake make no-make"
++  for make in $MAKENAMES; do
++    MAKE=$make
++    $make --version 2>&1 | grep "GNU Make" >/dev/null && break
++  done
++  if [ $MAKE = no-make ]; then
++    echo "Fatal error: Cannot find the GNU make utility"
++    exit 1
++  fi
++else
++  MAKE="$GMAKE"
++fi
++
++
+ # build configuration
+ #
+ cat >mk/build.mk <<END
+@@ -26,9 +43,9 @@
+ 
+ echo "*** Building hsc..."
+ ./configure --enable-hc-boot $configopts        || exit 1
+-gmake boot all                                   || exit 1
++$MAKE boot all                                   || exit 1
+ 
+ echo "*** Building library..."
+ echo "GhcWithHscBuiltViaC=NO" >>mk/build.mk
+-gmake -C ghc/lib clean boot all			|| exit 1
+-gmake -C hslibs  clean boot all
++$MAKE -C ghc/lib clean boot all			|| exit 1
++$MAKE -C hslibs  clean boot all
diff --git a/dev-lang/ghc/files/ghc-5.02.3-gentoo.patch b/dev-lang/ghc/files/ghc-5.02.3-gentoo.patch
new file mode 100644
index 000000000000..216420666362
--- /dev/null
+++ b/dev-lang/ghc/files/ghc-5.02.3-gentoo.patch
@@ -0,0 +1,4347 @@
+diff -Nu ghc-5.02.3/configure ghc-5.02.3-patched/configure
+--- ghc-5.02.3/configure	Sun Apr  7 20:38:52 2002
++++ ghc-5.02.3-patched/configure	Wed May 22 23:57:06 2002
+@@ -54,6 +54,13 @@
+         Use a specific version of the GLUT Xlib implementation when building HOpenGL.
+ "
+ ac_help="$ac_help
++  --without-happy
++        Don't check for the Happy parser generator, assuming the
++        parsers are already built.
++        If you don't have Happy, use this for building from a source
++        distribution (it contains the parsers pre-built).
++"
++ac_help="$ac_help
+   --with-x                use the X Window System"
+ 
+ # Initialize some variables set by options.
+@@ -640,7 +647,7 @@
+ fi
+ 
+ echo $ac_n "checking host system type""... $ac_c" 1>&6
+-echo "configure:644: checking host system type" >&5
++echo "configure:651: checking host system type" >&5
+ 
+ host_alias=$host
+ case "$host_alias" in
+@@ -661,7 +668,7 @@
+ echo "$ac_t""$host" 1>&6
+ 
+ echo $ac_n "checking target system type""... $ac_c" 1>&6
+-echo "configure:665: checking target system type" >&5
++echo "configure:672: checking target system type" >&5
+ 
+ target_alias=$target
+ case "$target_alias" in
+@@ -679,7 +686,7 @@
+ echo "$ac_t""$target" 1>&6
+ 
+ echo $ac_n "checking build system type""... $ac_c" 1>&6
+-echo "configure:683: checking build system type" >&5
++echo "configure:690: checking build system type" >&5
+ 
+ build_alias=$build
+ case "$build_alias" in
+@@ -979,7 +986,7 @@
+   # Extract the first word of "ghc", so it can be a program name with args.
+ set dummy ghc; ac_word=$2
+ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:983: checking for $ac_word" >&5
++echo "configure:990: checking for $ac_word" >&5
+ if eval "test \"`echo '$''{'ac_cv_path_GHC'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -1037,7 +1044,7 @@
+ 
+ if test "$WithGhc" != ""; then
+   echo $ac_n "checking version of ghc""... $ac_c" 1>&6
+-echo "configure:1041: checking version of ghc" >&5
++echo "configure:1048: checking version of ghc" >&5
+  "${WithGhc-ghc}" --version > conftestghc 2>&1
+   cat conftestghc >&5
+ #Useless Use Of cat award...
+@@ -1074,7 +1081,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:1078: checking for $ac_word" >&5
++echo "configure:1085: checking for $ac_word" >&5
+ if eval "test \"`echo '$''{'ac_cv_path_NHC'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -1112,7 +1119,7 @@
+ # Extract the first word of "hbc", so it can be a program name with args.
+ set dummy hbc; ac_word=$2
+ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:1116: checking for $ac_word" >&5
++echo "configure:1123: checking for $ac_word" >&5
+ if eval "test \"`echo '$''{'ac_cv_path_HBC'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -1241,6 +1248,13 @@
+ test -n "$with_glut_xlib" && CPPFLAGS="$CPPFLAGS -DGLUT_XLIB_IMPLEMENTATION=$with_glut_xlib"
+ 
+ 
++# Check whether --with-happy or --without-happy was given.
++if test "${with_happy+set}" = set; then
++  withval="$with_happy"
++  :
++fi
++
++
+ 
+ 
+ 
+@@ -1249,7 +1263,7 @@
+ # Pull the hash mark out of the macro call to avoid m4 problems.
+ ac_msg="whether #! works in shell scripts"
+ echo $ac_n "checking $ac_msg""... $ac_c" 1>&6
+-echo "configure:1253: checking $ac_msg" >&5
++echo "configure:1267: checking $ac_msg" >&5
+ if eval "test \"`echo '$''{'ac_cv_sys_interpreter'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -1275,7 +1289,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:1279: checking for $ac_word" >&5
++echo "configure:1293: checking for $ac_word" >&5
+ if eval "test \"`echo '$''{'ac_cv_prog_PerlCmd'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -1311,7 +1325,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:1315: checking for $ac_word" >&5
++echo "configure:1329: checking for $ac_word" >&5
+ if eval "test \"`echo '$''{'ac_cv_path_PerlCmd'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -1369,7 +1383,7 @@
+ esac
+ 
+ echo $ac_n "checking if your perl works in shell scripts""... $ac_c" 1>&6
+-echo "configure:1373: checking if your perl works in shell scripts" >&5
++echo "configure:1387: checking if your perl works in shell scripts" >&5
+ if eval "test \"`echo '$''{'fptools_cv_shebang_perl'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -1392,7 +1406,7 @@
+ # Extract the first word of "gcc", so it can be a program name with args.
+ set dummy gcc; ac_word=$2
+ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:1396: checking for $ac_word" >&5
++echo "configure:1410: checking for $ac_word" >&5
+ if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -1422,7 +1436,7 @@
+   # Extract the first word of "cc", so it can be a program name with args.
+ set dummy cc; ac_word=$2
+ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:1426: checking for $ac_word" >&5
++echo "configure:1440: checking for $ac_word" >&5
+ if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -1473,7 +1487,7 @@
+       # Extract the first word of "cl", so it can be a program name with args.
+ set dummy cl; ac_word=$2
+ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:1477: checking for $ac_word" >&5
++echo "configure:1491: checking for $ac_word" >&5
+ if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -1505,7 +1519,7 @@
+ fi
+ 
+ echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6
+-echo "configure:1509: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
++echo "configure:1523: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
+ 
+ ac_ext=c
+ # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
+@@ -1516,12 +1530,12 @@
+ 
+ cat > conftest.$ac_ext << EOF
+ 
+-#line 1520 "configure"
++#line 1534 "configure"
+ #include "confdefs.h"
+ 
+ main(){return(0);}
+ EOF
+-if { (eval echo configure:1525: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:1539: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   ac_cv_prog_cc_works=yes
+   # If we can't run a trivial program, we are probably using a cross compiler.
+   if (./conftest; exit) 2>/dev/null; then
+@@ -1547,12 +1561,12 @@
+   { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; }
+ fi
+ echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
+-echo "configure:1551: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
++echo "configure:1565: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
+ echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6
+ cross_compiling=$ac_cv_prog_cc_cross
+ 
+ echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6
+-echo "configure:1556: checking whether we are using GNU C" >&5
++echo "configure:1570: checking whether we are using GNU C" >&5
+ if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -1561,7 +1575,7 @@
+   yes;
+ #endif
+ EOF
+-if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1565: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
++if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1579: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
+   ac_cv_prog_gcc=yes
+ else
+   ac_cv_prog_gcc=no
+@@ -1580,7 +1594,7 @@
+ ac_save_CFLAGS="$CFLAGS"
+ CFLAGS=
+ echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
+-echo "configure:1584: checking whether ${CC-cc} accepts -g" >&5
++echo "configure:1598: checking whether ${CC-cc} accepts -g" >&5
+ if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -1612,7 +1626,7 @@
+ fi
+ 
+ echo $ac_n "checking whether you have an ok gcc""... $ac_c" 1>&6
+-echo "configure:1616: checking whether you have an ok gcc" >&5
++echo "configure:1630: checking whether you have an ok gcc" >&5
+ if eval "test \"`echo '$''{'fptools_cv_have_gcc'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -1643,7 +1657,7 @@
+ 
+ 
+ echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6
+-echo "configure:1647: checking how to run the C preprocessor" >&5
++echo "configure:1661: checking how to run the C preprocessor" >&5
+ # On Suns, sometimes $CPP names a directory.
+ if test -n "$CPP" && test -d "$CPP"; then
+   CPP=
+@@ -1658,13 +1672,13 @@
+   # On the NeXT, cc -E runs the code through the compiler's parser,
+   # not just through cpp.
+   cat > conftest.$ac_ext <<EOF
+-#line 1662 "configure"
++#line 1676 "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:1668: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:1682: \"$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
+   :
+@@ -1675,13 +1689,13 @@
+   rm -rf conftest*
+   CPP="${CC-cc} -E -traditional-cpp"
+   cat > conftest.$ac_ext <<EOF
+-#line 1679 "configure"
++#line 1693 "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:1685: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:1699: \"$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
+   :
+@@ -1692,13 +1706,13 @@
+   rm -rf conftest*
+   CPP="${CC-cc} -nologo -E"
+   cat > conftest.$ac_ext <<EOF
+-#line 1696 "configure"
++#line 1710 "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:1702: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:1716: \"$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
+   :
+@@ -1725,7 +1739,7 @@
+ 
+ 
+ echo $ac_n "checking whether $CC accepts -mwin32""... $ac_c" 1>&6
+-echo "configure:1729: checking whether $CC accepts -mwin32" >&5
++echo "configure:1743: checking whether $CC accepts -mwin32" >&5
+ if eval "test \"`echo '$''{'ac_cv_cc_CC_SUPPORTS_MWIN32'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -1739,14 +1753,14 @@
+ cross_compiling=$ac_cv_prog_cc_cross
+ 
+  cat > conftest.$ac_ext <<EOF
+-#line 1743 "configure"
++#line 1757 "configure"
+ #include "confdefs.h"
+ 
+ int main() {
+ int main(){return(0);}
+ ; return 0; }
+ EOF
+-if { (eval echo configure:1750: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:1764: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+   rm -rf conftest*
+   ac_cv_cc_CC_SUPPORTS_MWIN32=yes
+ else
+@@ -1769,7 +1783,7 @@
+ 
+ 
+ echo $ac_n "checking whether $CC accepts -mno-cygwin""... $ac_c" 1>&6
+-echo "configure:1773: checking whether $CC accepts -mno-cygwin" >&5
++echo "configure:1787: checking whether $CC accepts -mno-cygwin" >&5
+ if eval "test \"`echo '$''{'ac_cv_cc_CC_SUPPORTS_MNO_CYGWIN'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -1783,14 +1797,14 @@
+ cross_compiling=$ac_cv_prog_cc_cross
+ 
+  cat > conftest.$ac_ext <<EOF
+-#line 1787 "configure"
++#line 1801 "configure"
+ #include "confdefs.h"
+ 
+ int main() {
+ int main(){return(0);}
+ ; return 0; }
+ EOF
+-if { (eval echo configure:1794: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:1808: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+   rm -rf conftest*
+   ac_cv_cc_CC_SUPPORTS_MNO_CYGWIN=yes
+ else
+@@ -1818,7 +1832,7 @@
+ 
+ 
+ echo $ac_n "checking for ok way to do context diffs""... $ac_c" 1>&6
+-echo "configure:1822: checking for ok way to do context diffs" >&5
++echo "configure:1836: checking for ok way to do context diffs" >&5
+ if eval "test \"`echo '$''{'fptools_cv_context_diffs'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -1847,7 +1861,7 @@
+ # Extract the first word of "find", so it can be a program name with args.
+ set dummy find; ac_word=$2
+ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:1851: checking for $ac_word" >&5
++echo "configure:1865: checking for $ac_word" >&5
+ if eval "test \"`echo '$''{'ac_cv_path_FindCmd'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -1885,7 +1899,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:1889: checking for $ac_word" >&5
++echo "configure:1903: checking for $ac_word" >&5
+ if eval "test \"`echo '$''{'ac_cv_prog_YACC'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -1917,14 +1931,14 @@
+ 
+ if test "$YACC" = "yacc"; then
+    echo $ac_n "checking if it is an OK yacc""... $ac_c" 1>&6
+-echo "configure:1921: checking if it is an OK yacc" >&5
++echo "configure:1935: checking if it is an OK yacc" >&5
+ if eval "test \"`echo '$''{'ac_cv_prog_yacc'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   # Extract the first word of "what", so it can be a program name with args.
+ set dummy what; ac_word=$2
+ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:1928: checking for $ac_word" >&5
++echo "configure:1942: checking for $ac_word" >&5
+ if eval "test \"`echo '$''{'ac_cv_prog_WhatCmd'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -1983,7 +1997,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:1987: checking for $ac_word" >&5
++echo "configure:2001: checking for $ac_word" >&5
+ if eval "test \"`echo '$''{'ac_cv_prog_LEX'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -2014,7 +2028,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:2018: checking for $ac_word" >&5
++echo "configure:2032: checking for $ac_word" >&5
+ if eval "test \"`echo '$''{'ac_cv_prog_LEX'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -2056,7 +2070,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:2060: checking for a BSD compatible install" >&5
++echo "configure:2074: checking for a BSD compatible install" >&5
+ if test -z "$INSTALL"; then
+ if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+@@ -2117,7 +2131,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:2121: checking for $ac_word" >&5
++echo "configure:2135: checking for $ac_word" >&5
+ if eval "test \"`echo '$''{'ac_cv_path_ArCmd'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -2194,7 +2208,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:2198: checking for $ac_word" >&5
++echo "configure:2212: checking for $ac_word" >&5
+ if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -2226,7 +2240,7 @@
+ 
+ 
+ echo $ac_n "checking whether ln -s works""... $ac_c" 1>&6
+-echo "configure:2230: checking whether ln -s works" >&5
++echo "configure:2244: checking whether ln -s works" >&5
+ if eval "test \"`echo '$''{'ac_cv_prog_LN_S'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -2251,7 +2265,7 @@
+ # Extract the first word of "sed", so it can be a program name with args.
+ set dummy sed; ac_word=$2
+ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:2255: checking for $ac_word" >&5
++echo "configure:2269: checking for $ac_word" >&5
+ if eval "test \"`echo '$''{'ac_cv_path_SedCmd'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -2288,7 +2302,7 @@
+ # Extract the first word of "time", so it can be a program name with args.
+ set dummy time; ac_word=$2
+ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:2292: checking for $ac_word" >&5
++echo "configure:2306: checking for $ac_word" >&5
+ if eval "test \"`echo '$''{'ac_cv_path_TimeCmd'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -2327,7 +2341,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:2331: checking for $ac_word" >&5
++echo "configure:2345: checking for $ac_word" >&5
+ if eval "test \"`echo '$''{'ac_cv_path_TarCmd'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -2369,7 +2383,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:2373: checking for $ac_word" >&5
++echo "configure:2387: checking for $ac_word" >&5
+ if eval "test \"`echo '$''{'ac_cv_path_CompressCmd'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -2411,7 +2425,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:2415: checking for $ac_word" >&5
++echo "configure:2429: checking for $ac_word" >&5
+ if eval "test \"`echo '$''{'ac_cv_path_JadeCmd'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -2448,7 +2462,7 @@
+ test -n "$JadeCmd" || JadeCmd="jade"
+ 
+ echo $ac_n "checking for DocBook CATALOG""... $ac_c" 1>&6
+-echo "configure:2452: checking for DocBook CATALOG" >&5
++echo "configure:2466: checking for DocBook CATALOG" >&5
+ if eval "test \"`echo '$''{'fptools_cv_sgml_catalog'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -2472,7 +2486,7 @@
+ fptools_cv_sgml_catalog=no
+ for fptools_catalog in /etc/sgml/catalog /etc/sgml.catalog /usr/share/sgml/CATALOG.docbkdsl glafp-utils/docbook/CATALOG*; do
+   ac_try="$JadeCmd -t rtf -d docs/fptools-both.dsl#print -c $fptools_catalog conftest.sgml"
+-  if { (eval echo configure:2476: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; then
++  if { (eval echo configure:2490: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; then
+     fptools_cv_sgml_catalog=$fptools_catalog
+     break
+   fi
+@@ -2512,15 +2526,15 @@
+ 
+ 
+ 
+-if test "$BootingFromHc" = "NO"; then
+-
++if test "$BootingFromHc" = "NO" && test x$with_happy != xno; then
++  
+ if test -d $srcdir/happy; then
+    SrcTreeHappyCmd=$hardtop/happy/src/happy-inplace
+ fi
+ # Extract the first word of "happy", so it can be a program name with args.
+ set dummy happy; ac_word=$2
+ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:2524: checking for $ac_word" >&5
++echo "configure:2538: checking for $ac_word" >&5
+ if eval "test \"`echo '$''{'ac_cv_path_HappyCmd'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -2554,7 +2568,7 @@
+ fi
+ 
+ echo $ac_n "checking for version of happy""... $ac_c" 1>&6
+-echo "configure:2558: checking for version of happy" >&5
++echo "configure:2572: checking for version of happy" >&5
+ if eval "test \"`echo '$''{'fptools_cv_happy_version'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -2595,12 +2609,12 @@
+ 
+ 
+ echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6
+-echo "configure:2599: checking for ANSI C header files" >&5
++echo "configure:2613: checking for ANSI C header files" >&5
+ if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 2604 "configure"
++#line 2618 "configure"
+ #include "confdefs.h"
+ #include <stdlib.h>
+ #include <stdarg.h>
+@@ -2608,7 +2622,7 @@
+ #include <float.h>
+ EOF
+ ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+-{ (eval echo configure:2612: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:2626: \"$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*
+@@ -2625,7 +2639,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 2629 "configure"
++#line 2643 "configure"
+ #include "confdefs.h"
+ #include <string.h>
+ EOF
+@@ -2643,7 +2657,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 2647 "configure"
++#line 2661 "configure"
+ #include "confdefs.h"
+ #include <stdlib.h>
+ EOF
+@@ -2664,7 +2678,7 @@
+   :
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 2668 "configure"
++#line 2682 "configure"
+ #include "confdefs.h"
+ #include <ctype.h>
+ #define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
+@@ -2675,7 +2689,7 @@
+ exit (0); }
+ 
+ EOF
+-if { (eval echo configure:2679: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:2693: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+ then
+   :
+ else
+@@ -2703,17 +2717,17 @@
+ do
+ ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
+ echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
+-echo "configure:2707: checking for $ac_hdr" >&5
++echo "configure:2721: checking for $ac_hdr" >&5
+ if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 2712 "configure"
++#line 2726 "configure"
+ #include "confdefs.h"
+ #include <$ac_hdr>
+ EOF
+ ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+-{ (eval echo configure:2717: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:2731: \"$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*
+@@ -2742,17 +2756,17 @@
+ 
+ ac_safe=`echo "readline/readline.h" | sed 'y%./+-%__p_%'`
+ echo $ac_n "checking for readline/readline.h""... $ac_c" 1>&6
+-echo "configure:2746: checking for readline/readline.h" >&5
++echo "configure:2760: checking for readline/readline.h" >&5
+ if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 2751 "configure"
++#line 2765 "configure"
+ #include "confdefs.h"
+ #include <readline/readline.h>
+ EOF
+ ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+-{ (eval echo configure:2756: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:2770: \"$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*
+@@ -2776,17 +2790,17 @@
+ 
+ ac_safe=`echo "readline/history.h" | sed 'y%./+-%__p_%'`
+ echo $ac_n "checking for readline/history.h""... $ac_c" 1>&6
+-echo "configure:2780: checking for readline/history.h" >&5
++echo "configure:2794: checking for readline/history.h" >&5
+ if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 2785 "configure"
++#line 2799 "configure"
+ #include "confdefs.h"
+ #include <readline/history.h>
+ EOF
+ ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+-{ (eval echo configure:2790: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:2804: \"$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*
+@@ -2828,17 +2842,17 @@
+ do
+ ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
+ echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
+-echo "configure:2832: checking for $ac_hdr" >&5
++echo "configure:2846: checking for $ac_hdr" >&5
+ if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 2837 "configure"
++#line 2851 "configure"
+ #include "confdefs.h"
+ #include <$ac_hdr>
+ EOF
+ ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+-{ (eval echo configure:2842: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:2856: \"$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*
+@@ -2869,17 +2883,17 @@
+ do
+ ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
+ echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
+-echo "configure:2873: checking for $ac_hdr" >&5
++echo "configure:2887: checking for $ac_hdr" >&5
+ if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 2878 "configure"
++#line 2892 "configure"
+ #include "confdefs.h"
+ #include <$ac_hdr>
+ EOF
+ ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+-{ (eval echo configure:2883: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:2897: \"$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*
+@@ -2910,17 +2924,17 @@
+ do
+ ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
+ echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
+-echo "configure:2914: checking for $ac_hdr" >&5
++echo "configure:2928: checking for $ac_hdr" >&5
+ if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 2919 "configure"
++#line 2933 "configure"
+ #include "confdefs.h"
+ #include <$ac_hdr>
+ EOF
+ ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+-{ (eval echo configure:2924: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:2938: \"$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*
+@@ -2948,12 +2962,12 @@
+ 
+ 
+ echo $ac_n "checking whether time.h and sys/time.h may both be included""... $ac_c" 1>&6
+-echo "configure:2952: checking whether time.h and sys/time.h may both be included" >&5
++echo "configure:2966: checking whether time.h and sys/time.h may both be included" >&5
+ if eval "test \"`echo '$''{'ac_cv_header_time'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 2957 "configure"
++#line 2971 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ #include <sys/time.h>
+@@ -2962,7 +2976,7 @@
+ struct tm *tp;
+ ; return 0; }
+ EOF
+-if { (eval echo configure:2966: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:2980: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+   rm -rf conftest*
+   ac_cv_header_time=yes
+ else
+@@ -2987,17 +3001,17 @@
+ do
+ ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
+ echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
+-echo "configure:2991: checking for $ac_hdr" >&5
++echo "configure:3005: checking for $ac_hdr" >&5
+ if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 2996 "configure"
++#line 3010 "configure"
+ #include "confdefs.h"
+ #include <$ac_hdr>
+ EOF
+ ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+-{ (eval echo configure:3001: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:3015: \"$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*
+@@ -3026,17 +3040,17 @@
+ 
+ ac_safe=`echo "alloc.h" | sed 'y%./+-%__p_%'`
+ echo $ac_n "checking for alloc.h""... $ac_c" 1>&6
+-echo "configure:3030: checking for alloc.h" >&5
++echo "configure:3044: checking for alloc.h" >&5
+ if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 3035 "configure"
++#line 3049 "configure"
+ #include "confdefs.h"
+ #include <alloc.h>
+ EOF
+ ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+-{ (eval echo configure:3040: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:3054: \"$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*
+@@ -3055,12 +3069,12 @@
+   for ac_func in farcalloc
+ do
+ echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
+-echo "configure:3059: checking for $ac_func" >&5
++echo "configure:3073: checking for $ac_func" >&5
+ if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 3064 "configure"
++#line 3078 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char $ac_func(); below.  */
+@@ -3083,7 +3097,7 @@
+ 
+ ; return 0; }
+ EOF
+-if { (eval echo configure:3087: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:3101: \"$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
+@@ -3114,17 +3128,17 @@
+ 
+ ac_safe=`echo "malloc.h" | sed 'y%./+-%__p_%'`
+ echo $ac_n "checking for malloc.h""... $ac_c" 1>&6
+-echo "configure:3118: checking for malloc.h" >&5
++echo "configure:3132: checking for malloc.h" >&5
+ if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 3123 "configure"
++#line 3137 "configure"
+ #include "confdefs.h"
+ #include <malloc.h>
+ EOF
+ ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+-{ (eval echo configure:3128: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:3142: \"$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*
+@@ -3143,12 +3157,12 @@
+   for ac_func in valloc
+ do
+ echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
+-echo "configure:3147: checking for $ac_func" >&5
++echo "configure:3161: checking for $ac_func" >&5
+ if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 3152 "configure"
++#line 3166 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char $ac_func(); below.  */
+@@ -3171,7 +3185,7 @@
+ 
+ ; return 0; }
+ EOF
+-if { (eval echo configure:3175: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:3189: \"$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
+@@ -3201,12 +3215,12 @@
+ 
+ 
+ echo $ac_n "checking whether struct tm is in sys/time.h or time.h""... $ac_c" 1>&6
+-echo "configure:3205: checking whether struct tm is in sys/time.h or time.h" >&5
++echo "configure:3219: checking whether struct tm is in sys/time.h or time.h" >&5
+ if eval "test \"`echo '$''{'ac_cv_struct_tm'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 3210 "configure"
++#line 3224 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ #include <time.h>
+@@ -3214,7 +3228,7 @@
+ struct tm *tp; tp->tm_sec;
+ ; return 0; }
+ EOF
+-if { (eval echo configure:3218: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:3232: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+   rm -rf conftest*
+   ac_cv_struct_tm=time.h
+ else
+@@ -3235,12 +3249,12 @@
+ fi
+ 
+ echo $ac_n "checking for tm_zone in struct tm""... $ac_c" 1>&6
+-echo "configure:3239: checking for tm_zone in struct tm" >&5
++echo "configure:3253: checking for tm_zone in struct tm" >&5
+ if eval "test \"`echo '$''{'ac_cv_struct_tm_zone'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 3244 "configure"
++#line 3258 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ #include <$ac_cv_struct_tm>
+@@ -3248,7 +3262,7 @@
+ struct tm tm; tm.tm_zone;
+ ; return 0; }
+ EOF
+-if { (eval echo configure:3252: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:3266: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+   rm -rf conftest*
+   ac_cv_struct_tm_zone=yes
+ else
+@@ -3268,12 +3282,12 @@
+ 
+ else
+   echo $ac_n "checking for tzname""... $ac_c" 1>&6
+-echo "configure:3272: checking for tzname" >&5
++echo "configure:3286: checking for tzname" >&5
+ if eval "test \"`echo '$''{'ac_cv_var_tzname'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 3277 "configure"
++#line 3291 "configure"
+ #include "confdefs.h"
+ #include <time.h>
+ #ifndef tzname /* For SGI.  */
+@@ -3283,7 +3297,7 @@
+ atoi(*tzname);
+ ; return 0; }
+ EOF
+-if { (eval echo configure:3287: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:3301: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   ac_cv_var_tzname=yes
+ else
+@@ -3306,12 +3320,12 @@
+ 
+ 
+ echo $ac_n "checking timezone""... $ac_c" 1>&6
+-echo "configure:3310: checking timezone" >&5
++echo "configure:3324: checking timezone" >&5
+ if eval "test \"`echo '$''{'fptools_cv_have_timezone'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 3315 "configure"
++#line 3329 "configure"
+ #include "confdefs.h"
+ #if TIME_WITH_SYS_TIME
+ # include <sys/time.h>
+@@ -3328,7 +3342,7 @@
+ return timezone;
+ ; return 0; }
+ EOF
+-if { (eval echo configure:3332: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:3346: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+   rm -rf conftest*
+   fptools_cv_have_timezone=yes
+ else
+@@ -3349,12 +3363,12 @@
+ fi
+ 
+ echo $ac_n "checking type of timezone""... $ac_c" 1>&6
+-echo "configure:3353: checking type of timezone" >&5
++echo "configure:3367: checking type of timezone" >&5
+ if eval "test \"`echo '$''{'fptools_cv_type_timezone'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 3358 "configure"
++#line 3372 "configure"
+ #include "confdefs.h"
+ #if TIME_WITH_SYS_TIME
+ # include <sys/time.h>
+@@ -3373,7 +3387,7 @@
+ int i;
+ ; return 0; }
+ EOF
+-if { (eval echo configure:3377: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:3391: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+   rm -rf conftest*
+   fptools_cv_type_timezone=time_t
+ else
+@@ -3393,12 +3407,12 @@
+ 
+ 
+ echo $ac_n "checking altzone""... $ac_c" 1>&6
+-echo "configure:3397: checking altzone" >&5
++echo "configure:3411: checking altzone" >&5
+ if eval "test \"`echo '$''{'fptools_cv_altzone'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 3402 "configure"
++#line 3416 "configure"
+ #include "confdefs.h"
+ #if TIME_WITH_SYS_TIME
+ # include <sys/time.h>
+@@ -3415,7 +3429,7 @@
+ return altzone;
+ ; return 0; }
+ EOF
+-if { (eval echo configure:3419: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:3433: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   fptools_cv_altzone=yes
+ else
+@@ -3437,12 +3451,12 @@
+ 
+ 
+ echo $ac_n "checking for st_blksize in struct stat""... $ac_c" 1>&6
+-echo "configure:3441: checking for st_blksize in struct stat" >&5
++echo "configure:3455: checking for st_blksize in struct stat" >&5
+ if eval "test \"`echo '$''{'ac_cv_struct_st_blksize'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 3446 "configure"
++#line 3460 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ #include <sys/stat.h>
+@@ -3450,7 +3464,7 @@
+ struct stat s; s.st_blksize;
+ ; return 0; }
+ EOF
+-if { (eval echo configure:3454: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:3468: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+   rm -rf conftest*
+   ac_cv_struct_st_blksize=yes
+ else
+@@ -3474,7 +3488,7 @@
+ 
+ 
+ echo $ac_n "checking whether ${CC} supports long long types""... $ac_c" 1>&6
+-echo "configure:3478: checking whether ${CC} supports long long types" >&5
++echo "configure:3492: checking whether ${CC} supports long long types" >&5
+ if eval "test \"`echo '$''{'fptools_cv_have_long_long'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -3488,14 +3502,14 @@
+ cross_compiling=$ac_cv_prog_cc_cross
+ 
+ cat > conftest.$ac_ext <<EOF
+-#line 3492 "configure"
++#line 3506 "configure"
+ #include "confdefs.h"
+ 
+ int main() {
+ long long a;
+ ; return 0; }
+ EOF
+-if { (eval echo configure:3499: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:3513: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+   rm -rf conftest*
+   fptools_cv_have_long_long=yes
+ else
+@@ -3525,7 +3539,7 @@
+ 
+ 
+ echo $ac_n "checking size of char""... $ac_c" 1>&6
+-echo "configure:3529: checking size of char" >&5
++echo "configure:3543: checking size of char" >&5
+ if eval "test \"`echo '$''{'ac_cv_sizeof_char'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -3533,7 +3547,7 @@
+   ac_cv_sizeof_char=1
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 3537 "configure"
++#line 3551 "configure"
+ #include "confdefs.h"
+ #include <stdio.h>
+ main()
+@@ -3544,7 +3558,7 @@
+   exit(0);
+ }
+ EOF
+-if { (eval echo configure:3548: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:3562: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+ then
+   ac_cv_sizeof_char=`cat conftestval`
+ else
+@@ -3564,7 +3578,7 @@
+ 
+ 
+ echo $ac_n "checking size of double""... $ac_c" 1>&6
+-echo "configure:3568: checking size of double" >&5
++echo "configure:3582: checking size of double" >&5
+ if eval "test \"`echo '$''{'ac_cv_sizeof_double'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -3572,7 +3586,7 @@
+   ac_cv_sizeof_double=8
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 3576 "configure"
++#line 3590 "configure"
+ #include "confdefs.h"
+ #include <stdio.h>
+ main()
+@@ -3583,7 +3597,7 @@
+   exit(0);
+ }
+ EOF
+-if { (eval echo configure:3587: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:3601: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+ then
+   ac_cv_sizeof_double=`cat conftestval`
+ else
+@@ -3603,7 +3617,7 @@
+ 
+ 
+ echo $ac_n "checking size of float""... $ac_c" 1>&6
+-echo "configure:3607: checking size of float" >&5
++echo "configure:3621: checking size of float" >&5
+ if eval "test \"`echo '$''{'ac_cv_sizeof_float'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -3611,7 +3625,7 @@
+   ac_cv_sizeof_float=4
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 3615 "configure"
++#line 3629 "configure"
+ #include "confdefs.h"
+ #include <stdio.h>
+ main()
+@@ -3622,7 +3636,7 @@
+   exit(0);
+ }
+ EOF
+-if { (eval echo configure:3626: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:3640: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+ then
+   ac_cv_sizeof_float=`cat conftestval`
+ else
+@@ -3642,7 +3656,7 @@
+ 
+ 
+ echo $ac_n "checking size of int""... $ac_c" 1>&6
+-echo "configure:3646: checking size of int" >&5
++echo "configure:3660: checking size of int" >&5
+ if eval "test \"`echo '$''{'ac_cv_sizeof_int'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -3650,7 +3664,7 @@
+   ac_cv_sizeof_int=4
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 3654 "configure"
++#line 3668 "configure"
+ #include "confdefs.h"
+ #include <stdio.h>
+ main()
+@@ -3661,7 +3675,7 @@
+   exit(0);
+ }
+ EOF
+-if { (eval echo configure:3665: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:3679: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+ then
+   ac_cv_sizeof_int=`cat conftestval`
+ else
+@@ -3681,7 +3695,7 @@
+ 
+ 
+ echo $ac_n "checking size of long""... $ac_c" 1>&6
+-echo "configure:3685: checking size of long" >&5
++echo "configure:3699: checking size of long" >&5
+ if eval "test \"`echo '$''{'ac_cv_sizeof_long'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -3689,7 +3703,7 @@
+   ac_cv_sizeof_long=4
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 3693 "configure"
++#line 3707 "configure"
+ #include "confdefs.h"
+ #include <stdio.h>
+ main()
+@@ -3700,7 +3714,7 @@
+   exit(0);
+ }
+ EOF
+-if { (eval echo configure:3704: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:3718: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+ then
+   ac_cv_sizeof_long=`cat conftestval`
+ else
+@@ -3721,7 +3735,7 @@
+ 
+ if test "$fptools_cv_have_long_long" = yes; then
+ echo $ac_n "checking size of long long""... $ac_c" 1>&6
+-echo "configure:3725: checking size of long long" >&5
++echo "configure:3739: checking size of long long" >&5
+ if eval "test \"`echo '$''{'ac_cv_sizeof_long_long'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -3729,7 +3743,7 @@
+   ac_cv_sizeof_long_long=8
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 3733 "configure"
++#line 3747 "configure"
+ #include "confdefs.h"
+ #include <stdio.h>
+ main()
+@@ -3740,7 +3754,7 @@
+   exit(0);
+ }
+ EOF
+-if { (eval echo configure:3744: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:3758: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+ then
+   ac_cv_sizeof_long_long=`cat conftestval`
+ else
+@@ -3761,7 +3775,7 @@
+ 
+ fi
+ echo $ac_n "checking size of short""... $ac_c" 1>&6
+-echo "configure:3765: checking size of short" >&5
++echo "configure:3779: checking size of short" >&5
+ if eval "test \"`echo '$''{'ac_cv_sizeof_short'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -3769,7 +3783,7 @@
+   ac_cv_sizeof_short=2
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 3773 "configure"
++#line 3787 "configure"
+ #include "confdefs.h"
+ #include <stdio.h>
+ main()
+@@ -3780,7 +3794,7 @@
+   exit(0);
+ }
+ EOF
+-if { (eval echo configure:3784: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:3798: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+ then
+   ac_cv_sizeof_short=`cat conftestval`
+ else
+@@ -3800,7 +3814,7 @@
+ 
+ 
+ echo $ac_n "checking size of unsigned char""... $ac_c" 1>&6
+-echo "configure:3804: checking size of unsigned char" >&5
++echo "configure:3818: checking size of unsigned char" >&5
+ if eval "test \"`echo '$''{'ac_cv_sizeof_unsigned_char'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -3808,7 +3822,7 @@
+   ac_cv_sizeof_unsigned_char=1
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 3812 "configure"
++#line 3826 "configure"
+ #include "confdefs.h"
+ #include <stdio.h>
+ main()
+@@ -3819,7 +3833,7 @@
+   exit(0);
+ }
+ EOF
+-if { (eval echo configure:3823: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:3837: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+ then
+   ac_cv_sizeof_unsigned_char=`cat conftestval`
+ else
+@@ -3839,7 +3853,7 @@
+ 
+ 
+ echo $ac_n "checking size of unsigned int""... $ac_c" 1>&6
+-echo "configure:3843: checking size of unsigned int" >&5
++echo "configure:3857: checking size of unsigned int" >&5
+ if eval "test \"`echo '$''{'ac_cv_sizeof_unsigned_int'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -3847,7 +3861,7 @@
+   ac_cv_sizeof_unsigned_int=4
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 3851 "configure"
++#line 3865 "configure"
+ #include "confdefs.h"
+ #include <stdio.h>
+ main()
+@@ -3858,7 +3872,7 @@
+   exit(0);
+ }
+ EOF
+-if { (eval echo configure:3862: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:3876: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+ then
+   ac_cv_sizeof_unsigned_int=`cat conftestval`
+ else
+@@ -3878,7 +3892,7 @@
+ 
+ 
+ echo $ac_n "checking size of unsigned long""... $ac_c" 1>&6
+-echo "configure:3882: checking size of unsigned long" >&5
++echo "configure:3896: checking size of unsigned long" >&5
+ if eval "test \"`echo '$''{'ac_cv_sizeof_unsigned_long'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -3886,7 +3900,7 @@
+   ac_cv_sizeof_unsigned_long=4
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 3890 "configure"
++#line 3904 "configure"
+ #include "confdefs.h"
+ #include <stdio.h>
+ main()
+@@ -3897,7 +3911,7 @@
+   exit(0);
+ }
+ EOF
+-if { (eval echo configure:3901: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:3915: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+ then
+   ac_cv_sizeof_unsigned_long=`cat conftestval`
+ else
+@@ -3918,7 +3932,7 @@
+ 
+ if test "$fptools_cv_have_long_long" = yes; then
+ echo $ac_n "checking size of unsigned long long""... $ac_c" 1>&6
+-echo "configure:3922: checking size of unsigned long long" >&5
++echo "configure:3936: checking size of unsigned long long" >&5
+ if eval "test \"`echo '$''{'ac_cv_sizeof_unsigned_long_long'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -3926,7 +3940,7 @@
+   ac_cv_sizeof_unsigned_long_long=8
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 3930 "configure"
++#line 3944 "configure"
+ #include "confdefs.h"
+ #include <stdio.h>
+ main()
+@@ -3937,7 +3951,7 @@
+   exit(0);
+ }
+ EOF
+-if { (eval echo configure:3941: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:3955: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+ then
+   ac_cv_sizeof_unsigned_long_long=`cat conftestval`
+ else
+@@ -3958,7 +3972,7 @@
+ 
+ fi
+ echo $ac_n "checking size of unsigned short""... $ac_c" 1>&6
+-echo "configure:3962: checking size of unsigned short" >&5
++echo "configure:3976: checking size of unsigned short" >&5
+ if eval "test \"`echo '$''{'ac_cv_sizeof_unsigned_short'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -3966,7 +3980,7 @@
+   ac_cv_sizeof_unsigned_short=2
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 3970 "configure"
++#line 3984 "configure"
+ #include "confdefs.h"
+ #include <stdio.h>
+ main()
+@@ -3977,7 +3991,7 @@
+   exit(0);
+ }
+ EOF
+-if { (eval echo configure:3981: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:3995: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+ then
+   ac_cv_sizeof_unsigned_short=`cat conftestval`
+ else
+@@ -3997,7 +4011,7 @@
+ 
+ 
+ echo $ac_n "checking size of void *""... $ac_c" 1>&6
+-echo "configure:4001: checking size of void *" >&5
++echo "configure:4015: checking size of void *" >&5
+ if eval "test \"`echo '$''{'ac_cv_sizeof_void_p'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -4005,7 +4019,7 @@
+   ac_cv_sizeof_void_p=4
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 4009 "configure"
++#line 4023 "configure"
+ #include "confdefs.h"
+ #include <stdio.h>
+ main()
+@@ -4016,7 +4030,7 @@
+   exit(0);
+ }
+ EOF
+-if { (eval echo configure:4020: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:4034: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+ then
+   ac_cv_sizeof_void_p=`cat conftestval`
+ else
+@@ -4037,7 +4051,7 @@
+ 
+ 
+ echo $ac_n "checking alignment of char""... $ac_c" 1>&6
+-echo "configure:4041: checking alignment of char" >&5
++echo "configure:4055: checking alignment of char" >&5
+ if eval "test \"`echo '$''{'ac_cv_alignment_char'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -4045,7 +4059,7 @@
+   ac_cv_alignment_char=$ac_cv_sizeof_char
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 4049 "configure"
++#line 4063 "configure"
+ #include "confdefs.h"
+ 
+ #include <stdio.h>
+@@ -4064,7 +4078,7 @@
+   exit(0);
+ }
+ EOF
+-if { (eval echo configure:4068: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:4082: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+ then
+   ac_cv_alignment_char=`cat conftestval`
+ else
+@@ -4086,7 +4100,7 @@
+ 
+ 
+ echo $ac_n "checking alignment of double""... $ac_c" 1>&6
+-echo "configure:4090: checking alignment of double" >&5
++echo "configure:4104: checking alignment of double" >&5
+ if eval "test \"`echo '$''{'ac_cv_alignment_double'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -4094,7 +4108,7 @@
+   ac_cv_alignment_double=$ac_cv_sizeof_double
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 4098 "configure"
++#line 4112 "configure"
+ #include "confdefs.h"
+ 
+ #include <stdio.h>
+@@ -4113,7 +4127,7 @@
+   exit(0);
+ }
+ EOF
+-if { (eval echo configure:4117: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:4131: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+ then
+   ac_cv_alignment_double=`cat conftestval`
+ else
+@@ -4135,7 +4149,7 @@
+ 
+ 
+ echo $ac_n "checking alignment of float""... $ac_c" 1>&6
+-echo "configure:4139: checking alignment of float" >&5
++echo "configure:4153: checking alignment of float" >&5
+ if eval "test \"`echo '$''{'ac_cv_alignment_float'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -4143,7 +4157,7 @@
+   ac_cv_alignment_float=$ac_cv_sizeof_float
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 4147 "configure"
++#line 4161 "configure"
+ #include "confdefs.h"
+ 
+ #include <stdio.h>
+@@ -4162,7 +4176,7 @@
+   exit(0);
+ }
+ EOF
+-if { (eval echo configure:4166: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:4180: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+ then
+   ac_cv_alignment_float=`cat conftestval`
+ else
+@@ -4184,7 +4198,7 @@
+ 
+ 
+ echo $ac_n "checking alignment of int""... $ac_c" 1>&6
+-echo "configure:4188: checking alignment of int" >&5
++echo "configure:4202: checking alignment of int" >&5
+ if eval "test \"`echo '$''{'ac_cv_alignment_int'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -4192,7 +4206,7 @@
+   ac_cv_alignment_int=$ac_cv_sizeof_int
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 4196 "configure"
++#line 4210 "configure"
+ #include "confdefs.h"
+ 
+ #include <stdio.h>
+@@ -4211,7 +4225,7 @@
+   exit(0);
+ }
+ EOF
+-if { (eval echo configure:4215: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:4229: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+ then
+   ac_cv_alignment_int=`cat conftestval`
+ else
+@@ -4233,7 +4247,7 @@
+ 
+ 
+ echo $ac_n "checking alignment of long""... $ac_c" 1>&6
+-echo "configure:4237: checking alignment of long" >&5
++echo "configure:4251: checking alignment of long" >&5
+ if eval "test \"`echo '$''{'ac_cv_alignment_long'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -4241,7 +4255,7 @@
+   ac_cv_alignment_long=$ac_cv_sizeof_long
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 4245 "configure"
++#line 4259 "configure"
+ #include "confdefs.h"
+ 
+ #include <stdio.h>
+@@ -4260,7 +4274,7 @@
+   exit(0);
+ }
+ EOF
+-if { (eval echo configure:4264: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:4278: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+ then
+   ac_cv_alignment_long=`cat conftestval`
+ else
+@@ -4283,7 +4297,7 @@
+ 
+ if test "$fptools_cv_have_long_long" = yes; then
+ echo $ac_n "checking alignment of long long""... $ac_c" 1>&6
+-echo "configure:4287: checking alignment of long long" >&5
++echo "configure:4301: checking alignment of long long" >&5
+ if eval "test \"`echo '$''{'ac_cv_alignment_long_long'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -4291,7 +4305,7 @@
+   ac_cv_alignment_long_long=$ac_cv_sizeof_long_long
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 4295 "configure"
++#line 4309 "configure"
+ #include "confdefs.h"
+ 
+ #include <stdio.h>
+@@ -4310,7 +4324,7 @@
+   exit(0);
+ }
+ EOF
+-if { (eval echo configure:4314: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:4328: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+ then
+   ac_cv_alignment_long_long=`cat conftestval`
+ else
+@@ -4333,7 +4347,7 @@
+ 
+ fi
+ echo $ac_n "checking alignment of short""... $ac_c" 1>&6
+-echo "configure:4337: checking alignment of short" >&5
++echo "configure:4351: checking alignment of short" >&5
+ if eval "test \"`echo '$''{'ac_cv_alignment_short'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -4341,7 +4355,7 @@
+   ac_cv_alignment_short=$ac_cv_sizeof_short
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 4345 "configure"
++#line 4359 "configure"
+ #include "confdefs.h"
+ 
+ #include <stdio.h>
+@@ -4360,7 +4374,7 @@
+   exit(0);
+ }
+ EOF
+-if { (eval echo configure:4364: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:4378: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+ then
+   ac_cv_alignment_short=`cat conftestval`
+ else
+@@ -4382,7 +4396,7 @@
+ 
+ 
+ echo $ac_n "checking alignment of unsigned char""... $ac_c" 1>&6
+-echo "configure:4386: checking alignment of unsigned char" >&5
++echo "configure:4400: checking alignment of unsigned char" >&5
+ if eval "test \"`echo '$''{'ac_cv_alignment_unsigned_char'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -4390,7 +4404,7 @@
+   ac_cv_alignment_unsigned_char=$ac_cv_sizeof_unsigned_char
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 4394 "configure"
++#line 4408 "configure"
+ #include "confdefs.h"
+ 
+ #include <stdio.h>
+@@ -4409,7 +4423,7 @@
+   exit(0);
+ }
+ EOF
+-if { (eval echo configure:4413: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:4427: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+ then
+   ac_cv_alignment_unsigned_char=`cat conftestval`
+ else
+@@ -4431,7 +4445,7 @@
+ 
+ 
+ echo $ac_n "checking alignment of unsigned int""... $ac_c" 1>&6
+-echo "configure:4435: checking alignment of unsigned int" >&5
++echo "configure:4449: checking alignment of unsigned int" >&5
+ if eval "test \"`echo '$''{'ac_cv_alignment_unsigned_int'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -4439,7 +4453,7 @@
+   ac_cv_alignment_unsigned_int=$ac_cv_sizeof_unsigned_int
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 4443 "configure"
++#line 4457 "configure"
+ #include "confdefs.h"
+ 
+ #include <stdio.h>
+@@ -4458,7 +4472,7 @@
+   exit(0);
+ }
+ EOF
+-if { (eval echo configure:4462: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:4476: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+ then
+   ac_cv_alignment_unsigned_int=`cat conftestval`
+ else
+@@ -4480,7 +4494,7 @@
+ 
+ 
+ echo $ac_n "checking alignment of unsigned long""... $ac_c" 1>&6
+-echo "configure:4484: checking alignment of unsigned long" >&5
++echo "configure:4498: checking alignment of unsigned long" >&5
+ if eval "test \"`echo '$''{'ac_cv_alignment_unsigned_long'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -4488,7 +4502,7 @@
+   ac_cv_alignment_unsigned_long=$ac_cv_sizeof_unsigned_long
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 4492 "configure"
++#line 4506 "configure"
+ #include "confdefs.h"
+ 
+ #include <stdio.h>
+@@ -4507,7 +4521,7 @@
+   exit(0);
+ }
+ EOF
+-if { (eval echo configure:4511: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:4525: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+ then
+   ac_cv_alignment_unsigned_long=`cat conftestval`
+ else
+@@ -4530,7 +4544,7 @@
+ 
+ if test "$fptools_cv_have_long_long" = yes; then
+ echo $ac_n "checking alignment of unsigned long long""... $ac_c" 1>&6
+-echo "configure:4534: checking alignment of unsigned long long" >&5
++echo "configure:4548: checking alignment of unsigned long long" >&5
+ if eval "test \"`echo '$''{'ac_cv_alignment_unsigned_long_long'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -4538,7 +4552,7 @@
+   ac_cv_alignment_unsigned_long_long=$ac_cv_sizeof_unsigned_long_long
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 4542 "configure"
++#line 4556 "configure"
+ #include "confdefs.h"
+ 
+ #include <stdio.h>
+@@ -4557,7 +4571,7 @@
+   exit(0);
+ }
+ EOF
+-if { (eval echo configure:4561: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:4575: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+ then
+   ac_cv_alignment_unsigned_long_long=`cat conftestval`
+ else
+@@ -4580,7 +4594,7 @@
+ 
+ fi
+ echo $ac_n "checking alignment of unsigned short""... $ac_c" 1>&6
+-echo "configure:4584: checking alignment of unsigned short" >&5
++echo "configure:4598: checking alignment of unsigned short" >&5
+ if eval "test \"`echo '$''{'ac_cv_alignment_unsigned_short'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -4588,7 +4602,7 @@
+   ac_cv_alignment_unsigned_short=$ac_cv_sizeof_unsigned_short
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 4592 "configure"
++#line 4606 "configure"
+ #include "confdefs.h"
+ 
+ #include <stdio.h>
+@@ -4607,7 +4621,7 @@
+   exit(0);
+ }
+ EOF
+-if { (eval echo configure:4611: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:4625: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+ then
+   ac_cv_alignment_unsigned_short=`cat conftestval`
+ else
+@@ -4629,7 +4643,7 @@
+ 
+ 
+ echo $ac_n "checking alignment of void *""... $ac_c" 1>&6
+-echo "configure:4633: checking alignment of void *" >&5
++echo "configure:4647: checking alignment of void *" >&5
+ if eval "test \"`echo '$''{'ac_cv_alignment_void_p'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -4637,7 +4651,7 @@
+   ac_cv_alignment_void_p=$ac_cv_sizeof_void_p
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 4641 "configure"
++#line 4655 "configure"
+ #include "confdefs.h"
+ 
+ #include <stdio.h>
+@@ -4656,7 +4670,7 @@
+   exit(0);
+ }
+ EOF
+-if { (eval echo configure:4660: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:4674: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+ then
+   ac_cv_alignment_void_p=`cat conftestval`
+ else
+@@ -4679,7 +4693,7 @@
+ 
+ 
+ echo $ac_n "checking Haskell type for char""... $ac_c" 1>&6
+-echo "configure:4683: checking Haskell type for char" >&5
++echo "configure:4697: checking Haskell type for char" >&5
+ if eval "test \"`echo '$''{'fptools_cv_htype_char'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -4687,7 +4701,7 @@
+   fptools_cv_htype_char=NotReallyATypeCross
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 4691 "configure"
++#line 4705 "configure"
+ #include "confdefs.h"
+ #include <stdio.h>
+ #include <stddef.h>
+@@ -4719,7 +4733,7 @@
+   exit(0);
+ }
+ EOF
+-if { (eval echo configure:4723: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:4737: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+ then
+   fptools_cv_htype_char=`cat conftestval`
+ else
+@@ -4739,7 +4753,7 @@
+ 
+ 
+ echo $ac_n "checking Haskell type for signed char""... $ac_c" 1>&6
+-echo "configure:4743: checking Haskell type for signed char" >&5
++echo "configure:4757: checking Haskell type for signed char" >&5
+ if eval "test \"`echo '$''{'fptools_cv_htype_signed_char'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -4747,7 +4761,7 @@
+   fptools_cv_htype_signed_char=NotReallyATypeCross
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 4751 "configure"
++#line 4765 "configure"
+ #include "confdefs.h"
+ #include <stdio.h>
+ #include <stddef.h>
+@@ -4779,7 +4793,7 @@
+   exit(0);
+ }
+ EOF
+-if { (eval echo configure:4783: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:4797: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+ then
+   fptools_cv_htype_signed_char=`cat conftestval`
+ else
+@@ -4799,7 +4813,7 @@
+ 
+ 
+ echo $ac_n "checking Haskell type for unsigned char""... $ac_c" 1>&6
+-echo "configure:4803: checking Haskell type for unsigned char" >&5
++echo "configure:4817: checking Haskell type for unsigned char" >&5
+ if eval "test \"`echo '$''{'fptools_cv_htype_unsigned_char'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -4807,7 +4821,7 @@
+   fptools_cv_htype_unsigned_char=NotReallyATypeCross
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 4811 "configure"
++#line 4825 "configure"
+ #include "confdefs.h"
+ #include <stdio.h>
+ #include <stddef.h>
+@@ -4839,7 +4853,7 @@
+   exit(0);
+ }
+ EOF
+-if { (eval echo configure:4843: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:4857: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+ then
+   fptools_cv_htype_unsigned_char=`cat conftestval`
+ else
+@@ -4859,7 +4873,7 @@
+ 
+ 
+ echo $ac_n "checking Haskell type for short""... $ac_c" 1>&6
+-echo "configure:4863: checking Haskell type for short" >&5
++echo "configure:4877: checking Haskell type for short" >&5
+ if eval "test \"`echo '$''{'fptools_cv_htype_short'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -4867,7 +4881,7 @@
+   fptools_cv_htype_short=NotReallyATypeCross
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 4871 "configure"
++#line 4885 "configure"
+ #include "confdefs.h"
+ #include <stdio.h>
+ #include <stddef.h>
+@@ -4899,7 +4913,7 @@
+   exit(0);
+ }
+ EOF
+-if { (eval echo configure:4903: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:4917: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+ then
+   fptools_cv_htype_short=`cat conftestval`
+ else
+@@ -4919,7 +4933,7 @@
+ 
+ 
+ echo $ac_n "checking Haskell type for unsigned short""... $ac_c" 1>&6
+-echo "configure:4923: checking Haskell type for unsigned short" >&5
++echo "configure:4937: checking Haskell type for unsigned short" >&5
+ if eval "test \"`echo '$''{'fptools_cv_htype_unsigned_short'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -4927,7 +4941,7 @@
+   fptools_cv_htype_unsigned_short=NotReallyATypeCross
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 4931 "configure"
++#line 4945 "configure"
+ #include "confdefs.h"
+ #include <stdio.h>
+ #include <stddef.h>
+@@ -4959,7 +4973,7 @@
+   exit(0);
+ }
+ EOF
+-if { (eval echo configure:4963: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:4977: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+ then
+   fptools_cv_htype_unsigned_short=`cat conftestval`
+ else
+@@ -4979,7 +4993,7 @@
+ 
+ 
+ echo $ac_n "checking Haskell type for int""... $ac_c" 1>&6
+-echo "configure:4983: checking Haskell type for int" >&5
++echo "configure:4997: checking Haskell type for int" >&5
+ if eval "test \"`echo '$''{'fptools_cv_htype_int'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -4987,7 +5001,7 @@
+   fptools_cv_htype_int=NotReallyATypeCross
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 4991 "configure"
++#line 5005 "configure"
+ #include "confdefs.h"
+ #include <stdio.h>
+ #include <stddef.h>
+@@ -5019,7 +5033,7 @@
+   exit(0);
+ }
+ EOF
+-if { (eval echo configure:5023: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:5037: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+ then
+   fptools_cv_htype_int=`cat conftestval`
+ else
+@@ -5039,7 +5053,7 @@
+ 
+ 
+ echo $ac_n "checking Haskell type for unsigned int""... $ac_c" 1>&6
+-echo "configure:5043: checking Haskell type for unsigned int" >&5
++echo "configure:5057: checking Haskell type for unsigned int" >&5
+ if eval "test \"`echo '$''{'fptools_cv_htype_unsigned_int'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -5047,7 +5061,7 @@
+   fptools_cv_htype_unsigned_int=NotReallyATypeCross
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 5051 "configure"
++#line 5065 "configure"
+ #include "confdefs.h"
+ #include <stdio.h>
+ #include <stddef.h>
+@@ -5079,7 +5093,7 @@
+   exit(0);
+ }
+ EOF
+-if { (eval echo configure:5083: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:5097: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+ then
+   fptools_cv_htype_unsigned_int=`cat conftestval`
+ else
+@@ -5099,7 +5113,7 @@
+ 
+ 
+ echo $ac_n "checking Haskell type for long""... $ac_c" 1>&6
+-echo "configure:5103: checking Haskell type for long" >&5
++echo "configure:5117: checking Haskell type for long" >&5
+ if eval "test \"`echo '$''{'fptools_cv_htype_long'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -5107,7 +5121,7 @@
+   fptools_cv_htype_long=NotReallyATypeCross
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 5111 "configure"
++#line 5125 "configure"
+ #include "confdefs.h"
+ #include <stdio.h>
+ #include <stddef.h>
+@@ -5139,7 +5153,7 @@
+   exit(0);
+ }
+ EOF
+-if { (eval echo configure:5143: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:5157: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+ then
+   fptools_cv_htype_long=`cat conftestval`
+ else
+@@ -5159,7 +5173,7 @@
+ 
+ 
+ echo $ac_n "checking Haskell type for unsigned long""... $ac_c" 1>&6
+-echo "configure:5163: checking Haskell type for unsigned long" >&5
++echo "configure:5177: checking Haskell type for unsigned long" >&5
+ if eval "test \"`echo '$''{'fptools_cv_htype_unsigned_long'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -5167,7 +5181,7 @@
+   fptools_cv_htype_unsigned_long=NotReallyATypeCross
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 5171 "configure"
++#line 5185 "configure"
+ #include "confdefs.h"
+ #include <stdio.h>
+ #include <stddef.h>
+@@ -5199,7 +5213,7 @@
+   exit(0);
+ }
+ EOF
+-if { (eval echo configure:5203: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:5217: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+ then
+   fptools_cv_htype_unsigned_long=`cat conftestval`
+ else
+@@ -5220,7 +5234,7 @@
+ 
+ if test "$fptools_cv_have_long_long" = yes; then
+ echo $ac_n "checking Haskell type for long long""... $ac_c" 1>&6
+-echo "configure:5224: checking Haskell type for long long" >&5
++echo "configure:5238: checking Haskell type for long long" >&5
+ if eval "test \"`echo '$''{'fptools_cv_htype_long_long'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -5228,7 +5242,7 @@
+   fptools_cv_htype_long_long=NotReallyATypeCross
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 5232 "configure"
++#line 5246 "configure"
+ #include "confdefs.h"
+ #include <stdio.h>
+ #include <stddef.h>
+@@ -5260,7 +5274,7 @@
+   exit(0);
+ }
+ EOF
+-if { (eval echo configure:5264: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:5278: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+ then
+   fptools_cv_htype_long_long=`cat conftestval`
+ else
+@@ -5280,7 +5294,7 @@
+ 
+ 
+ echo $ac_n "checking Haskell type for unsigned long long""... $ac_c" 1>&6
+-echo "configure:5284: checking Haskell type for unsigned long long" >&5
++echo "configure:5298: checking Haskell type for unsigned long long" >&5
+ if eval "test \"`echo '$''{'fptools_cv_htype_unsigned_long_long'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -5288,7 +5302,7 @@
+   fptools_cv_htype_unsigned_long_long=NotReallyATypeCross
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 5292 "configure"
++#line 5306 "configure"
+ #include "confdefs.h"
+ #include <stdio.h>
+ #include <stddef.h>
+@@ -5320,7 +5334,7 @@
+   exit(0);
+ }
+ EOF
+-if { (eval echo configure:5324: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:5338: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+ then
+   fptools_cv_htype_unsigned_long_long=`cat conftestval`
+ else
+@@ -5341,7 +5355,7 @@
+ 
+ fi
+ echo $ac_n "checking Haskell type for float""... $ac_c" 1>&6
+-echo "configure:5345: checking Haskell type for float" >&5
++echo "configure:5359: checking Haskell type for float" >&5
+ if eval "test \"`echo '$''{'fptools_cv_htype_float'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -5349,7 +5363,7 @@
+   fptools_cv_htype_float=NotReallyATypeCross
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 5353 "configure"
++#line 5367 "configure"
+ #include "confdefs.h"
+ #include <stdio.h>
+ #include <stddef.h>
+@@ -5381,7 +5395,7 @@
+   exit(0);
+ }
+ EOF
+-if { (eval echo configure:5385: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:5399: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+ then
+   fptools_cv_htype_float=`cat conftestval`
+ else
+@@ -5401,7 +5415,7 @@
+ 
+ 
+ echo $ac_n "checking Haskell type for double""... $ac_c" 1>&6
+-echo "configure:5405: checking Haskell type for double" >&5
++echo "configure:5419: checking Haskell type for double" >&5
+ if eval "test \"`echo '$''{'fptools_cv_htype_double'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -5409,7 +5423,7 @@
+   fptools_cv_htype_double=NotReallyATypeCross
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 5413 "configure"
++#line 5427 "configure"
+ #include "confdefs.h"
+ #include <stdio.h>
+ #include <stddef.h>
+@@ -5441,7 +5455,7 @@
+   exit(0);
+ }
+ EOF
+-if { (eval echo configure:5445: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:5459: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+ then
+   fptools_cv_htype_double=`cat conftestval`
+ else
+@@ -5461,7 +5475,7 @@
+ 
+ 
+ echo $ac_n "checking Haskell type for ptrdiff_t""... $ac_c" 1>&6
+-echo "configure:5465: checking Haskell type for ptrdiff_t" >&5
++echo "configure:5479: checking Haskell type for ptrdiff_t" >&5
+ if eval "test \"`echo '$''{'fptools_cv_htype_ptrdiff_t'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -5469,7 +5483,7 @@
+   fptools_cv_htype_ptrdiff_t=NotReallyATypeCross
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 5473 "configure"
++#line 5487 "configure"
+ #include "confdefs.h"
+ #include <stdio.h>
+ #include <stddef.h>
+@@ -5501,7 +5515,7 @@
+   exit(0);
+ }
+ EOF
+-if { (eval echo configure:5505: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:5519: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+ then
+   fptools_cv_htype_ptrdiff_t=`cat conftestval`
+ else
+@@ -5521,7 +5535,7 @@
+ 
+ 
+ echo $ac_n "checking Haskell type for size_t""... $ac_c" 1>&6
+-echo "configure:5525: checking Haskell type for size_t" >&5
++echo "configure:5539: checking Haskell type for size_t" >&5
+ if eval "test \"`echo '$''{'fptools_cv_htype_size_t'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -5529,7 +5543,7 @@
+   fptools_cv_htype_size_t=NotReallyATypeCross
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 5533 "configure"
++#line 5547 "configure"
+ #include "confdefs.h"
+ #include <stdio.h>
+ #include <stddef.h>
+@@ -5561,7 +5575,7 @@
+   exit(0);
+ }
+ EOF
+-if { (eval echo configure:5565: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:5579: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+ then
+   fptools_cv_htype_size_t=`cat conftestval`
+ else
+@@ -5581,7 +5595,7 @@
+ 
+ 
+ echo $ac_n "checking Haskell type for wchar_t""... $ac_c" 1>&6
+-echo "configure:5585: checking Haskell type for wchar_t" >&5
++echo "configure:5599: checking Haskell type for wchar_t" >&5
+ if eval "test \"`echo '$''{'fptools_cv_htype_wchar_t'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -5589,7 +5603,7 @@
+   fptools_cv_htype_wchar_t=NotReallyATypeCross
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 5593 "configure"
++#line 5607 "configure"
+ #include "confdefs.h"
+ #include <stdio.h>
+ #include <stddef.h>
+@@ -5621,7 +5635,7 @@
+   exit(0);
+ }
+ EOF
+-if { (eval echo configure:5625: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:5639: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+ then
+   fptools_cv_htype_wchar_t=`cat conftestval`
+ else
+@@ -5641,7 +5655,7 @@
+ 
+ 
+ echo $ac_n "checking Haskell type for sig_atomic_t""... $ac_c" 1>&6
+-echo "configure:5645: checking Haskell type for sig_atomic_t" >&5
++echo "configure:5659: checking Haskell type for sig_atomic_t" >&5
+ if eval "test \"`echo '$''{'fptools_cv_htype_sig_atomic_t'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -5649,7 +5663,7 @@
+   fptools_cv_htype_sig_atomic_t=NotReallyATypeCross
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 5653 "configure"
++#line 5667 "configure"
+ #include "confdefs.h"
+ #include <stdio.h>
+ #include <stddef.h>
+@@ -5681,7 +5695,7 @@
+   exit(0);
+ }
+ EOF
+-if { (eval echo configure:5685: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:5699: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+ then
+   fptools_cv_htype_sig_atomic_t=`cat conftestval`
+ else
+@@ -5701,7 +5715,7 @@
+ 
+ 
+ echo $ac_n "checking Haskell type for clock_t""... $ac_c" 1>&6
+-echo "configure:5705: checking Haskell type for clock_t" >&5
++echo "configure:5719: checking Haskell type for clock_t" >&5
+ if eval "test \"`echo '$''{'fptools_cv_htype_clock_t'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -5709,7 +5723,7 @@
+   fptools_cv_htype_clock_t=NotReallyATypeCross
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 5713 "configure"
++#line 5727 "configure"
+ #include "confdefs.h"
+ #include <stdio.h>
+ #include <stddef.h>
+@@ -5741,7 +5755,7 @@
+   exit(0);
+ }
+ EOF
+-if { (eval echo configure:5745: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:5759: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+ then
+   fptools_cv_htype_clock_t=`cat conftestval`
+ else
+@@ -5761,7 +5775,7 @@
+ 
+ 
+ echo $ac_n "checking Haskell type for time_t""... $ac_c" 1>&6
+-echo "configure:5765: checking Haskell type for time_t" >&5
++echo "configure:5779: checking Haskell type for time_t" >&5
+ if eval "test \"`echo '$''{'fptools_cv_htype_time_t'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -5769,7 +5783,7 @@
+   fptools_cv_htype_time_t=NotReallyATypeCross
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 5773 "configure"
++#line 5787 "configure"
+ #include "confdefs.h"
+ #include <stdio.h>
+ #include <stddef.h>
+@@ -5801,7 +5815,7 @@
+   exit(0);
+ }
+ EOF
+-if { (eval echo configure:5805: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:5819: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+ then
+   fptools_cv_htype_time_t=`cat conftestval`
+ else
+@@ -5823,7 +5837,7 @@
+ 
+ if test $GhcLibsWithHOpenGL = YES ; then
+ echo $ac_n "checking Haskell type for GLboolean""... $ac_c" 1>&6
+-echo "configure:5827: checking Haskell type for GLboolean" >&5
++echo "configure:5841: checking Haskell type for GLboolean" >&5
+ if eval "test \"`echo '$''{'fptools_cv_htype_GLboolean'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -5831,7 +5845,7 @@
+   fptools_cv_htype_GLboolean=NotReallyATypeCross
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 5835 "configure"
++#line 5849 "configure"
+ #include "confdefs.h"
+ #include <stdio.h>
+ #include <stddef.h>
+@@ -5863,7 +5877,7 @@
+   exit(0);
+ }
+ EOF
+-if { (eval echo configure:5867: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:5881: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+ then
+   fptools_cv_htype_GLboolean=`cat conftestval`
+ else
+@@ -5883,7 +5897,7 @@
+ 
+ 
+ echo $ac_n "checking Haskell type for GLbyte""... $ac_c" 1>&6
+-echo "configure:5887: checking Haskell type for GLbyte" >&5
++echo "configure:5901: checking Haskell type for GLbyte" >&5
+ if eval "test \"`echo '$''{'fptools_cv_htype_GLbyte'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -5891,7 +5905,7 @@
+   fptools_cv_htype_GLbyte=NotReallyATypeCross
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 5895 "configure"
++#line 5909 "configure"
+ #include "confdefs.h"
+ #include <stdio.h>
+ #include <stddef.h>
+@@ -5923,7 +5937,7 @@
+   exit(0);
+ }
+ EOF
+-if { (eval echo configure:5927: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:5941: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+ then
+   fptools_cv_htype_GLbyte=`cat conftestval`
+ else
+@@ -5943,7 +5957,7 @@
+ 
+ 
+ echo $ac_n "checking Haskell type for GLubyte""... $ac_c" 1>&6
+-echo "configure:5947: checking Haskell type for GLubyte" >&5
++echo "configure:5961: checking Haskell type for GLubyte" >&5
+ if eval "test \"`echo '$''{'fptools_cv_htype_GLubyte'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -5951,7 +5965,7 @@
+   fptools_cv_htype_GLubyte=NotReallyATypeCross
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 5955 "configure"
++#line 5969 "configure"
+ #include "confdefs.h"
+ #include <stdio.h>
+ #include <stddef.h>
+@@ -5983,7 +5997,7 @@
+   exit(0);
+ }
+ EOF
+-if { (eval echo configure:5987: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:6001: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+ then
+   fptools_cv_htype_GLubyte=`cat conftestval`
+ else
+@@ -6003,7 +6017,7 @@
+ 
+ 
+ echo $ac_n "checking Haskell type for GLshort""... $ac_c" 1>&6
+-echo "configure:6007: checking Haskell type for GLshort" >&5
++echo "configure:6021: checking Haskell type for GLshort" >&5
+ if eval "test \"`echo '$''{'fptools_cv_htype_GLshort'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -6011,7 +6025,7 @@
+   fptools_cv_htype_GLshort=NotReallyATypeCross
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 6015 "configure"
++#line 6029 "configure"
+ #include "confdefs.h"
+ #include <stdio.h>
+ #include <stddef.h>
+@@ -6043,7 +6057,7 @@
+   exit(0);
+ }
+ EOF
+-if { (eval echo configure:6047: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:6061: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+ then
+   fptools_cv_htype_GLshort=`cat conftestval`
+ else
+@@ -6063,7 +6077,7 @@
+ 
+ 
+ echo $ac_n "checking Haskell type for GLushort""... $ac_c" 1>&6
+-echo "configure:6067: checking Haskell type for GLushort" >&5
++echo "configure:6081: checking Haskell type for GLushort" >&5
+ if eval "test \"`echo '$''{'fptools_cv_htype_GLushort'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -6071,7 +6085,7 @@
+   fptools_cv_htype_GLushort=NotReallyATypeCross
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 6075 "configure"
++#line 6089 "configure"
+ #include "confdefs.h"
+ #include <stdio.h>
+ #include <stddef.h>
+@@ -6103,7 +6117,7 @@
+   exit(0);
+ }
+ EOF
+-if { (eval echo configure:6107: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:6121: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+ then
+   fptools_cv_htype_GLushort=`cat conftestval`
+ else
+@@ -6123,7 +6137,7 @@
+ 
+ 
+ echo $ac_n "checking Haskell type for GLint""... $ac_c" 1>&6
+-echo "configure:6127: checking Haskell type for GLint" >&5
++echo "configure:6141: checking Haskell type for GLint" >&5
+ if eval "test \"`echo '$''{'fptools_cv_htype_GLint'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -6131,7 +6145,7 @@
+   fptools_cv_htype_GLint=NotReallyATypeCross
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 6135 "configure"
++#line 6149 "configure"
+ #include "confdefs.h"
+ #include <stdio.h>
+ #include <stddef.h>
+@@ -6163,7 +6177,7 @@
+   exit(0);
+ }
+ EOF
+-if { (eval echo configure:6167: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:6181: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+ then
+   fptools_cv_htype_GLint=`cat conftestval`
+ else
+@@ -6183,7 +6197,7 @@
+ 
+ 
+ echo $ac_n "checking Haskell type for GLuint""... $ac_c" 1>&6
+-echo "configure:6187: checking Haskell type for GLuint" >&5
++echo "configure:6201: checking Haskell type for GLuint" >&5
+ if eval "test \"`echo '$''{'fptools_cv_htype_GLuint'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -6191,7 +6205,7 @@
+   fptools_cv_htype_GLuint=NotReallyATypeCross
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 6195 "configure"
++#line 6209 "configure"
+ #include "confdefs.h"
+ #include <stdio.h>
+ #include <stddef.h>
+@@ -6223,7 +6237,7 @@
+   exit(0);
+ }
+ EOF
+-if { (eval echo configure:6227: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:6241: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+ then
+   fptools_cv_htype_GLuint=`cat conftestval`
+ else
+@@ -6243,7 +6257,7 @@
+ 
+ 
+ echo $ac_n "checking Haskell type for GLsizei""... $ac_c" 1>&6
+-echo "configure:6247: checking Haskell type for GLsizei" >&5
++echo "configure:6261: checking Haskell type for GLsizei" >&5
+ if eval "test \"`echo '$''{'fptools_cv_htype_GLsizei'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -6251,7 +6265,7 @@
+   fptools_cv_htype_GLsizei=NotReallyATypeCross
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 6255 "configure"
++#line 6269 "configure"
+ #include "confdefs.h"
+ #include <stdio.h>
+ #include <stddef.h>
+@@ -6283,7 +6297,7 @@
+   exit(0);
+ }
+ EOF
+-if { (eval echo configure:6287: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:6301: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+ then
+   fptools_cv_htype_GLsizei=`cat conftestval`
+ else
+@@ -6303,7 +6317,7 @@
+ 
+ 
+ echo $ac_n "checking Haskell type for GLenum""... $ac_c" 1>&6
+-echo "configure:6307: checking Haskell type for GLenum" >&5
++echo "configure:6321: checking Haskell type for GLenum" >&5
+ if eval "test \"`echo '$''{'fptools_cv_htype_GLenum'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -6311,7 +6325,7 @@
+   fptools_cv_htype_GLenum=NotReallyATypeCross
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 6315 "configure"
++#line 6329 "configure"
+ #include "confdefs.h"
+ #include <stdio.h>
+ #include <stddef.h>
+@@ -6343,7 +6357,7 @@
+   exit(0);
+ }
+ EOF
+-if { (eval echo configure:6347: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:6361: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+ then
+   fptools_cv_htype_GLenum=`cat conftestval`
+ else
+@@ -6363,7 +6377,7 @@
+ 
+ 
+ echo $ac_n "checking Haskell type for GLbitfield""... $ac_c" 1>&6
+-echo "configure:6367: checking Haskell type for GLbitfield" >&5
++echo "configure:6381: checking Haskell type for GLbitfield" >&5
+ if eval "test \"`echo '$''{'fptools_cv_htype_GLbitfield'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -6371,7 +6385,7 @@
+   fptools_cv_htype_GLbitfield=NotReallyATypeCross
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 6375 "configure"
++#line 6389 "configure"
+ #include "confdefs.h"
+ #include <stdio.h>
+ #include <stddef.h>
+@@ -6403,7 +6417,7 @@
+   exit(0);
+ }
+ EOF
+-if { (eval echo configure:6407: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:6421: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+ then
+   fptools_cv_htype_GLbitfield=`cat conftestval`
+ else
+@@ -6423,7 +6437,7 @@
+ 
+ 
+ echo $ac_n "checking Haskell type for GLfloat""... $ac_c" 1>&6
+-echo "configure:6427: checking Haskell type for GLfloat" >&5
++echo "configure:6441: checking Haskell type for GLfloat" >&5
+ if eval "test \"`echo '$''{'fptools_cv_htype_GLfloat'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -6431,7 +6445,7 @@
+   fptools_cv_htype_GLfloat=NotReallyATypeCross
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 6435 "configure"
++#line 6449 "configure"
+ #include "confdefs.h"
+ #include <stdio.h>
+ #include <stddef.h>
+@@ -6463,7 +6477,7 @@
+   exit(0);
+ }
+ EOF
+-if { (eval echo configure:6467: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:6481: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+ then
+   fptools_cv_htype_GLfloat=`cat conftestval`
+ else
+@@ -6483,7 +6497,7 @@
+ 
+ 
+ echo $ac_n "checking Haskell type for GLclampf""... $ac_c" 1>&6
+-echo "configure:6487: checking Haskell type for GLclampf" >&5
++echo "configure:6501: checking Haskell type for GLclampf" >&5
+ if eval "test \"`echo '$''{'fptools_cv_htype_GLclampf'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -6491,7 +6505,7 @@
+   fptools_cv_htype_GLclampf=NotReallyATypeCross
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 6495 "configure"
++#line 6509 "configure"
+ #include "confdefs.h"
+ #include <stdio.h>
+ #include <stddef.h>
+@@ -6523,7 +6537,7 @@
+   exit(0);
+ }
+ EOF
+-if { (eval echo configure:6527: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:6541: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+ then
+   fptools_cv_htype_GLclampf=`cat conftestval`
+ else
+@@ -6543,7 +6557,7 @@
+ 
+ 
+ echo $ac_n "checking Haskell type for GLdouble""... $ac_c" 1>&6
+-echo "configure:6547: checking Haskell type for GLdouble" >&5
++echo "configure:6561: checking Haskell type for GLdouble" >&5
+ if eval "test \"`echo '$''{'fptools_cv_htype_GLdouble'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -6551,7 +6565,7 @@
+   fptools_cv_htype_GLdouble=NotReallyATypeCross
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 6555 "configure"
++#line 6569 "configure"
+ #include "confdefs.h"
+ #include <stdio.h>
+ #include <stddef.h>
+@@ -6583,7 +6597,7 @@
+   exit(0);
+ }
+ EOF
+-if { (eval echo configure:6587: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:6601: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+ then
+   fptools_cv_htype_GLdouble=`cat conftestval`
+ else
+@@ -6603,7 +6617,7 @@
+ 
+ 
+ echo $ac_n "checking Haskell type for GLclampd""... $ac_c" 1>&6
+-echo "configure:6607: checking Haskell type for GLclampd" >&5
++echo "configure:6621: checking Haskell type for GLclampd" >&5
+ if eval "test \"`echo '$''{'fptools_cv_htype_GLclampd'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -6611,7 +6625,7 @@
+   fptools_cv_htype_GLclampd=NotReallyATypeCross
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 6615 "configure"
++#line 6629 "configure"
+ #include "confdefs.h"
+ #include <stdio.h>
+ #include <stddef.h>
+@@ -6643,7 +6657,7 @@
+   exit(0);
+ }
+ EOF
+-if { (eval echo configure:6647: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:6661: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+ then
+   fptools_cv_htype_GLclampd=`cat conftestval`
+ else
+@@ -6670,7 +6684,7 @@
+ eval "def_name=CCONST_$ac_const_name"
+ eval "cv_name=ac_cv_cconst_$ac_const_name"
+ echo $ac_n "checking value of $ac_const_name""... $ac_c" 1>&6
+-echo "configure:6674: checking value of $ac_const_name" >&5
++echo "configure:6688: checking value of $ac_const_name" >&5
+ if eval "test \"`echo '$''{'$cv_name'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -6678,7 +6692,7 @@
+   eval "$cv_name=-1"
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 6682 "configure"
++#line 6696 "configure"
+ #include "confdefs.h"
+ #include <stdio.h>
+ #include <errno.h>
+@@ -6690,7 +6704,7 @@
+   exit(0);
+ }
+ EOF
+-if { (eval echo configure:6694: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:6708: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+ then
+   eval "$cv_name=`cat conftestval`"
+ else
+@@ -6716,7 +6730,7 @@
+ 
+ 
+ echo $ac_n "checking whether we can open files in binary mode""... $ac_c" 1>&6
+-echo "configure:6720: checking whether we can open files in binary mode" >&5
++echo "configure:6734: checking whether we can open files in binary mode" >&5
+ if eval "test \"`echo '$''{'fptools_cv_have_o_binary'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -6730,7 +6744,7 @@
+ cross_compiling=$ac_cv_prog_cc_cross
+ 
+ cat > conftest.$ac_ext <<EOF
+-#line 6734 "configure"
++#line 6748 "configure"
+ #include "confdefs.h"
+ 
+ int main() {
+@@ -6740,7 +6754,7 @@
+ int x = O_BINARY;
+ ; return 0; }
+ EOF
+-if { (eval echo configure:6744: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:6758: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+   rm -rf conftest*
+   fptools_cv_have_o_binary=yes
+ else
+@@ -6774,7 +6788,7 @@
+ ac_save_LIBS="$LIBS"
+ LIBS=;
+ cat > conftest.$ac_ext <<EOF
+-#line 6778 "configure"
++#line 6792 "configure"
+ #include "confdefs.h"
+ 
+ #if HAVE_WINDOWS_H
+@@ -6787,7 +6801,7 @@
+ 
+ int t() { return 0; }
+ EOF
+-if { (eval echo configure:6791: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
++if { (eval echo configure:6805: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
+   
+     LIBS="$ac_save_LIBS"
+     rm -rf conftest*
+@@ -6811,7 +6825,7 @@
+ ac_save_LIBS="$LIBS"
+ LIBS=;
+ cat > conftest.$ac_ext <<EOF
+-#line 6815 "configure"
++#line 6829 "configure"
+ #include "confdefs.h"
+ 
+ #if HAVE_WINDOWS_H
+@@ -6825,7 +6839,7 @@
+ 
+ int t() { return 0; }
+ EOF
+-if { (eval echo configure:6829: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
++if { (eval echo configure:6843: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
+   
+     LIBS="$ac_save_LIBS"
+     rm -rf conftest*
+@@ -6847,12 +6861,12 @@
+ 
+ 
+ echo $ac_n "checking return type of signal handlers""... $ac_c" 1>&6
+-echo "configure:6851: checking return type of signal handlers" >&5
++echo "configure:6865: checking return type of signal handlers" >&5
+ if eval "test \"`echo '$''{'ac_cv_type_signal'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 6856 "configure"
++#line 6870 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ #include <signal.h>
+@@ -6869,7 +6883,7 @@
+ int i;
+ ; return 0; }
+ EOF
+-if { (eval echo configure:6873: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:6887: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+   rm -rf conftest*
+   ac_cv_type_signal=void
+ else
+@@ -6897,12 +6911,12 @@
+ for ac_func in strcasecmp _stricmp stricmp strcmpi
+ do
+ echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
+-echo "configure:6901: checking for $ac_func" >&5
++echo "configure:6915: checking for $ac_func" >&5
+ if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 6906 "configure"
++#line 6920 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char $ac_func(); below.  */
+@@ -6925,7 +6939,7 @@
+ 
+ ; return 0; }
+ EOF
+-if { (eval echo configure:6929: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:6943: \"$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
+@@ -6952,12 +6966,12 @@
+ for ac_func in strcmp
+ do
+ echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
+-echo "configure:6956: checking for $ac_func" >&5
++echo "configure:6970: checking for $ac_func" >&5
+ if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 6961 "configure"
++#line 6975 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char $ac_func(); below.  */
+@@ -6980,7 +6994,7 @@
+ 
+ ; return 0; }
+ EOF
+-if { (eval echo configure:6984: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:6998: \"$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
+@@ -7007,12 +7021,12 @@
+ for ac_func in realpath _fullpath
+ do
+ echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
+-echo "configure:7011: checking for $ac_func" >&5
++echo "configure:7025: checking for $ac_func" >&5
+ if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 7016 "configure"
++#line 7030 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char $ac_func(); below.  */
+@@ -7035,7 +7049,7 @@
+ 
+ ; return 0; }
+ EOF
+-if { (eval echo configure:7039: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:7053: \"$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
+@@ -7062,12 +7076,12 @@
+ for ac_func in PBHSetVolSync macsystem
+ do
+ echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
+-echo "configure:7066: checking for $ac_func" >&5
++echo "configure:7080: checking for $ac_func" >&5
+ if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 7071 "configure"
++#line 7085 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char $ac_func(); below.  */
+@@ -7090,7 +7104,7 @@
+ 
+ ; return 0; }
+ EOF
+-if { (eval echo configure:7094: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:7108: \"$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
+@@ -7117,12 +7131,12 @@
+ for ac_func in fgetpos fsetpos fseek ftell
+ do
+ echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
+-echo "configure:7121: checking for $ac_func" >&5
++echo "configure:7135: checking for $ac_func" >&5
+ if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 7126 "configure"
++#line 7140 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char $ac_func(); below.  */
+@@ -7145,7 +7159,7 @@
+ 
+ ; return 0; }
+ EOF
+-if { (eval echo configure:7149: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:7163: \"$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
+@@ -7172,12 +7186,12 @@
+ for ac_func in vsnprintf _vsnprintf
+ do
+ echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
+-echo "configure:7176: checking for $ac_func" >&5
++echo "configure:7190: checking for $ac_func" >&5
+ if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 7181 "configure"
++#line 7195 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char $ac_func(); below.  */
+@@ -7200,7 +7214,7 @@
+ 
+ ; return 0; }
+ EOF
+-if { (eval echo configure:7204: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:7218: \"$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
+@@ -7227,12 +7241,12 @@
+ for ac_func in snprintf  _snprintf 
+ do
+ echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
+-echo "configure:7231: checking for $ac_func" >&5
++echo "configure:7245: checking for $ac_func" >&5
+ if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 7236 "configure"
++#line 7250 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char $ac_func(); below.  */
+@@ -7255,7 +7269,7 @@
+ 
+ ; return 0; }
+ EOF
+-if { (eval echo configure:7259: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:7273: \"$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
+@@ -7282,12 +7296,12 @@
+ for ac_func in popen     _popen 
+ do
+ echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
+-echo "configure:7286: checking for $ac_func" >&5
++echo "configure:7300: checking for $ac_func" >&5
+ if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 7291 "configure"
++#line 7305 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char $ac_func(); below.  */
+@@ -7310,7 +7324,7 @@
+ 
+ ; return 0; }
+ EOF
+-if { (eval echo configure:7314: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:7328: \"$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
+@@ -7337,12 +7351,12 @@
+ for ac_func in pclose    _pclose 
+ do
+ echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
+-echo "configure:7341: checking for $ac_func" >&5
++echo "configure:7355: checking for $ac_func" >&5
+ if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 7346 "configure"
++#line 7360 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char $ac_func(); below.  */
+@@ -7365,7 +7379,7 @@
+ 
+ ; return 0; }
+ EOF
+-if { (eval echo configure:7369: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:7383: \"$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
+@@ -7394,12 +7408,12 @@
+ for ac_func in access ftime getclock getpagesize getrusage gettimeofday mktime mprotect readlink setitimer stat lstat symlink sysconf timelocal times vadvise vfork localtime_r gmtime_r
+ do
+ echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
+-echo "configure:7398: checking for $ac_func" >&5
++echo "configure:7412: checking for $ac_func" >&5
+ if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 7403 "configure"
++#line 7417 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char $ac_func(); below.  */
+@@ -7422,7 +7436,7 @@
+ 
+ ; return 0; }
+ EOF
+-if { (eval echo configure:7426: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:7440: \"$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
+@@ -7448,7 +7462,7 @@
+ 
+ 
+ echo $ac_n "checking for __gmpz_fdiv_qr in -lgmp""... $ac_c" 1>&6
+-echo "configure:7452: checking for __gmpz_fdiv_qr in -lgmp" >&5
++echo "configure:7466: checking for __gmpz_fdiv_qr in -lgmp" >&5
+ ac_lib_var=`echo gmp'_'__gmpz_fdiv_qr | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+@@ -7456,7 +7470,7 @@
+   ac_save_LIBS="$LIBS"
+ LIBS="-lgmp  $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 7460 "configure"
++#line 7474 "configure"
+ #include "confdefs.h"
+ /* Override any gcc2 internal prototype to avoid an error.  */
+ /* We use char because int might match the return type of a gcc2
+@@ -7467,7 +7481,7 @@
+ __gmpz_fdiv_qr()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:7471: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:7485: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_lib_$ac_lib_var=yes"
+ else
+@@ -7486,7 +7500,7 @@
+ else
+   echo "$ac_t""no" 1>&6
+ echo $ac_n "checking for __gmpz_fdiv_qr in -lgmp3""... $ac_c" 1>&6
+-echo "configure:7490: checking for __gmpz_fdiv_qr in -lgmp3" >&5
++echo "configure:7504: checking for __gmpz_fdiv_qr in -lgmp3" >&5
+ ac_lib_var=`echo gmp3'_'__gmpz_fdiv_qr | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+@@ -7494,7 +7508,7 @@
+   ac_save_LIBS="$LIBS"
+ LIBS="-lgmp3  $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 7498 "configure"
++#line 7512 "configure"
+ #include "confdefs.h"
+ /* Override any gcc2 internal prototype to avoid an error.  */
+ /* We use char because int might match the return type of a gcc2
+@@ -7505,7 +7519,7 @@
+ __gmpz_fdiv_qr()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:7509: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:7523: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_lib_$ac_lib_var=yes"
+ else
+@@ -7532,12 +7546,12 @@
+ 
+ 
+ echo $ac_n "checking for GNU regex in libc""... $ac_c" 1>&6
+-echo "configure:7536: checking for GNU regex in libc" >&5
++echo "configure:7550: checking for GNU regex in libc" >&5
+ if eval "test \"`echo '$''{'fptools_cv_have_regex'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 7541 "configure"
++#line 7555 "configure"
+ #include "confdefs.h"
+ #if HAVE_UNISTD_H
+ #include <unistd.h>
+@@ -7550,7 +7564,7 @@
+     re_search_2 (&patbuf, "", 0, "",0, 0,0,0,0); 
+ ; return 0; }
+ EOF
+-if { (eval echo configure:7554: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:7568: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   fptools_cv_have_regex=yes
+ else
+@@ -7572,7 +7586,7 @@
+ 
+ 
+ echo $ac_n "checking for xmalloc in -liberty""... $ac_c" 1>&6
+-echo "configure:7576: checking for xmalloc in -liberty" >&5
++echo "configure:7590: checking for xmalloc in -liberty" >&5
+ ac_lib_var=`echo iberty'_'xmalloc | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+@@ -7580,7 +7594,7 @@
+   ac_save_LIBS="$LIBS"
+ LIBS="-liberty  $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 7584 "configure"
++#line 7598 "configure"
+ #include "confdefs.h"
+ /* Override any gcc2 internal prototype to avoid an error.  */
+ /* We use char because int might match the return type of a gcc2
+@@ -7591,7 +7605,7 @@
+ xmalloc()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:7595: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:7609: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_lib_$ac_lib_var=yes"
+ else
+@@ -7619,7 +7633,7 @@
+ fi
+ 
+ echo $ac_n "checking for bfd_init in -lbfd""... $ac_c" 1>&6
+-echo "configure:7623: checking for bfd_init in -lbfd" >&5
++echo "configure:7637: checking for bfd_init in -lbfd" >&5
+ ac_lib_var=`echo bfd'_'bfd_init | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+@@ -7627,7 +7641,7 @@
+   ac_save_LIBS="$LIBS"
+ LIBS="-lbfd  $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 7631 "configure"
++#line 7645 "configure"
+ #include "confdefs.h"
+ /* Override any gcc2 internal prototype to avoid an error.  */
+ /* We use char because int might match the return type of a gcc2
+@@ -7638,7 +7652,7 @@
+ bfd_init()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:7642: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:7656: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_lib_$ac_lib_var=yes"
+ else
+@@ -7667,7 +7681,7 @@
+ 
+ 
+ echo $ac_n "checking for tputs in -lncurses""... $ac_c" 1>&6
+-echo "configure:7671: checking for tputs in -lncurses" >&5
++echo "configure:7685: checking for tputs in -lncurses" >&5
+ ac_lib_var=`echo ncurses'_'tputs | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+@@ -7675,7 +7689,7 @@
+   ac_save_LIBS="$LIBS"
+ LIBS="-lncurses  $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 7679 "configure"
++#line 7693 "configure"
+ #include "confdefs.h"
+ /* Override any gcc2 internal prototype to avoid an error.  */
+ /* We use char because int might match the return type of a gcc2
+@@ -7686,7 +7700,7 @@
+ tputs()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:7690: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:7704: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_lib_$ac_lib_var=yes"
+ else
+@@ -7705,7 +7719,7 @@
+ else
+   echo "$ac_t""no" 1>&6
+ echo $ac_n "checking for tputs in -ltermcap""... $ac_c" 1>&6
+-echo "configure:7709: checking for tputs in -ltermcap" >&5
++echo "configure:7723: checking for tputs in -ltermcap" >&5
+ ac_lib_var=`echo termcap'_'tputs | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+@@ -7713,7 +7727,7 @@
+   ac_save_LIBS="$LIBS"
+ LIBS="-ltermcap  $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 7717 "configure"
++#line 7731 "configure"
+ #include "confdefs.h"
+ /* Override any gcc2 internal prototype to avoid an error.  */
+ /* We use char because int might match the return type of a gcc2
+@@ -7724,7 +7738,7 @@
+ tputs()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:7728: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:7742: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_lib_$ac_lib_var=yes"
+ else
+@@ -7743,7 +7757,7 @@
+ else
+   echo "$ac_t""no" 1>&6
+ echo $ac_n "checking for tputs in -lcurses""... $ac_c" 1>&6
+-echo "configure:7747: checking for tputs in -lcurses" >&5
++echo "configure:7761: checking for tputs in -lcurses" >&5
+ ac_lib_var=`echo curses'_'tputs | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+@@ -7751,7 +7765,7 @@
+   ac_save_LIBS="$LIBS"
+ LIBS="-lcurses  $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 7755 "configure"
++#line 7769 "configure"
+ #include "confdefs.h"
+ /* Override any gcc2 internal prototype to avoid an error.  */
+ /* We use char because int might match the return type of a gcc2
+@@ -7762,7 +7776,7 @@
+ tputs()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:7766: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:7780: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_lib_$ac_lib_var=yes"
+ else
+@@ -7791,7 +7805,7 @@
+ if test $HaveLibTermcap = YES ; then
+   LIBS="-l$LibTermcap $LIBS"
+   echo $ac_n "checking for readline in -lreadline""... $ac_c" 1>&6
+-echo "configure:7795: checking for readline in -lreadline" >&5
++echo "configure:7809: checking for readline in -lreadline" >&5
+ ac_lib_var=`echo readline'_'readline | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+@@ -7799,7 +7813,7 @@
+   ac_save_LIBS="$LIBS"
+ LIBS="-lreadline  $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 7803 "configure"
++#line 7817 "configure"
+ #include "confdefs.h"
+ /* Override any gcc2 internal prototype to avoid an error.  */
+ /* We use char because int might match the return type of a gcc2
+@@ -7810,7 +7824,7 @@
+ readline()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:7814: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:7828: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_lib_$ac_lib_var=yes"
+ else
+@@ -7850,7 +7864,7 @@
+ 
+ if test "$HaveLibReadline"; then
+   echo $ac_n "checking for rl_erase_empty_line in -lreadline""... $ac_c" 1>&6
+-echo "configure:7854: checking for rl_erase_empty_line in -lreadline" >&5
++echo "configure:7868: checking for rl_erase_empty_line in -lreadline" >&5
+ ac_lib_var=`echo readline'_'rl_erase_empty_line | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+@@ -7858,7 +7872,7 @@
+   ac_save_LIBS="$LIBS"
+ LIBS="-lreadline  $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 7862 "configure"
++#line 7876 "configure"
+ #include "confdefs.h"
+ /* Override any gcc2 internal prototype to avoid an error.  */
+ /* We use char because int might match the return type of a gcc2
+@@ -7869,7 +7883,7 @@
+ rl_erase_empty_line()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:7873: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:7887: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_lib_$ac_lib_var=yes"
+ else
+@@ -7897,7 +7911,7 @@
+ fi
+ 
+   echo $ac_n "checking for rl_free_undo_list in -lreadline""... $ac_c" 1>&6
+-echo "configure:7901: checking for rl_free_undo_list in -lreadline" >&5
++echo "configure:7915: checking for rl_free_undo_list in -lreadline" >&5
+ ac_lib_var=`echo readline'_'rl_free_undo_list | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+@@ -7905,7 +7919,7 @@
+   ac_save_LIBS="$LIBS"
+ LIBS="-lreadline  $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 7909 "configure"
++#line 7923 "configure"
+ #include "confdefs.h"
+ /* Override any gcc2 internal prototype to avoid an error.  */
+ /* We use char because int might match the return type of a gcc2
+@@ -7916,7 +7930,7 @@
+ rl_free_undo_list()
+ ; 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:7934: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_lib_$ac_lib_var=yes"
+ else
+@@ -7961,7 +7975,7 @@
+   ;;
+ *-ncr-sysv4.3*)
+   echo $ac_n "checking for _mwvalidcheckl in -lmw""... $ac_c" 1>&6
+-echo "configure:7965: checking for _mwvalidcheckl in -lmw" >&5
++echo "configure:7979: checking for _mwvalidcheckl in -lmw" >&5
+ ac_lib_var=`echo mw'_'_mwvalidcheckl | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+@@ -7969,7 +7983,7 @@
+   ac_save_LIBS="$LIBS"
+ LIBS="-lmw  $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 7973 "configure"
++#line 7987 "configure"
+ #include "confdefs.h"
+ /* Override any gcc2 internal prototype to avoid an error.  */
+ /* We use char because int might match the return type of a gcc2
+@@ -7980,7 +7994,7 @@
+ _mwvalidcheckl()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:7984: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:7998: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_lib_$ac_lib_var=yes"
+ else
+@@ -8001,7 +8015,7 @@
+ fi
+ 
+   echo $ac_n "checking for main in -lm""... $ac_c" 1>&6
+-echo "configure:8005: checking for main in -lm" >&5
++echo "configure:8019: checking for main in -lm" >&5
+ ac_lib_var=`echo m'_'main | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+@@ -8009,14 +8023,14 @@
+   ac_save_LIBS="$LIBS"
+ LIBS="-lm  $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 8013 "configure"
++#line 8027 "configure"
+ #include "confdefs.h"
+ 
+ int main() {
+ main()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:8020: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:8034: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_lib_$ac_lib_var=yes"
+ else
+@@ -8039,7 +8053,7 @@
+   ;;
+ *)
+   echo $ac_n "checking for main in -lm""... $ac_c" 1>&6
+-echo "configure:8043: checking for main in -lm" >&5
++echo "configure:8057: checking for main in -lm" >&5
+ ac_lib_var=`echo m'_'main | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+@@ -8047,14 +8061,14 @@
+   ac_save_LIBS="$LIBS"
+ LIBS="-lm  $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 8051 "configure"
++#line 8065 "configure"
+ #include "confdefs.h"
+ 
+ int main() {
+ main()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:8058: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:8072: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_lib_$ac_lib_var=yes"
+ else
+@@ -8087,7 +8101,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:8091: checking for X" >&5
++echo "configure:8105: checking for X" >&5
+ 
+ # Check whether --with-x or --without-x was given.
+ if test "${with_x+set}" = set; then
+@@ -8149,12 +8163,12 @@
+ 
+   # First, try using that file with no special directory specified.
+ cat > conftest.$ac_ext <<EOF
+-#line 8153 "configure"
++#line 8167 "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:8158: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:8172: \"$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*
+@@ -8223,14 +8237,14 @@
+   ac_save_LIBS="$LIBS"
+   LIBS="-l$x_direct_test_library $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 8227 "configure"
++#line 8241 "configure"
+ #include "confdefs.h"
+ 
+ int main() {
+ ${x_direct_test_function}()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:8234: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:8248: \"$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.
+@@ -8336,17 +8350,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:8340: checking whether -R must be followed by a space" >&5
++echo "configure:8354: 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 8343 "configure"
++#line 8357 "configure"
+ #include "confdefs.h"
+ 
+ int main() {
+ 
+ ; return 0; }
+ EOF
+-if { (eval echo configure:8350: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:8364: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   ac_R_nospace=yes
+ else
+@@ -8362,14 +8376,14 @@
+       else
+ 	LIBS="$ac_xsave_LIBS -R $x_libraries"
+ 	cat > conftest.$ac_ext <<EOF
+-#line 8366 "configure"
++#line 8380 "configure"
+ #include "confdefs.h"
+ 
+ int main() {
+ 
+ ; return 0; }
+ EOF
+-if { (eval echo configure:8373: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:8387: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   ac_R_space=yes
+ else
+@@ -8401,7 +8415,7 @@
+     # libraries were built with DECnet support.  And karl@cs.umb.edu says
+     # the Alpha needs dnet_stub (dnet does not exist).
+     echo $ac_n "checking for dnet_ntoa in -ldnet""... $ac_c" 1>&6
+-echo "configure:8405: checking for dnet_ntoa in -ldnet" >&5
++echo "configure:8419: checking for dnet_ntoa in -ldnet" >&5
+ ac_lib_var=`echo dnet'_'dnet_ntoa | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+@@ -8409,7 +8423,7 @@
+   ac_save_LIBS="$LIBS"
+ LIBS="-ldnet  $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 8413 "configure"
++#line 8427 "configure"
+ #include "confdefs.h"
+ /* Override any gcc2 internal prototype to avoid an error.  */
+ /* We use char because int might match the return type of a gcc2
+@@ -8420,7 +8434,7 @@
+ dnet_ntoa()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:8424: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:8438: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_lib_$ac_lib_var=yes"
+ else
+@@ -8442,7 +8456,7 @@
+ 
+     if test $ac_cv_lib_dnet_dnet_ntoa = no; then
+       echo $ac_n "checking for dnet_ntoa in -ldnet_stub""... $ac_c" 1>&6
+-echo "configure:8446: checking for dnet_ntoa in -ldnet_stub" >&5
++echo "configure:8460: checking for dnet_ntoa in -ldnet_stub" >&5
+ ac_lib_var=`echo dnet_stub'_'dnet_ntoa | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+@@ -8450,7 +8464,7 @@
+   ac_save_LIBS="$LIBS"
+ LIBS="-ldnet_stub  $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 8454 "configure"
++#line 8468 "configure"
+ #include "confdefs.h"
+ /* Override any gcc2 internal prototype to avoid an error.  */
+ /* We use char because int might match the return type of a gcc2
+@@ -8461,7 +8475,7 @@
+ dnet_ntoa()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:8465: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:8479: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_lib_$ac_lib_var=yes"
+ else
+@@ -8490,12 +8504,12 @@
+     # The nsl library prevents programs from opening the X display
+     # on Irix 5.2, according to dickey@clark.net.
+     echo $ac_n "checking for gethostbyname""... $ac_c" 1>&6
+-echo "configure:8494: checking for gethostbyname" >&5
++echo "configure:8508: checking for gethostbyname" >&5
+ if eval "test \"`echo '$''{'ac_cv_func_gethostbyname'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 8499 "configure"
++#line 8513 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char gethostbyname(); below.  */
+@@ -8518,7 +8532,7 @@
+ 
+ ; return 0; }
+ EOF
+-if { (eval echo configure:8522: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:8536: \"$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
+@@ -8539,7 +8553,7 @@
+ 
+     if test $ac_cv_func_gethostbyname = no; then
+       echo $ac_n "checking for gethostbyname in -lnsl""... $ac_c" 1>&6
+-echo "configure:8543: checking for gethostbyname in -lnsl" >&5
++echo "configure:8557: checking for gethostbyname in -lnsl" >&5
+ ac_lib_var=`echo nsl'_'gethostbyname | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+@@ -8547,7 +8561,7 @@
+   ac_save_LIBS="$LIBS"
+ LIBS="-lnsl  $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 8551 "configure"
++#line 8565 "configure"
+ #include "confdefs.h"
+ /* Override any gcc2 internal prototype to avoid an error.  */
+ /* We use char because int might match the return type of a gcc2
+@@ -8558,7 +8572,7 @@
+ gethostbyname()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:8562: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:8576: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_lib_$ac_lib_var=yes"
+ else
+@@ -8588,12 +8602,12 @@
+     # -lsocket must be given before -lnsl if both are needed.
+     # We assume that if connect needs -lnsl, so does gethostbyname.
+     echo $ac_n "checking for connect""... $ac_c" 1>&6
+-echo "configure:8592: checking for connect" >&5
++echo "configure:8606: checking for connect" >&5
+ if eval "test \"`echo '$''{'ac_cv_func_connect'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 8597 "configure"
++#line 8611 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char connect(); below.  */
+@@ -8616,7 +8630,7 @@
+ 
+ ; return 0; }
+ EOF
+-if { (eval echo configure:8620: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:8634: \"$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
+@@ -8637,7 +8651,7 @@
+ 
+     if test $ac_cv_func_connect = no; then
+       echo $ac_n "checking for connect in -lsocket""... $ac_c" 1>&6
+-echo "configure:8641: checking for connect in -lsocket" >&5
++echo "configure:8655: checking for connect in -lsocket" >&5
+ ac_lib_var=`echo socket'_'connect | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+@@ -8645,7 +8659,7 @@
+   ac_save_LIBS="$LIBS"
+ LIBS="-lsocket $X_EXTRA_LIBS $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 8649 "configure"
++#line 8663 "configure"
+ #include "confdefs.h"
+ /* Override any gcc2 internal prototype to avoid an error.  */
+ /* We use char because int might match the return type of a gcc2
+@@ -8656,7 +8670,7 @@
+ connect()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:8660: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:8674: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_lib_$ac_lib_var=yes"
+ else
+@@ -8680,12 +8694,12 @@
+ 
+     # gomez@mi.uni-erlangen.de says -lposix is necessary on A/UX.
+     echo $ac_n "checking for remove""... $ac_c" 1>&6
+-echo "configure:8684: checking for remove" >&5
++echo "configure:8698: checking for remove" >&5
+ if eval "test \"`echo '$''{'ac_cv_func_remove'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 8689 "configure"
++#line 8703 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char remove(); below.  */
+@@ -8708,7 +8722,7 @@
+ 
+ ; return 0; }
+ EOF
+-if { (eval echo configure:8712: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:8726: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_func_remove=yes"
+ else
+@@ -8729,7 +8743,7 @@
+ 
+     if test $ac_cv_func_remove = no; then
+       echo $ac_n "checking for remove in -lposix""... $ac_c" 1>&6
+-echo "configure:8733: checking for remove in -lposix" >&5
++echo "configure:8747: checking for remove in -lposix" >&5
+ ac_lib_var=`echo posix'_'remove | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+@@ -8737,7 +8751,7 @@
+   ac_save_LIBS="$LIBS"
+ LIBS="-lposix  $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 8741 "configure"
++#line 8755 "configure"
+ #include "confdefs.h"
+ /* Override any gcc2 internal prototype to avoid an error.  */
+ /* We use char because int might match the return type of a gcc2
+@@ -8748,7 +8762,7 @@
+ remove()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:8752: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:8766: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_lib_$ac_lib_var=yes"
+ else
+@@ -8772,12 +8786,12 @@
+ 
+     # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay.
+     echo $ac_n "checking for shmat""... $ac_c" 1>&6
+-echo "configure:8776: checking for shmat" >&5
++echo "configure:8790: checking for shmat" >&5
+ if eval "test \"`echo '$''{'ac_cv_func_shmat'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 8781 "configure"
++#line 8795 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char shmat(); below.  */
+@@ -8800,7 +8814,7 @@
+ 
+ ; return 0; }
+ EOF
+-if { (eval echo configure:8804: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:8818: \"$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
+@@ -8821,7 +8835,7 @@
+ 
+     if test $ac_cv_func_shmat = no; then
+       echo $ac_n "checking for shmat in -lipc""... $ac_c" 1>&6
+-echo "configure:8825: checking for shmat in -lipc" >&5
++echo "configure:8839: checking for shmat in -lipc" >&5
+ ac_lib_var=`echo ipc'_'shmat | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+@@ -8829,7 +8843,7 @@
+   ac_save_LIBS="$LIBS"
+ LIBS="-lipc  $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 8833 "configure"
++#line 8847 "configure"
+ #include "confdefs.h"
+ /* Override any gcc2 internal prototype to avoid an error.  */
+ /* We use char because int might match the return type of a gcc2
+@@ -8840,7 +8854,7 @@
+ shmat()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:8844: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:8858: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_lib_$ac_lib_var=yes"
+ else
+@@ -8873,7 +8887,7 @@
+   # libraries we check for below, so use a different variable.
+   #  --interran@uluru.Stanford.EDU, kb@cs.umb.edu.
+   echo $ac_n "checking for IceConnectionNumber in -lICE""... $ac_c" 1>&6
+-echo "configure:8877: checking for IceConnectionNumber in -lICE" >&5
++echo "configure:8891: checking for IceConnectionNumber in -lICE" >&5
+ ac_lib_var=`echo ICE'_'IceConnectionNumber | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+@@ -8881,7 +8895,7 @@
+   ac_save_LIBS="$LIBS"
+ LIBS="-lICE $X_EXTRA_LIBS $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 8885 "configure"
++#line 8899 "configure"
+ #include "confdefs.h"
+ /* Override any gcc2 internal prototype to avoid an error.  */
+ /* We use char because int might match the return type of a gcc2
+@@ -8892,7 +8906,7 @@
+ IceConnectionNumber()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:8896: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:8910: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_lib_$ac_lib_var=yes"
+ else
+@@ -8920,7 +8934,7 @@
+ 
+ 
+ echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6
+-echo "configure:8924: checking for dlopen in -ldl" >&5
++echo "configure:8938: checking for dlopen in -ldl" >&5
+ ac_lib_var=`echo dl'_'dlopen | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+@@ -8928,7 +8942,7 @@
+   ac_save_LIBS="$LIBS"
+ LIBS="-ldl  $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 8932 "configure"
++#line 8946 "configure"
+ #include "confdefs.h"
+ /* Override any gcc2 internal prototype to avoid an error.  */
+ /* We use char because int might match the return type of a gcc2
+@@ -8939,7 +8953,7 @@
+ dlopen()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:8943: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:8957: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_lib_$ac_lib_var=yes"
+ else
+@@ -8968,12 +8982,12 @@
+ for ac_func in dlopen
+ do
+ echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
+-echo "configure:8972: checking for $ac_func" >&5
++echo "configure:8986: checking for $ac_func" >&5
+ if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 8977 "configure"
++#line 8991 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char $ac_func(); below.  */
+@@ -8996,7 +9010,7 @@
+ 
+ ; return 0; }
+ EOF
+-if { (eval echo configure:9000: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:9014: \"$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
+@@ -9023,7 +9037,7 @@
+ 
+ 
+ echo $ac_n "checking for function_atan""... $ac_c" 1>&6
+-echo "configure:9027: checking for function_atan" >&5
++echo "configure:9041: checking for function_atan" >&5
+  if eval "test \"`echo '$''{'ac_cv_flag_function_atan'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -9031,12 +9045,12 @@
+ ac_save_LIBS="$LIBS"
+ LIBS="";
+ cat > conftest.$ac_ext <<EOF
+-#line 9035 "configure"
++#line 9049 "configure"
+ #include "confdefs.h"
+ main() { extern char atan(); atan();; exit(0); } 
+ int t() { return 0; }
+ EOF
+-if { (eval echo configure:9040: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
++if { (eval echo configure:9054: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
+   
+     LIBS="$ac_save_LIBS"
+     rm -rf conftest*
+@@ -9065,7 +9079,7 @@
+ else
+   echo "$ac_t""no" 1>&6
+   echo $ac_n "checking for library_m""... $ac_c" 1>&6
+-echo "configure:9069: checking for library_m" >&5
++echo "configure:9083: checking for library_m" >&5
+  if eval "test \"`echo '$''{'ac_cv_flag_library_m'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -9073,12 +9087,12 @@
+ ac_save_LIBS="$LIBS"
+ LIBS="-lm";
+ cat > conftest.$ac_ext <<EOF
+-#line 9077 "configure"
++#line 9091 "configure"
+ #include "confdefs.h"
+ main() { extern char atan(); atan();; exit(0); } 
+ int t() { return 0; }
+ EOF
+-if { (eval echo configure:9082: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
++if { (eval echo configure:9096: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
+   
+     LIBS="$ac_save_LIBS"
+     rm -rf conftest*
+@@ -9120,7 +9134,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:9124: checking for $ac_word" >&5
++echo "configure:9138: checking for $ac_word" >&5
+ if eval "test \"`echo '$''{'ac_cv_path_GTK_CONFIG'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -9157,7 +9171,7 @@
+ 
+ if test "$GTK_CONFIG" != ""; then
+    echo $ac_n "checking for version of GTK+""... $ac_c" 1>&6
+-echo "configure:9161: checking for version of GTK+" >&5
++echo "configure:9175: checking for version of GTK+" >&5
+ if eval "test \"`echo '$''{'fptools_cv_gtk_version'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -9186,19 +9200,19 @@
+ # The Ultrix 4.2 mips builtin alloca declared by alloca.h only works
+ # for constant arguments.  Useless!
+ echo $ac_n "checking for working alloca.h""... $ac_c" 1>&6
+-echo "configure:9190: checking for working alloca.h" >&5
++echo "configure:9204: checking for working alloca.h" >&5
+ if eval "test \"`echo '$''{'ac_cv_header_alloca_h'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 9195 "configure"
++#line 9209 "configure"
+ #include "confdefs.h"
+ #include <alloca.h>
+ int main() {
+ char *p = alloca(2 * sizeof(int));
+ ; return 0; }
+ EOF
+-if { (eval echo configure:9202: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:9216: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   ac_cv_header_alloca_h=yes
+ else
+@@ -9219,12 +9233,12 @@
+ fi
+ 
+ echo $ac_n "checking for alloca""... $ac_c" 1>&6
+-echo "configure:9223: checking for alloca" >&5
++echo "configure:9237: checking for alloca" >&5
+ if eval "test \"`echo '$''{'ac_cv_func_alloca_works'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 9228 "configure"
++#line 9242 "configure"
+ #include "confdefs.h"
+ 
+ #ifdef __GNUC__
+@@ -9252,7 +9266,7 @@
+ char *p = (char *) alloca(1);
+ ; return 0; }
+ EOF
+-if { (eval echo configure:9256: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:9270: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   ac_cv_func_alloca_works=yes
+ else
+@@ -9284,12 +9298,12 @@
+ 
+ 
+ echo $ac_n "checking whether alloca needs Cray hooks""... $ac_c" 1>&6
+-echo "configure:9288: checking whether alloca needs Cray hooks" >&5
++echo "configure:9302: checking whether alloca needs Cray hooks" >&5
+ if eval "test \"`echo '$''{'ac_cv_os_cray'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 9293 "configure"
++#line 9307 "configure"
+ #include "confdefs.h"
+ #if defined(CRAY) && ! defined(CRAY2)
+ webecray
+@@ -9314,12 +9328,12 @@
+ if test $ac_cv_os_cray = yes; then
+ for ac_func in _getb67 GETB67 getb67; do
+   echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
+-echo "configure:9318: checking for $ac_func" >&5
++echo "configure:9332: checking for $ac_func" >&5
+ if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 9323 "configure"
++#line 9337 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char $ac_func(); below.  */
+@@ -9342,7 +9356,7 @@
+ 
+ ; return 0; }
+ EOF
+-if { (eval echo configure:9346: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:9360: \"$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
+@@ -9369,7 +9383,7 @@
+ fi
+ 
+ echo $ac_n "checking stack direction for C alloca""... $ac_c" 1>&6
+-echo "configure:9373: checking stack direction for C alloca" >&5
++echo "configure:9387: checking stack direction for C alloca" >&5
+ if eval "test \"`echo '$''{'ac_cv_c_stack_direction'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -9377,7 +9391,7 @@
+   ac_cv_c_stack_direction=0
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 9381 "configure"
++#line 9395 "configure"
+ #include "confdefs.h"
+ find_stack_direction ()
+ {
+@@ -9396,7 +9410,7 @@
+   exit (find_stack_direction() < 0);
+ }
+ EOF
+-if { (eval echo configure:9400: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:9414: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+ then
+   ac_cv_c_stack_direction=1
+ else
+@@ -9419,12 +9433,12 @@
+ 
+ 
+ echo $ac_n "checking for working const""... $ac_c" 1>&6
+-echo "configure:9423: checking for working const" >&5
++echo "configure:9437: checking for working const" >&5
+ if eval "test \"`echo '$''{'ac_cv_c_const'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 9428 "configure"
++#line 9442 "configure"
+ #include "confdefs.h"
+ 
+ int main() {
+@@ -9473,7 +9487,7 @@
+ 
+ ; return 0; }
+ EOF
+-if { (eval echo configure:9477: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:9491: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+   rm -rf conftest*
+   ac_cv_c_const=yes
+ else
+@@ -9495,12 +9509,12 @@
+ 
+ 
+ echo $ac_n "checking prototypes""... $ac_c" 1>&6
+-echo "configure:9499: checking prototypes" >&5
++echo "configure:9513: checking prototypes" >&5
+ if eval "test \"`echo '$''{'ac_cv_prototypes'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 9504 "configure"
++#line 9518 "configure"
+ #include "confdefs.h"
+ 
+ void foo(int);
+@@ -9513,7 +9527,7 @@
+ int i;
+ ; return 0; }
+ EOF
+-if { (eval echo configure:9517: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:9531: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+   rm -rf conftest*
+   ac_cv_prototypes=yes
+ else
+@@ -9535,14 +9549,14 @@
+           
+ 
+ echo $ac_n "checking whether byte ordering is bigendian""... $ac_c" 1>&6
+-echo "configure:9539: checking whether byte ordering is bigendian" >&5
++echo "configure:9553: checking whether byte ordering is bigendian" >&5
+ if eval "test \"`echo '$''{'ac_cv_c_bigendian'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   ac_cv_c_bigendian=unknown
+ # See if sys/param.h defines the BYTE_ORDER macro.
+ cat > conftest.$ac_ext <<EOF
+-#line 9546 "configure"
++#line 9560 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ #include <sys/param.h>
+@@ -9553,11 +9567,11 @@
+ #endif
+ ; return 0; }
+ EOF
+-if { (eval echo configure:9557: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:9571: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+   rm -rf conftest*
+   # It does; now see whether it defined to BIG_ENDIAN or not.
+ cat > conftest.$ac_ext <<EOF
+-#line 9561 "configure"
++#line 9575 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ #include <sys/param.h>
+@@ -9568,7 +9582,7 @@
+ #endif
+ ; return 0; }
+ EOF
+-if { (eval echo configure:9572: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:9586: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+   rm -rf conftest*
+   ac_cv_c_bigendian=yes
+ else
+@@ -9588,7 +9602,7 @@
+     { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; }
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 9592 "configure"
++#line 9606 "configure"
+ #include "confdefs.h"
+ main () {
+   /* Are we little or big endian?  From Harbison&Steele.  */
+@@ -9601,7 +9615,7 @@
+   exit (u.c[sizeof (long) - 1] == 1);
+ }
+ EOF
+-if { (eval echo configure:9605: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:9619: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+ then
+   ac_cv_c_bigendian=no
+ else
+@@ -9629,7 +9643,7 @@
+ 
+ 
+ echo $ac_n "checking for nlist in -lelf""... $ac_c" 1>&6
+-echo "configure:9633: checking for nlist in -lelf" >&5
++echo "configure:9647: checking for nlist in -lelf" >&5
+ ac_lib_var=`echo elf'_'nlist | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+@@ -9637,7 +9651,7 @@
+   ac_save_LIBS="$LIBS"
+ LIBS="-lelf  $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 9641 "configure"
++#line 9655 "configure"
+ #include "confdefs.h"
+ /* Override any gcc2 internal prototype to avoid an error.  */
+ /* We use char because int might match the return type of a gcc2
+@@ -9648,7 +9662,7 @@
+ nlist()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:9652: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:9666: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_lib_$ac_lib_var=yes"
+ else
+@@ -9668,7 +9682,7 @@
+   echo "$ac_t""no" 1>&6
+ fi
+ echo $ac_n "checking leading underscore in symbol names""... $ac_c" 1>&6
+-echo "configure:9672: checking leading underscore in symbol names" >&5
++echo "configure:9686: checking leading underscore in symbol names" >&5
+ if eval "test \"`echo '$''{'fptools_cv_lead_uscore'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -9682,7 +9696,7 @@
+   fptools_cv_lead_uscore=NO
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 9686 "configure"
++#line 9700 "configure"
+ #include "confdefs.h"
+ #ifdef HAVE_NLIST_H
+ #include <nlist.h>
+@@ -9704,7 +9718,7 @@
+     exit(1);
+ }
+ EOF
+-if { (eval echo configure:9708: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:9722: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+ then
+   fptools_cv_lead_uscore=yes
+ else
+@@ -9732,7 +9746,7 @@
+ 
+ 
+ echo $ac_n "checking for end of text section marker""... $ac_c" 1>&6
+-echo "configure:9736: checking for end of text section marker" >&5
++echo "configure:9750: checking for end of text section marker" >&5
+ if eval "test \"`echo '$''{'fptools_cv_end_of_text'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -9740,14 +9754,14 @@
+ 		 not_done=1
+ 		 for i in data_start _data_start etext _etext __etext; do
+ 		   cat > conftest.$ac_ext <<EOF
+-#line 9744 "configure"
++#line 9758 "configure"
+ #include "confdefs.h"
+ extern char* $i;
+ int main() {
+ return (int)&$i
+ ; return 0; }
+ EOF
+-if { (eval echo configure:9751: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:9765: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   fptools_end_of_text=yes
+ else
+@@ -9766,14 +9780,14 @@
+ 		 done
+ 		 if test "$not_done" = 1; then
+ 		   cat > conftest.$ac_ext <<EOF
+-#line 9770 "configure"
++#line 9784 "configure"
+ #include "confdefs.h"
+ extern char* etext asm("etext");
+ int main() {
+ return (int)&etext
+ ; return 0; }
+ EOF
+-if { (eval echo configure:9777: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:9791: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   fptools_end_of_text=yes
+ else
+@@ -9803,7 +9817,7 @@
+ 
+ 		 fi
+  echo $ac_n "checking for end of text section marker declaration""... $ac_c" 1>&6
+-echo "configure:9807: checking for end of text section marker declaration" >&5
++echo "configure:9821: checking for end of text section marker declaration" >&5
+ if eval "test \"`echo '$''{'fptools_cv_end_of_text_decl'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -9811,14 +9825,14 @@
+ 		 not_done=1
+ 		 for i in data_start _data_start etext _etext __etext; do
+ 		   cat > conftest.$ac_ext <<EOF
+-#line 9815 "configure"
++#line 9829 "configure"
+ #include "confdefs.h"
+ extern char* $i;
+ int main() {
+ return (int)&$i
+ ; return 0; }
+ EOF
+-if { (eval echo configure:9822: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:9836: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   fptools_end_of_text_decl=yes
+ else
+@@ -9837,14 +9851,14 @@
+ 		 done
+ 		 if test "$not_done" = 1; then
+ 		   cat > conftest.$ac_ext <<EOF
+-#line 9841 "configure"
++#line 9855 "configure"
+ #include "confdefs.h"
+ extern char* etext asm("etext");
+ int main() {
+ return (int)&etext
+ ; return 0; }
+ EOF
+-if { (eval echo configure:9848: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:9862: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   fptools_end_of_text_decl=yes
+ else
+@@ -9876,7 +9890,7 @@
+ 
+ 
+ echo $ac_n "checking for end of data section marker""... $ac_c" 1>&6
+-echo "configure:9880: checking for end of data section marker" >&5
++echo "configure:9894: checking for end of data section marker" >&5
+ if eval "test \"`echo '$''{'fptools_cv_end_of_data'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -9884,14 +9898,14 @@
+ 		 not_done=1
+ 		 for i in end _end __end; do
+ 		   cat > conftest.$ac_ext <<EOF
+-#line 9888 "configure"
++#line 9902 "configure"
+ #include "confdefs.h"
+ extern char* $i;
+ int main() {
+ return (int)&$i
+ ; return 0; }
+ EOF
+-if { (eval echo configure:9895: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:9909: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   fptools_end_of_data=yes
+ else
+@@ -9910,14 +9924,14 @@
+ 		 done
+ 		 if test "$not_done" = 1; then
+ 		   cat > conftest.$ac_ext <<EOF
+-#line 9914 "configure"
++#line 9928 "configure"
+ #include "confdefs.h"
+ extern char* end asm("end");
+ int main() {
+ return (int)&end
+ ; return 0; }
+ EOF
+-if { (eval echo configure:9921: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:9935: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   fptools_end_of_data=yes
+ else
+@@ -9947,7 +9961,7 @@
+ 
+ 		 fi
+  echo $ac_n "checking for end of data section marker declaration""... $ac_c" 1>&6
+-echo "configure:9951: checking for end of data section marker declaration" >&5
++echo "configure:9965: checking for end of data section marker declaration" >&5
+ if eval "test \"`echo '$''{'fptools_cv_end_of_data_decl'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -9955,14 +9969,14 @@
+ 		 not_done=1
+ 		 for i in end _end __end; do
+ 		   cat > conftest.$ac_ext <<EOF
+-#line 9959 "configure"
++#line 9973 "configure"
+ #include "confdefs.h"
+ extern char* $i;
+ int main() {
+ return (int)&$i
+ ; return 0; }
+ EOF
+-if { (eval echo configure:9966: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:9980: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   fptools_end_of_data_decl=yes
+ else
+@@ -9981,14 +9995,14 @@
+ 		 done
+ 		 if test "$not_done" = 1; then
+ 		   cat > conftest.$ac_ext <<EOF
+-#line 9985 "configure"
++#line 9999 "configure"
+ #include "confdefs.h"
+ extern char* end asm("end");
+ int main() {
+ return (int)&end
+ ; return 0; }
+ EOF
+-if { (eval echo configure:9992: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:10006: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   fptools_end_of_data_decl=yes
+ else
+@@ -10020,7 +10034,7 @@
+ 
+ 
+ echo $ac_n "checking if code section appears before data""... $ac_c" 1>&6
+-echo "configure:10024: checking if code section appears before data" >&5
++echo "configure:10038: checking if code section appears before data" >&5
+ if eval "test \"`echo '$''{'fptools_cv_code_bef_data'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -10028,7 +10042,7 @@
+   false
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 10032 "configure"
++#line 10046 "configure"
+ #include "confdefs.h"
+ 
+ int f() { return 1; }
+@@ -10037,7 +10051,7 @@
+ 
+ 
+ EOF
+-if { (eval echo configure:10041: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:10055: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+ then
+   fptools_cv_code_bef_data=yes
+ else
+diff -Nu ghc-5.02.3/configure.in ghc-5.02.3-patched/configure.in
+--- ghc-5.02.3/configure.in	Mon Aug 20 15:15:04 2001
++++ ghc-5.02.3-patched/configure.in	Wed May 22 22:31:02 2002
+@@ -478,6 +478,16 @@
+ test -n "$with_glut_xlib" && CPPFLAGS="$CPPFLAGS -DGLUT_XLIB_IMPLEMENTATION=$with_glut_xlib"
+ 
+ 
++dnl ** Disable the check for Happy (for source builds)
++dnl --------------------------------------------------------------
++AC_ARG_WITH(happy,
++[  --without-happy
++        Don't check for the Happy parser generator, assuming the
++        parsers are already built.
++        If you don't have Happy, use this for building from a source
++        distribution (it contains the parsers pre-built).
++])
++
+ 
+ 
+ dnl --------------------------------------------------------------
+@@ -613,8 +623,9 @@
+ 
+ dnl ** check for installed happy binary + version
+ dnl    (don't do it if we're booting from .hc files though.)
+-if test "$BootingFromHc" = "NO"; then
+-FPTOOLS_HAPPY
++dnl    (also don't if --without-happy was given.)
++if test "$BootingFromHc" = "NO" && test x$with_happy != xno; then
++  FPTOOLS_HAPPY
+ fi;
+ 
+ dnl --------------------------------------------------
+Common subdirectories: ghc-5.02.3/distrib and ghc-5.02.3-patched/distrib
+Common subdirectories: ghc-5.02.3/docs and ghc-5.02.3-patched/docs
+Common subdirectories: ghc-5.02.3/ghc and ghc-5.02.3-patched/ghc
+Common subdirectories: ghc-5.02.3/glafp-utils and ghc-5.02.3-patched/glafp-utils
+Common subdirectories: ghc-5.02.3/hslibs and ghc-5.02.3-patched/hslibs
+Common subdirectories: ghc-5.02.3/mk and ghc-5.02.3-patched/mk
diff --git a/dev-lang/ghc/files/lndir.c b/dev-lang/ghc/files/lndir.c
new file mode 100644
index 000000000000..63ab57fd2104
--- /dev/null
+++ b/dev-lang/ghc/files/lndir.c
@@ -0,0 +1,337 @@
+/* $Xorg: lndir.c,v 1.5 2001/02/09 02:03:17 xorgcvs Exp $ */
+/* Create shadow link tree (after X11R4 script of the same name)
+   Mark Reinhold (mbr@lcs.mit.edu)/3 January 1990 */
+
+/* 
+Copyright (c) 1990, 1998 The Open Group
+
+Permission to use, copy, modify, distribute, and sell this software and its
+documentation for any purpose is hereby granted without fee, provided that
+the above copyright notice appear in all copies and that both that
+copyright notice and this permission notice appear in supporting
+documentation.
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+Except as contained in this notice, the name of The Open Group shall not be
+used in advertising or otherwise to promote the sale, use or other dealings
+in this Software without prior written authorization from The Open Group.
+
+*/
+/* $XFree86: xc/config/util/lndir.c,v 3.15 2001/12/14 19:53:22 dawes Exp $ */
+
+/* From the original /bin/sh script:
+
+  Used to create a copy of the a directory tree that has links for all
+  non-directories (except, by default, those named RCS, SCCS or CVS.adm).
+  If you are building the distribution on more than one machine, you
+  should use this technique.
+
+  If your master sources are located in /usr/local/src/X and you would like
+  your link tree to be in /usr/local/src/new-X, do the following:
+
+   	%  mkdir /usr/local/src/new-X
+	%  cd /usr/local/src/new-X
+   	%  lndir ../X
+*/
+
+#include <X11/Xos.h>
+#include <X11/Xfuncproto.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <sys/stat.h>
+#if !defined(MINIX) && !defined(Lynx)
+#include <sys/param.h>
+#endif
+#include <errno.h>
+
+#ifndef X_NOT_POSIX
+#include <dirent.h>
+#else
+#ifdef SYSV
+#include <dirent.h>
+#else
+#ifdef USG
+#include <dirent.h>
+#else
+#include <sys/dir.h>
+#ifndef dirent
+#define dirent direct
+#endif
+#endif
+#endif
+#endif
+#ifndef MAXPATHLEN
+#define MAXPATHLEN 2048
+#endif
+
+#include <stdarg.h>
+
+int silent = 0;			/* -silent */
+int ignore_links = 0;		/* -ignorelinks */
+int with_revinfo = 0;		/* -withrevinfo */
+
+char *rcurdir;
+char *curdir;
+
+static void
+quit (int code, char * fmt, ...)
+{
+    va_list args;
+    va_start(args, fmt);
+    vfprintf (stderr, fmt, args);
+    va_end(args);
+    putc ('\n', stderr);
+    exit (code);
+}
+
+static void
+quiterr (int code, char *s)
+{
+    perror (s);
+    exit (code);
+}
+
+static void
+msg (char * fmt, ...)
+{
+    va_list args;
+    if (curdir) {
+	fprintf (stderr, "%s:\n", curdir);
+	curdir = 0;
+    }
+    va_start(args, fmt);
+    vfprintf (stderr, fmt, args);
+    va_end(args);
+    putc ('\n', stderr);
+}
+
+static void
+mperror (char *s)
+{
+    if (curdir) {
+	fprintf (stderr, "%s:\n", curdir);
+	curdir = 0;
+    }
+    perror (s);
+}
+
+
+static int 
+equivalent(char *lname, char *rname)
+{
+    char *s;
+
+    if (!strcmp(lname, rname))
+	return 1;
+    for (s = lname; *s && (s = strchr(s, '/')); s++) {
+	while (s[1] == '/')
+	    strcpy(s+1, s+2);
+    }
+    return !strcmp(lname, rname);
+}
+
+
+/* Recursively create symbolic links from the current directory to the "from"
+   directory.  Assumes that files described by fs and ts are directories. */
+static int
+dodir (char *fn,		/* name of "from" directory, either absolute or
+				   relative to cwd */
+       struct stat *fs, 
+       struct stat *ts,		/* stats for the "from" directory and cwd */
+       int rel)			/* if true, prepend "../" to fn before using */
+{
+    DIR *df;
+    struct dirent *dp;
+    char buf[MAXPATHLEN + 1], *p;
+    char symbuf[MAXPATHLEN + 1];
+    char basesym[MAXPATHLEN + 1];
+    struct stat sb, sc;
+    int n_dirs;
+    int symlen;
+    int basesymlen = -1;
+    char *ocurdir;
+
+    if ((fs->st_dev == ts->st_dev) && (fs->st_ino == ts->st_ino)) {
+	msg ("%s: From and to directories are identical!", fn);
+	return 1;
+    }
+
+    if (rel)
+	strcpy (buf, "../");
+    else
+	buf[0] = '\0';
+    strcat (buf, fn);
+    
+    if (!(df = opendir (buf))) {
+	msg ("%s: Cannot opendir", buf);
+	return 1;
+    }
+
+    p = buf + strlen (buf);
+    if (*(p - 1) != '/')
+	*p++ = '/';
+    n_dirs = fs->st_nlink;
+    while ((dp = readdir (df))) {
+	if (dp->d_name[strlen(dp->d_name) - 1] == '~')
+	    continue;
+#ifdef __DARWIN__
+	/* Ignore these Mac OS X Finder data files */
+	if (!strcmp(dp->d_name, ".DS_Store") || 
+	    !strcmp(dp->d_name, "._.DS_Store")) 
+	    continue;
+#endif
+	strcpy (p, dp->d_name);
+
+	if (n_dirs > 0) {
+	    if (stat (buf, &sb) < 0) {
+		mperror (buf);
+		continue;
+	    }
+
+#ifdef S_ISDIR
+	    if(S_ISDIR(sb.st_mode))
+#else
+	    if (sb.st_mode & S_IFDIR) 
+#endif
+	    {
+		/* directory */
+		n_dirs--;
+		if (dp->d_name[0] == '.' &&
+		    (dp->d_name[1] == '\0' || (dp->d_name[1] == '.' &&
+					       dp->d_name[2] == '\0')))
+		    continue;
+		if (!with_revinfo) {
+		    if (!strcmp (dp->d_name, "RCS"))
+			continue;
+		    if (!strcmp (dp->d_name, "SCCS"))
+			continue;
+		    if (!strcmp (dp->d_name, "CVS"))
+			continue;
+		    if (!strcmp (dp->d_name, "CVS.adm"))
+			continue;
+		}
+		ocurdir = rcurdir;
+		rcurdir = buf;
+		curdir = silent ? buf : (char *)0;
+		if (!silent)
+		    printf ("%s:\n", buf);
+		if ((stat (dp->d_name, &sc) < 0) && (errno == ENOENT)) {
+		    if (mkdir (dp->d_name, 0777) < 0 ||
+			stat (dp->d_name, &sc) < 0) {
+			mperror (dp->d_name);
+			curdir = rcurdir = ocurdir;
+			continue;
+		    }
+		}
+		if (readlink (dp->d_name, symbuf, sizeof(symbuf) - 1) >= 0) {
+		    msg ("%s: is a link instead of a directory", dp->d_name);
+		    curdir = rcurdir = ocurdir;
+		    continue;
+		}
+		if (chdir (dp->d_name) < 0) {
+		    mperror (dp->d_name);
+		    curdir = rcurdir = ocurdir;
+		    continue;
+		}
+		dodir (buf, &sb, &sc, (buf[0] != '/'));
+		if (chdir ("..") < 0)
+		    quiterr (1, "..");
+		curdir = rcurdir = ocurdir;
+		continue;
+	    }
+	}
+
+	/* non-directory */
+	symlen = readlink (dp->d_name, symbuf, sizeof(symbuf) - 1);
+	if (symlen >= 0)
+	    symbuf[symlen] = '\0';
+
+	/* The option to ignore links exists mostly because
+	   checking for them slows us down by 10-20%.
+	   But it is off by default because this really is a useful check. */
+	if (!ignore_links) {
+	    /* see if the file in the base tree was a symlink */
+	    basesymlen = readlink(buf, basesym, sizeof(basesym) - 1);
+	    if (basesymlen >= 0)
+		basesym[basesymlen] = '\0';
+	}
+
+	if (symlen >= 0) {
+	    /* Link exists in new tree.  Print message if it doesn't match. */
+	    if (!equivalent (basesymlen>=0 ? basesym : buf, symbuf))
+		msg ("%s: %s", dp->d_name, symbuf);
+	} else {
+	    if (symlink (basesymlen>=0 ? basesym : buf, dp->d_name) < 0)
+		mperror (dp->d_name);
+	}
+    }
+
+    closedir (df);
+    return 0;
+}
+
+int
+main (int ac, char *av[])
+{
+    char *prog_name = av[0];
+    char *fn, *tn;
+    struct stat fs, ts;
+
+    while (++av, --ac) {
+	if (strcmp(*av, "-silent") == 0)
+	    silent = 1;
+	else if (strcmp(*av, "-ignorelinks") == 0)
+	    ignore_links = 1;
+	else if (strcmp(*av, "-withrevinfo") == 0)
+	    with_revinfo = 1;
+	else if (strcmp(*av, "--") == 0) {
+	    ++av, --ac;
+	    break;
+	}
+	else
+	    break;
+    }
+
+    if (ac < 1 || ac > 2)
+	quit (1, "usage: %s [-silent] [-ignorelinks] fromdir [todir]",
+	      prog_name);
+
+    fn = av[0];
+    if (ac == 2)
+	tn = av[1];
+    else
+	tn = ".";
+
+    /* to directory */
+    if (stat (tn, &ts) < 0)
+	quiterr (1, tn);
+#ifdef S_ISDIR
+    if (!(S_ISDIR(ts.st_mode)))
+#else
+    if (!(ts.st_mode & S_IFDIR))
+#endif
+	quit (2, "%s: Not a directory", tn);
+    if (chdir (tn) < 0)
+	quiterr (1, tn);
+
+    /* from directory */
+    if (stat (fn, &fs) < 0)
+	quiterr (1, fn);
+#ifdef S_ISDIR
+    if (!(S_ISDIR(fs.st_mode)))
+#else
+    if (!(fs.st_mode & S_IFDIR))
+#endif
+	quit (2, "%s: Not a directory", fn);
+
+    exit (dodir (fn, &fs, &ts, 0));
+}
diff --git a/dev-lang/ghc/ghc-5.02.3.ebuild b/dev-lang/ghc/ghc-5.02.3.ebuild
new file mode 100644
index 000000000000..83a90e1eb509
--- /dev/null
+++ b/dev-lang/ghc/ghc-5.02.3.ebuild
@@ -0,0 +1,283 @@
+# Copyright 1999-2002 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ghc/ghc-5.02.3.ebuild,v 1.1 2002/06/10 07:28:29 george Exp $
+
+
+# ebuild for Glorious Glasgow Haskell
+#
+# The build takes as many as three stages:
+#
+# - Stage 1 (may not be required):
+#   If no GHC is found installed, we bootstrap an old one from HC files
+# - Stage 2 (may not be required):
+#   If the (now) available GHC is of an earlier version than the one
+#   we want, we build an extra intermediate one for bootstrapping the
+#   final stage. This is necessary because GHCi will only build with
+#   a matching version of GHC.
+# - Stage 3:
+#   The full and final GHC is built, including HOpenGL (if using
+#   opengl), GHCi, and user documentation.
+#
+# Set the GHC environment variable to your GHC executable if it's not
+# in your PATH.
+#
+# 2002-05-22  Sven Moritz Hallberg <pesco@gmx.de>
+
+inherit base
+
+
+DESCRIPTION="The Glasgow Haskell Compiler"
+HOMEPAGE="http://www.haskell.org/ghc/"
+
+LICENSE="as-is"
+
+# FIXME: Add USE support for parallel haskell (requires PVM)
+#        Get PVM from ftp://ftp.netlib.org/pvm3/
+DEPEND="virtual/glibc
+		>=sys-devel/perl-5.6.1
+		>=sys-devel/gcc-2.95.3
+		>=sys-devel/make-3.79.1
+		>=sys-apps/sed-3.02.80
+		>=sys-devel/flex-2.5.4a
+		>=app-text/openjade-1.3.1
+		>=app-text/sgml-common-0.6.3
+		>=app-text/docbook-sgml-dtd-4.1
+		>=app-text/docbook-dsssl-stylesheets-1.64
+		tetex? ( >=app-text/tetex-1.0.7
+				>=app-text/jadetex-3.12 )
+		opengl? ( virtual/opengl
+				virtual/glu
+				virtual/glut )"
+
+RDEPEND="virtual/glibc
+		>=sys-devel/gcc-2.95.3
+		>=sys-devel/perl-5.6.1
+		opengl? ( virtual/opengl virtual/glu virtual/glut )"
+
+
+# Settings for the individual stages...
+
+STAGE1_PV="4.08.2"
+STAGE1_S="${WORKDIR}/ghc-${STAGE1_PV}"
+STAGE1_B="${WORKDIR}/stage1-build"
+STAGE1_D="${BUILDDIR}/stage1-image"
+
+# Stage 2 version is ${PV}
+# Stage 2 source is in ${S}
+STAGE2_B="${WORKDIR}/stage2-build"
+STAGE2_D="${BUILDDIR}/stage2-image"
+
+# Stage 3 version is ${PV}
+# Stage 3 source is in ${S}
+STAGE3_B="${WORKDIR}/stage3-build"
+# Stage 3 destination is ${D}
+
+
+# --- What to Build ---
+
+# Try to find an already-running GHC.
+if test -z "${GHC}"; then
+	if which_ghc=`which ghc`; then
+		GHC="${which_ghc}"
+	fi
+fi
+# If none was found, we need to bootstrap from HC files.
+if test -z "${GHC}"; then
+	echo It seems you do not have any version of GHC available yet.
+	echo I will bootstrap from HC files.
+	boot_from_hc=yes
+
+    # This is the version of our "base GHC", that is, the one we will use
+    # for the first build from Haskell source. It's the stage 1's
+	# version if there is no outside GHC, or that one's version
+	# otherwise (see else clause below).
+	BASE_GHC_VERSION=${STAGE1_PV}
+else
+	boot_from_hc=no
+	BASE_GHC_VERSION=`"$GHC" --version | sed 's/^.*version //'`
+fi
+
+
+# If the base GHC already has the same version as the one we want
+# to build, stage 2 can be skipped.
+if test x${BASE_GHC_VERSION} = x${PV}; then
+	need_stage2=no
+else
+	need_stage2=yes
+fi
+
+
+# Determine which source files to download:
+#  - We always need the source distribution for the final version.
+#  - If bootstrap from HC files is required:
+#     - We need the corresponding source distribution.
+#     - We need a set of HC files suitable for our architecture.
+
+# List of platforms for which registerised HC files are available.
+HC_PLATS="x86 sparc"
+
+SRC_URI="http://www.haskell.org/ghc/dist/${PV}/ghc-${PV}-src.tar.bz2"
+if test x$boot_from_hc = xyes; then
+	SRC_URI="$SRC_URI http://www.haskell.org/ghc/dist/${STAGE1_PV}/ghc-${STAGE1_PV}-src.tar.bz2"
+
+	# First pick out the ARCH variable from
+	# /etc/make.profile/make.defaults .
+	arch=`source /etc/make.profile/make.defaults; echo -n $ARCH`
+
+	# Try to pick the correct set of HC files for our architecture.
+	use_unreg=yes
+	for i in $HC_PLATS; do
+		if test x$arch = x$i; then
+			SRC_URI="$SRC_URI http://www.haskell.org/ghc/dist/${STAGE1_PV}/ghc-${STAGE1_PV}-$i-hc.tar.bz2"
+			use_unreg=no
+			break
+		fi
+	done
+	if test x$use_unreg = xyes; then
+		SRC_URI="$SRC_URI http://www.haskell.org/ghc/dist/${STAGE1_PV}/ghc-${STAGE1_PV}-unreg-hc.tar.bz2"
+	fi
+fi
+
+
+# --- Function Entry Points ---
+
+src_unpack() {
+	base_src_unpack
+
+	if test x$boot_from_hc = xyes; then
+		# Patch GHC 4's hc-build script to check for GNU Make's name.
+		echo '>>> Patching stage 1 sources.'
+		patch -d ${STAGE1_S} -p1 < \
+				${FILESDIR}/ghc-${STAGE1_PV}-gentoo.patch || die
+	fi
+
+	# Patch GHC 5's configure script to recognize --without-happy
+	echo '>>> Patching stage 2/3 sources.'
+	patch -d ${S} -p1 < ${FILESDIR}/ghc-${PV}-gentoo.patch || die
+
+	# Create our own lndir if none installed.
+	local LNDIR
+	if which lndir; then
+		LNDIR=lndir
+	else
+		# Current directory should be $WORKDIR.
+		echo "You don\'t seem to have lndir available, building my own"
+		echo "version..."
+		cp ${FILESDIR}/lndir.c . || die
+		make lndir || die
+		LNDIR=./lndir
+	fi
+
+	# Create build directories.
+	if test x$boot_from_hc = xyes; then
+		echo '>>> Creating stage 1 build dir'
+		mkdir ${STAGE1_B} || die
+		${LNDIR} ${STAGE1_S} ${STAGE1_B} || die
+	fi
+	if test x$need_stage2 = xyes; then
+		echo '>>> Creating stage 2 build dir'
+		mkdir ${STAGE2_B} || die
+		${LNDIR} ${S} ${STAGE2_B} || die
+	fi
+	echo '>>> Creating stage 3 build dir'
+	mkdir ${STAGE3_B} || die
+	${LNDIR} ${S} ${STAGE3_B} || die
+}
+
+src_compile() {
+	if test x$boot_from_hc = xyes; then
+		echo ">>> Bootstrapping GHC ${STAGE1_PV} from HC files"
+		build_stage1        # bootstrap from HC files
+	fi
+	if test x$need_stage2 = xyes; then
+		echo ">>> Bootstrapping intermediate GHC ${PV} using GHC ${BASE_GHC_VERSION}"
+		build_stage2        # bootstrap intermediate GHC
+	fi
+	echo ">>> Building complete GHC ${PV} using GHC ${PV} itself"
+	build_stage3            # final build
+}
+
+src_install() {
+	pushd ${STAGE3_B} || die
+		emake install \
+				prefix="${D}/usr" \
+				infodir="${D}/usr/share/info" \
+				mandir="${D}/usr/share/man" || die
+
+		# Documentation
+		pushd ghc || die
+
+			# Misc
+			dodoc README ANNOUNCE LICENSE || die
+
+			# HTML
+			dohtml -r docs/set/set/* || die
+			dosym set.html /usr/share/doc/${PF}/html/index.html || die
+
+			# PostScript
+			if use tetex; then
+				pushd docs/set || die
+					docinto ps
+					dodoc set.ps || die
+				popd
+			fi
+
+		# End documentation
+		popd
+	popd
+}
+
+
+# --- Build Stages ---
+
+build_stage1() {
+	pushd "${STAGE1_B}" || die
+
+		GMAKE=emake distrib/hc-build \
+				--prefix="${STAGE1_D}/usr" \
+				--host="${CHOST}" || die
+		emake install || die
+		GHC=${STAGE1_D}/usr/bin/ghc
+
+	popd
+}
+
+build_stage2() {
+	pushd "${STAGE2_B}" || die
+
+		./configure \
+				--host="${CHOST}" \
+				--prefix="${STAGE2_D}/usr" \
+				--with-ghc="${GHC}" \
+				--without-happy || die
+		# I experienced strange failures during the make process when
+		# using emake (which sets -j 2 in my (default) config).
+		# I hope this will fix that.
+		make || die
+		emake install || die
+		GHC=${STAGE2_D}/usr/bin/ghc
+
+	popd
+}
+
+build_stage3() {
+	pushd "${STAGE3_B}" || die
+
+		local myconf
+		use opengl && myconf="--enable-hopengl"
+		./configure \
+				--host="${CHOST}" \
+				--prefix=/usr \
+				--infodir=/usr/share/info \
+				--mandir=/usr/share/man \
+				--with-ghc="${GHC}" \
+				--without-happy \
+				${myconf} || die
+		make || die
+		emake html || die
+		if use tetex; then
+			emake ps || die
+		fi
+
+	popd
+}
author	George Shapovalov <george@gentoo.org>	2002-06-10 07:28:30 +0000
committer	George Shapovalov <george@gentoo.org>	2002-06-10 07:28:30 +0000
commit	cb635bcb470fa06028d48312d10772f441f5c870 (patch)
tree	fa9c5c57064fd0470fb8a25faa2800dbc2a04e62 /dev-lang/ghc
parent	new version (diff)
download	historical-cb635bcb470fa06028d48312d10772f441f5c870.tar.gz historical-cb635bcb470fa06028d48312d10772f441f5c870.tar.bz2 historical-cb635bcb470fa06028d48312d10772f441f5c870.zip