Index: ghc-7.0.3/aclocal.m4
===================================================================
--- ghc-7.0.3.orig/aclocal.m4	2011-08-15 09:54:49.203701686 +0000
+++ ghc-7.0.3/aclocal.m4	2011-08-15 09:56:07.000000000 +0000
@@ -109,6 +109,10 @@
         $4="$$4 -arch x86_64"
         $5="$$5 -m64"
         ;;
+    *-linux*)
+        $3="$$3 -Wl,--hash-style=both,--no-copy-dt-needed-entries,--as-needed"
+        $4="$$4 --hash-style=both --no-copy-dt-needed-entries --as-needed"
+        ;;
     esac
 
     # If gcc knows about the stack protector, turn it off.
Index: ghc-7.0.3/configure
===================================================================
--- ghc-7.0.3.orig/configure	2011-08-15 09:54:49.213701707 +0000
+++ ghc-7.0.3/configure	2011-08-15 09:56:08.043817328 +0000
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.67 for The Glorious Glasgow Haskell Compilation System 7.0.3.
+# Generated by GNU Autoconf 2.68 for The Glorious Glasgow Haskell Compilation System 7.0.3.
 #
 # Report bugs to <glasgow-haskell-bugs@haskell.org>.
 #
@@ -91,6 +91,7 @@
 IFS=" ""	$as_nl"
 
 # Find who we are.  Look in the path if we contain no directory separator.
+as_myself=
 case $0 in #((
   *[\\/]* ) as_myself=$0 ;;
   *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -216,11 +217,18 @@
   # We cannot yet assume a decent shell, so we have to provide a
 	# neutralization value for shells without unset; and this also
 	# works around shells that cannot unset nonexistent variables.
+	# Preserve -v and -x to the replacement shell.
 	BASH_ENV=/dev/null
 	ENV=/dev/null
 	(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
 	export CONFIG_SHELL
-	exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"}
+	case $- in # ((((
+	  *v*x* | *x*v* ) as_opts=-vx ;;
+	  *v* ) as_opts=-v ;;
+	  *x* ) as_opts=-x ;;
+	  * ) as_opts= ;;
+	esac
+	exec "$CONFIG_SHELL" $as_opts "$as_myself" ${1+"$@"}
 fi
 
     if test x$as_have_required = xno; then :
@@ -1205,7 +1213,7 @@
     $as_echo "$as_me: WARNING: you should use --build, --host, --target" >&2
     expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null &&
       $as_echo "$as_me: WARNING: invalid host type: $ac_option" >&2
-    : ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}
+    : "${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}"
     ;;
 
   esac
@@ -1519,7 +1527,7 @@
 if $ac_init_version; then
   cat <<\_ACEOF
 The Glorious Glasgow Haskell Compilation System configure 7.0.3
-generated by GNU Autoconf 2.67
+generated by GNU Autoconf 2.68
 
 Copyright (C) 2010 Free Software Foundation, Inc.
 This configure script is free software; the Free Software Foundation
@@ -1565,7 +1573,7 @@
 
 	ac_retval=1
 fi
-  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
   as_fn_set_status $ac_retval
 
 } # ac_fn_c_try_compile
@@ -1602,7 +1610,7 @@
 
     ac_retval=1
 fi
-  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
   as_fn_set_status $ac_retval
 
 } # ac_fn_c_try_cpp
@@ -1644,7 +1652,7 @@
        ac_retval=$ac_status
 fi
   rm -rf conftest.dSYM conftest_ipa8_conftest.oo
-  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
   as_fn_set_status $ac_retval
 
 } # ac_fn_c_try_run
@@ -1657,10 +1665,10 @@
 ac_fn_c_check_header_mongrel ()
 {
   as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  if eval "test \"\${$3+set}\"" = set; then :
+  if eval \${$3+:} false; then :
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
 $as_echo_n "checking for $2... " >&6; }
-if eval "test \"\${$3+set}\"" = set; then :
+if eval \${$3+:} false; then :
   $as_echo_n "(cached) " >&6
 fi
 eval ac_res=\$$3
@@ -1727,7 +1735,7 @@
 esac
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
 $as_echo_n "checking for $2... " >&6; }
-if eval "test \"\${$3+set}\"" = set; then :
+if eval \${$3+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   eval "$3=\$ac_header_compiler"
@@ -1736,7 +1744,7 @@
 	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
 $as_echo "$ac_res" >&6; }
 fi
-  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
 
 } # ac_fn_c_check_header_mongrel
 
@@ -1749,7 +1757,7 @@
   as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
 $as_echo_n "checking for $2... " >&6; }
-if eval "test \"\${$3+set}\"" = set; then :
+if eval \${$3+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -1767,7 +1775,7 @@
 eval ac_res=\$$3
 	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
 $as_echo "$ac_res" >&6; }
-  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
 
 } # ac_fn_c_check_header_compile
 
@@ -1780,7 +1788,7 @@
   as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
 $as_echo_n "checking for $2... " >&6; }
-if eval "test \"\${$3+set}\"" = set; then :
+if eval \${$3+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   eval "$3=no"
@@ -1821,7 +1829,7 @@
 eval ac_res=\$$3
 	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
 $as_echo "$ac_res" >&6; }
-  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
 
 } # ac_fn_c_check_type
 
@@ -1998,7 +2006,7 @@
 rm -f conftest.val
 
   fi
-  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
   as_fn_set_status $ac_retval
 
 } # ac_fn_c_compute_int
@@ -2044,7 +2052,7 @@
   # interfere with the next link command; also delete a directory that is
   # left behind by Apple's compiler.  We do this before executing the actions.
   rm -rf conftest.dSYM conftest_ipa8_conftest.oo
-  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
   as_fn_set_status $ac_retval
 
 } # ac_fn_c_try_link
@@ -2057,7 +2065,7 @@
   as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
 $as_echo_n "checking for $2... " >&6; }
-if eval "test \"\${$3+set}\"" = set; then :
+if eval \${$3+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -2112,7 +2120,7 @@
 eval ac_res=\$$3
 	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
 $as_echo "$ac_res" >&6; }
-  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
 
 } # ac_fn_c_check_func
 
@@ -2127,7 +2135,7 @@
   as_decl_use=`echo $2|sed -e 's/(/((/' -e 's/)/) 0&/' -e 's/,/) 0& (/g'`
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $as_decl_name is declared" >&5
 $as_echo_n "checking whether $as_decl_name is declared... " >&6; }
-if eval "test \"\${$3+set}\"" = set; then :
+if eval \${$3+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -2158,7 +2166,7 @@
 eval ac_res=\$$3
 	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
 $as_echo "$ac_res" >&6; }
-  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
 
 } # ac_fn_c_check_decl
 cat >config.log <<_ACEOF
@@ -2166,7 +2174,7 @@
 running configure, to aid debugging if configure makes a mistake.
 
 It was created by The Glorious Glasgow Haskell Compilation System $as_me 7.0.3, which was
-generated by GNU Autoconf 2.67.  Invocation command line was
+generated by GNU Autoconf 2.68.  Invocation command line was
 
   $ $0 $@
 
@@ -2424,7 +2432,7 @@
       || { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error $? "failed to load site script $ac_site_file
-See \`config.log' for more details" "$LINENO" 5 ; }
+See \`config.log' for more details" "$LINENO" 5; }
   fi
 done
 
@@ -2540,7 +2548,7 @@
 set dummy $ac_prog; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_fp_prog_find+set}" = set; then :
+if ${ac_cv_path_fp_prog_find+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   case $fp_prog_find in
@@ -2603,7 +2611,7 @@
 set dummy find; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_FindCmd+set}" = set; then :
+if ${ac_cv_prog_FindCmd+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$FindCmd"; then
@@ -2661,7 +2669,7 @@
 set dummy sort; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_fp_prog_sort+set}" = set; then :
+if ${ac_cv_path_fp_prog_sort+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   case $fp_prog_sort in
@@ -2710,7 +2718,7 @@
 set dummy sort; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_SortCmd+set}" = set; then :
+if ${ac_cv_prog_SortCmd+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$SortCmd"; then
@@ -2815,7 +2823,7 @@
 case $VERSION_MINOR in
   ?) ProjectVersionInt=${VERSION_MAJOR}0${VERSION_MINOR} ;;
   ??) ProjectVersionInt=${VERSION_MAJOR}${VERSION_MINOR} ;;
-  *) as_fn_error $? "bad minor version in $PACKAGE_VERSION" "$LINENO" 5  ;;
+  *) as_fn_error $? "bad minor version in $PACKAGE_VERSION" "$LINENO" 5 ;;
 esac
 
 
@@ -2862,7 +2870,7 @@
 set dummy ghc; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_GHC+set}" = set; then :
+if ${ac_cv_path_GHC+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   case $GHC in
@@ -3146,7 +3154,7 @@
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking build system type" >&5
 $as_echo_n "checking build system type... " >&6; }
-if test "${ac_cv_build+set}" = set; then :
+if ${ac_cv_build+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_build_alias=$build_alias
@@ -3162,7 +3170,7 @@
 $as_echo "$ac_cv_build" >&6; }
 case $ac_cv_build in
 *-*-*) ;;
-*) as_fn_error $? "invalid value of canonical build" "$LINENO" 5 ;;
+*) as_fn_error $? "invalid value of canonical build" "$LINENO" 5;;
 esac
 build=$ac_cv_build
 ac_save_IFS=$IFS; IFS='-'
@@ -3180,7 +3188,7 @@
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking host system type" >&5
 $as_echo_n "checking host system type... " >&6; }
-if test "${ac_cv_host+set}" = set; then :
+if ${ac_cv_host+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test "x$host_alias" = x; then
@@ -3195,7 +3203,7 @@
 $as_echo "$ac_cv_host" >&6; }
 case $ac_cv_host in
 *-*-*) ;;
-*) as_fn_error $? "invalid value of canonical host" "$LINENO" 5 ;;
+*) as_fn_error $? "invalid value of canonical host" "$LINENO" 5;;
 esac
 host=$ac_cv_host
 ac_save_IFS=$IFS; IFS='-'
@@ -3213,7 +3221,7 @@
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking target system type" >&5
 $as_echo_n "checking target system type... " >&6; }
-if test "${ac_cv_target+set}" = set; then :
+if ${ac_cv_target+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test "x$target_alias" = x; then
@@ -3228,7 +3236,7 @@
 $as_echo "$ac_cv_target" >&6; }
 case $ac_cv_target in
 *-*-*) ;;
-*) as_fn_error $? "invalid value of canonical target" "$LINENO" 5 ;;
+*) as_fn_error $? "invalid value of canonical target" "$LINENO" 5;;
 esac
 target=$ac_cv_target
 ac_save_IFS=$IFS; IFS='-'
@@ -3688,7 +3696,7 @@
 set dummy $ac_prog; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_NHC+set}" = set; then :
+if ${ac_cv_path_NHC+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   case $NHC in
@@ -3731,7 +3739,7 @@
 set dummy hbc; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_HBC+set}" = set; then :
+if ${ac_cv_path_HBC+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   case $HBC in
@@ -3894,7 +3902,7 @@
 set dummy gcc; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_CC+set}" = set; then :
+if ${ac_cv_path_CC+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   case $CC in
@@ -3965,7 +3973,7 @@
 set dummy ld; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_LD+set}" = set; then :
+if ${ac_cv_path_LD+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   case $LD in
@@ -4035,7 +4043,7 @@
 set dummy nm; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_NM+set}" = set; then :
+if ${ac_cv_path_NM+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   case $NM in
@@ -4181,7 +4189,7 @@
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether #! works in shell scripts" >&5
 $as_echo_n "checking whether #! works in shell scripts... " >&6; }
-if test "${ac_cv_sys_interpreter+set}" = set; then :
+if ${ac_cv_sys_interpreter+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   echo '#! /bin/cat
@@ -4210,7 +4218,7 @@
 set dummy perl; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_PerlCmd+set}" = set; then :
+if ${ac_cv_path_PerlCmd+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   case $PerlCmd in
@@ -4266,7 +4274,7 @@
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking if your perl works in shell scripts" >&5
 $as_echo_n "checking if your perl works in shell scripts... " >&6; }
-if test "${fptools_cv_shebang_perl+set}" = set; then :
+if ${fptools_cv_shebang_perl+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   echo "#!$PerlCmd"'
@@ -4289,7 +4297,7 @@
 set dummy python; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_PythonCmd+set}" = set; then :
+if ${ac_cv_path_PythonCmd+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   case $PythonCmd in
@@ -4336,7 +4344,7 @@
 set dummy ${ac_tool_prefix}gcc; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_CC+set}" = set; then :
+if ${ac_cv_prog_CC+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$CC"; then
@@ -4376,7 +4384,7 @@
 set dummy gcc; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then :
+if ${ac_cv_prog_ac_ct_CC+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_CC"; then
@@ -4429,7 +4437,7 @@
 set dummy ${ac_tool_prefix}cc; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_CC+set}" = set; then :
+if ${ac_cv_prog_CC+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$CC"; then
@@ -4469,7 +4477,7 @@
 set dummy cc; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_CC+set}" = set; then :
+if ${ac_cv_prog_CC+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$CC"; then
@@ -4528,7 +4536,7 @@
 set dummy $ac_tool_prefix$ac_prog; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_CC+set}" = set; then :
+if ${ac_cv_prog_CC+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$CC"; then
@@ -4572,7 +4580,7 @@
 set dummy $ac_prog; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then :
+if ${ac_cv_prog_ac_ct_CC+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_CC"; then
@@ -4627,7 +4635,7 @@
 test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error $? "no acceptable C compiler found in \$PATH
-See \`config.log' for more details" "$LINENO" 5 ; }
+See \`config.log' for more details" "$LINENO" 5; }
 
 # Provide some information about the compiler.
 $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5
@@ -4742,7 +4750,7 @@
 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error 77 "C compiler cannot create executables
-See \`config.log' for more details" "$LINENO" 5 ; }
+See \`config.log' for more details" "$LINENO" 5; }
 else
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
@@ -4785,7 +4793,7 @@
   { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error $? "cannot compute suffix of executables: cannot compile and link
-See \`config.log' for more details" "$LINENO" 5 ; }
+See \`config.log' for more details" "$LINENO" 5; }
 fi
 rm -f conftest conftest$ac_cv_exeext
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5
@@ -4844,7 +4852,7 @@
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error $? "cannot run C compiled programs.
 If you meant to cross compile, use \`--host'.
-See \`config.log' for more details" "$LINENO" 5 ; }
+See \`config.log' for more details" "$LINENO" 5; }
     fi
   fi
 fi
@@ -4855,7 +4863,7 @@
 ac_clean_files=$ac_clean_files_save
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5
 $as_echo_n "checking for suffix of object files... " >&6; }
-if test "${ac_cv_objext+set}" = set; then :
+if ${ac_cv_objext+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -4896,7 +4904,7 @@
 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error $? "cannot compute suffix of object files: cannot compile
-See \`config.log' for more details" "$LINENO" 5 ; }
+See \`config.log' for more details" "$LINENO" 5; }
 fi
 rm -f conftest.$ac_cv_objext conftest.$ac_ext
 fi
@@ -4906,7 +4914,7 @@
 ac_objext=$OBJEXT
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5
 $as_echo_n "checking whether we are using the GNU C compiler... " >&6; }
-if test "${ac_cv_c_compiler_gnu+set}" = set; then :
+if ${ac_cv_c_compiler_gnu+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -4943,7 +4951,7 @@
 ac_save_CFLAGS=$CFLAGS
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5
 $as_echo_n "checking whether $CC accepts -g... " >&6; }
-if test "${ac_cv_prog_cc_g+set}" = set; then :
+if ${ac_cv_prog_cc_g+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_save_c_werror_flag=$ac_c_werror_flag
@@ -5021,7 +5029,7 @@
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5
 $as_echo_n "checking for $CC option to accept ISO C89... " >&6; }
-if test "${ac_cv_prog_cc_c89+set}" = set; then :
+if ${ac_cv_prog_cc_c89+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_cv_prog_cc_c89=no
@@ -5128,7 +5136,7 @@
 GccLT34=
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking version of gcc" >&5
 $as_echo_n "checking version of gcc... " >&6; }
-if test "${fp_cv_gcc_version+set}" = set; then :
+if ${fp_cv_gcc_version+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test "$fp_have_gcc" = "YES"; then
@@ -5216,6 +5224,10 @@
         IGNORE_LINKER_LD_FLAGS="$IGNORE_LINKER_LD_FLAGS -arch x86_64"
         CPPFLAGS="$CPPFLAGS -m64"
         ;;
+    *-linux*)
+        LDFLAGS="$LDFLAGS -Wl,--hash-style=both,--no-copy-dt-needed-entries,--as-needed"
+        IGNORE_LINKER_LD_FLAGS="$IGNORE_LINKER_LD_FLAGS --hash-style=both --no-copy-dt-needed-entries --as-needed"
+        ;;
     esac
 
     # If gcc knows about the stack protector, turn it off.
@@ -5249,6 +5261,10 @@
         CONF_LD_LINKER_OPTS_STAGE0="$CONF_LD_LINKER_OPTS_STAGE0 -arch x86_64"
         CONF_CPP_OPTS_STAGE0="$CONF_CPP_OPTS_STAGE0 -m64"
         ;;
+    *-linux*)
+        CONF_GCC_LINKER_OPTS_STAGE0="$CONF_GCC_LINKER_OPTS_STAGE0 -Wl,--hash-style=both,--no-copy-dt-needed-entries,--as-needed"
+        CONF_LD_LINKER_OPTS_STAGE0="$CONF_LD_LINKER_OPTS_STAGE0 --hash-style=both --no-copy-dt-needed-entries --as-needed"
+        ;;
     esac
 
     # If gcc knows about the stack protector, turn it off.
@@ -5282,6 +5298,10 @@
         CONF_LD_LINKER_OPTS_STAGE1="$CONF_LD_LINKER_OPTS_STAGE1 -arch x86_64"
         CONF_CPP_OPTS_STAGE1="$CONF_CPP_OPTS_STAGE1 -m64"
         ;;
+    *-linux*)
+        CONF_GCC_LINKER_OPTS_STAGE1="$CONF_GCC_LINKER_OPTS_STAGE1 -Wl,--hash-style=both,--no-copy-dt-needed-entries,--as-needed"
+        CONF_LD_LINKER_OPTS_STAGE1="$CONF_LD_LINKER_OPTS_STAGE1 --hash-style=both --no-copy-dt-needed-entries --as-needed"
+        ;;
     esac
 
     # If gcc knows about the stack protector, turn it off.
@@ -5316,6 +5336,10 @@
         CONF_LD_LINKER_OPTS_STAGE2="$CONF_LD_LINKER_OPTS_STAGE2 -arch x86_64"
         CONF_CPP_OPTS_STAGE2="$CONF_CPP_OPTS_STAGE2 -m64"
         ;;
+    *-linux*)
+        CONF_GCC_LINKER_OPTS_STAGE2="$CONF_GCC_LINKER_OPTS_STAGE2 -Wl,--hash-style=both,--no-copy-dt-needed-entries,--as-needed"
+        CONF_LD_LINKER_OPTS_STAGE2="$CONF_LD_LINKER_OPTS_STAGE2 --hash-style=both --no-copy-dt-needed-entries --as-needed"
+        ;;
     esac
 
     # If gcc knows about the stack protector, turn it off.
@@ -5333,7 +5357,7 @@
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for extra options to pass gcc when compiling via C" >&5
 $as_echo_n "checking for extra options to pass gcc when compiling via C... " >&6; }
-if test "${fp_cv_gcc_extra_opts+set}" = set; then :
+if ${fp_cv_gcc_extra_opts+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   fp_cv_gcc_extra_opts=
@@ -5480,7 +5504,7 @@
   CPP=
 fi
 if test -z "$CPP"; then
-  if test "${ac_cv_prog_CPP+set}" = set; then :
+  if ${ac_cv_prog_CPP+:} false; then :
   $as_echo_n "(cached) " >&6
 else
       # Double quotes because CPP needs to be expanded
@@ -5596,7 +5620,7 @@
   { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error $? "C preprocessor \"$CPP\" fails sanity check
-See \`config.log' for more details" "$LINENO" 5 ; }
+See \`config.log' for more details" "$LINENO" 5; }
 fi
 
 ac_ext=c
@@ -5621,7 +5645,7 @@
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for a working context diff" >&5
 $as_echo_n "checking for a working context diff... " >&6; }
-if test "${fp_cv_context_diff+set}" = set; then :
+if ${fp_cv_context_diff+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   echo foo > conftest1
@@ -5662,7 +5686,7 @@
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for a BSD-compatible install" >&5
 $as_echo_n "checking for a BSD-compatible install... " >&6; }
 if test -z "$INSTALL"; then
-if test "${ac_cv_path_install+set}" = set; then :
+if ${ac_cv_path_install+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -5747,7 +5771,7 @@
 set dummy ar; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_fp_prog_ar_raw+set}" = set; then :
+if ${ac_cv_path_fp_prog_ar_raw+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   case $fp_prog_ar_raw in
@@ -5799,7 +5823,7 @@
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $fp_prog_ar_raw is GNU ar" >&5
 $as_echo_n "checking whether $fp_prog_ar_raw is GNU ar... " >&6; }
-if test "${fp_cv_prog_ar_is_gnu+set}" = set; then :
+if ${fp_cv_prog_ar_is_gnu+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if "$fp_prog_ar_raw" --version 2> /dev/null | grep "GNU" > /dev/null 2>&1; then
@@ -5817,7 +5841,7 @@
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ar arguments" >&5
 $as_echo_n "checking for ar arguments... " >&6; }
-if test "${fp_cv_prog_ar_args+set}" = set; then :
+if ${fp_cv_prog_ar_args+:} false; then :
   $as_echo_n "(cached) " >&6
 else
 
@@ -5854,7 +5878,7 @@
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $fp_prog_ar_raw supports @file" >&5
 $as_echo_n "checking whether $fp_prog_ar_raw supports @file... " >&6; }
-if test "${fp_cv_prog_ar_supports_atfile+set}" = set; then :
+if ${fp_cv_prog_ar_supports_atfile+:} false; then :
   $as_echo_n "(cached) " >&6
 else
 
@@ -5883,7 +5907,7 @@
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ranlib is needed" >&5
 $as_echo_n "checking whether ranlib is needed... " >&6; }
-if test "${fp_cv_prog_ar_needs_ranlib+set}" = set; then :
+if ${fp_cv_prog_ar_needs_ranlib+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test $fp_prog_ar_is_gnu = yes; then
@@ -5906,7 +5930,7 @@
 set dummy ${ac_tool_prefix}ranlib; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_RANLIB+set}" = set; then :
+if ${ac_cv_prog_RANLIB+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$RANLIB"; then
@@ -5946,7 +5970,7 @@
 set dummy ranlib; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then :
+if ${ac_cv_prog_ac_ct_RANLIB+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_RANLIB"; then
@@ -6002,7 +6026,7 @@
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $fp_prog_ar_raw supports -input" >&5
 $as_echo_n "checking whether $fp_prog_ar_raw supports -input... " >&6; }
-if test "${fp_cv_prog_ar_supports_input+set}" = set; then :
+if ${fp_cv_prog_ar_supports_input+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   fp_cv_prog_ar_supports_input=no
@@ -6048,7 +6072,7 @@
 set dummy $ac_prog; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_SedCmd+set}" = set; then :
+if ${ac_cv_path_SedCmd+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   case $SedCmd in
@@ -6094,7 +6118,7 @@
 set dummy time; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_TimeCmd+set}" = set; then :
+if ${ac_cv_path_TimeCmd+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   case $TimeCmd in
@@ -6137,7 +6161,7 @@
 set dummy $ac_prog; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_TarCmd+set}" = set; then :
+if ${ac_cv_path_TarCmd+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   case $TarCmd in
@@ -6184,7 +6208,7 @@
 set dummy $ac_prog; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_PatchCmd+set}" = set; then :
+if ${ac_cv_path_PatchCmd+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   case $PatchCmd in
@@ -6230,7 +6254,7 @@
 set dummy dtrace; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_DtraceCmd+set}" = set; then :
+if ${ac_cv_path_DtraceCmd+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   case $DtraceCmd in
@@ -6277,7 +6301,7 @@
 set dummy HsColour; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_HSCOLOUR+set}" = set; then :
+if ${ac_cv_path_HSCOLOUR+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   case $HSCOLOUR in
@@ -6326,7 +6350,7 @@
 set dummy xmllint; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_XmllintCmd+set}" = set; then :
+if ${ac_cv_path_XmllintCmd+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   case $XmllintCmd in
@@ -6412,7 +6436,7 @@
 set dummy xsltproc; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_XsltprocCmd+set}" = set; then :
+if ${ac_cv_path_XsltprocCmd+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   case $XsltprocCmd in
@@ -6456,7 +6480,7 @@
 if test -n "$XsltprocCmd"; then
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for DocBook XSL stylesheet" >&5
 $as_echo_n "checking for DocBook XSL stylesheet... " >&6; }
-if test "${fp_cv_dir_docbook_xsl+set}" = set; then :
+if ${fp_cv_dir_docbook_xsl+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   rm -f conftest.xml conftest-book.xml
@@ -6505,7 +6529,7 @@
 set dummy dblatex; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_DblatexCmd+set}" = set; then :
+if ${ac_cv_path_DblatexCmd+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   case $DblatexCmd in
@@ -6551,7 +6575,7 @@
 set dummy hasktags; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_HstagsCmd+set}" = set; then :
+if ${ac_cv_path_HstagsCmd+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   case $HstagsCmd in
@@ -6595,7 +6619,7 @@
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ghc-pkg matching $WithGhc" >&5
 $as_echo_n "checking for ghc-pkg matching $WithGhc... " >&6; }
-if test "${fp_cv_matching_ghc_pkg+set}" = set; then :
+if ${fp_cv_matching_ghc_pkg+:} false; then :
   $as_echo_n "(cached) " >&6
 else
 
@@ -6622,7 +6646,7 @@
 set dummy happy; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_HappyCmd+set}" = set; then :
+if ${ac_cv_path_HappyCmd+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   case $HappyCmd in
@@ -6671,7 +6695,7 @@
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for version of happy" >&5
 $as_echo_n "checking for version of happy... " >&6; }
-if test "${fptools_cv_happy_version+set}" = set; then :
+if ${fptools_cv_happy_version+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test x"$HappyCmd" != x; then
@@ -6721,7 +6745,7 @@
 set dummy alex; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_AlexCmd+set}" = set; then :
+if ${ac_cv_path_AlexCmd+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   case $AlexCmd in
@@ -6768,7 +6792,7 @@
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for version of alex" >&5
 $as_echo_n "checking for version of alex... " >&6; }
-if test "${fptools_cv_alex_version+set}" = set; then :
+if ${fptools_cv_alex_version+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test x"$AlexCmd" != x; then
@@ -6818,7 +6842,7 @@
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5
 $as_echo_n "checking for grep that handles long lines and -e... " >&6; }
-if test "${ac_cv_path_GREP+set}" = set; then :
+if ${ac_cv_path_GREP+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -z "$GREP"; then
@@ -6881,7 +6905,7 @@
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5
 $as_echo_n "checking for egrep... " >&6; }
-if test "${ac_cv_path_EGREP+set}" = set; then :
+if ${ac_cv_path_EGREP+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if echo a | $GREP -E '(a|b)' >/dev/null 2>&1
@@ -6948,7 +6972,7 @@
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5
 $as_echo_n "checking for ANSI C header files... " >&6; }
-if test "${ac_cv_header_stdc+set}" = set; then :
+if ${ac_cv_header_stdc+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -7068,7 +7092,7 @@
 
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for special C compiler options needed for large files" >&5
 $as_echo_n "checking for special C compiler options needed for large files... " >&6; }
-if test "${ac_cv_sys_largefile_CC+set}" = set; then :
+if ${ac_cv_sys_largefile_CC+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_cv_sys_largefile_CC=no
@@ -7119,7 +7143,7 @@
 
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for _FILE_OFFSET_BITS value needed for large files" >&5
 $as_echo_n "checking for _FILE_OFFSET_BITS value needed for large files... " >&6; }
-if test "${ac_cv_sys_file_offset_bits+set}" = set; then :
+if ${ac_cv_sys_file_offset_bits+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   while :; do
@@ -7188,7 +7212,7 @@
   if test $ac_cv_sys_file_offset_bits = unknown; then
     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for _LARGE_FILES value needed for large files" >&5
 $as_echo_n "checking for _LARGE_FILES value needed for large files... " >&6; }
-if test "${ac_cv_sys_large_files+set}" = set; then :
+if ${ac_cv_sys_large_files+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   while :; do
@@ -7291,7 +7315,7 @@
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether time.h and sys/time.h may both be included" >&5
 $as_echo_n "checking whether time.h and sys/time.h may both be included... " >&6; }
-if test "${ac_cv_header_time+set}" = set; then :
+if ${ac_cv_header_time+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -7326,7 +7350,7 @@
 
 
 ac_fn_c_check_type "$LINENO" "long long" "ac_cv_type_long_long" "$ac_includes_default"
-if test "x$ac_cv_type_long_long" = x""yes; then :
+if test "x$ac_cv_type_long_long" = xyes; then :
 
 cat >>confdefs.h <<_ACEOF
 #define HAVE_LONG_LONG 1
@@ -7342,7 +7366,7 @@
 # This bug is HP SR number 8606223364.
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking size of char" >&5
 $as_echo_n "checking size of char... " >&6; }
-if test "${ac_cv_sizeof_char+set}" = set; then :
+if ${ac_cv_sizeof_char+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (char))" "ac_cv_sizeof_char"        "$ac_includes_default"; then :
@@ -7352,7 +7376,7 @@
      { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error 77 "cannot compute sizeof (char)
-See \`config.log' for more details" "$LINENO" 5 ; }
+See \`config.log' for more details" "$LINENO" 5; }
    else
      ac_cv_sizeof_char=0
    fi
@@ -7375,7 +7399,7 @@
 # This bug is HP SR number 8606223364.
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking size of double" >&5
 $as_echo_n "checking size of double... " >&6; }
-if test "${ac_cv_sizeof_double+set}" = set; then :
+if ${ac_cv_sizeof_double+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (double))" "ac_cv_sizeof_double"        "$ac_includes_default"; then :
@@ -7385,7 +7409,7 @@
      { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error 77 "cannot compute sizeof (double)
-See \`config.log' for more details" "$LINENO" 5 ; }
+See \`config.log' for more details" "$LINENO" 5; }
    else
      ac_cv_sizeof_double=0
    fi
@@ -7408,7 +7432,7 @@
 # This bug is HP SR number 8606223364.
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking size of float" >&5
 $as_echo_n "checking size of float... " >&6; }
-if test "${ac_cv_sizeof_float+set}" = set; then :
+if ${ac_cv_sizeof_float+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (float))" "ac_cv_sizeof_float"        "$ac_includes_default"; then :
@@ -7418,7 +7442,7 @@
      { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error 77 "cannot compute sizeof (float)
-See \`config.log' for more details" "$LINENO" 5 ; }
+See \`config.log' for more details" "$LINENO" 5; }
    else
      ac_cv_sizeof_float=0
    fi
@@ -7441,7 +7465,7 @@
 # This bug is HP SR number 8606223364.
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking size of int" >&5
 $as_echo_n "checking size of int... " >&6; }
-if test "${ac_cv_sizeof_int+set}" = set; then :
+if ${ac_cv_sizeof_int+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (int))" "ac_cv_sizeof_int"        "$ac_includes_default"; then :
@@ -7451,7 +7475,7 @@
      { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error 77 "cannot compute sizeof (int)
-See \`config.log' for more details" "$LINENO" 5 ; }
+See \`config.log' for more details" "$LINENO" 5; }
    else
      ac_cv_sizeof_int=0
    fi
@@ -7474,7 +7498,7 @@
 # This bug is HP SR number 8606223364.
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking size of long" >&5
 $as_echo_n "checking size of long... " >&6; }
-if test "${ac_cv_sizeof_long+set}" = set; then :
+if ${ac_cv_sizeof_long+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (long))" "ac_cv_sizeof_long"        "$ac_includes_default"; then :
@@ -7484,7 +7508,7 @@
      { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error 77 "cannot compute sizeof (long)
-See \`config.log' for more details" "$LINENO" 5 ; }
+See \`config.log' for more details" "$LINENO" 5; }
    else
      ac_cv_sizeof_long=0
    fi
@@ -7508,7 +7532,7 @@
 # This bug is HP SR number 8606223364.
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking size of long long" >&5
 $as_echo_n "checking size of long long... " >&6; }
-if test "${ac_cv_sizeof_long_long+set}" = set; then :
+if ${ac_cv_sizeof_long_long+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (long long))" "ac_cv_sizeof_long_long"        "$ac_includes_default"; then :
@@ -7518,7 +7542,7 @@
      { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error 77 "cannot compute sizeof (long long)
-See \`config.log' for more details" "$LINENO" 5 ; }
+See \`config.log' for more details" "$LINENO" 5; }
    else
      ac_cv_sizeof_long_long=0
    fi
@@ -7542,7 +7566,7 @@
 # This bug is HP SR number 8606223364.
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking size of short" >&5
 $as_echo_n "checking size of short... " >&6; }
-if test "${ac_cv_sizeof_short+set}" = set; then :
+if ${ac_cv_sizeof_short+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (short))" "ac_cv_sizeof_short"        "$ac_includes_default"; then :
@@ -7552,7 +7576,7 @@
      { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error 77 "cannot compute sizeof (short)
-See \`config.log' for more details" "$LINENO" 5 ; }
+See \`config.log' for more details" "$LINENO" 5; }
    else
      ac_cv_sizeof_short=0
    fi
@@ -7575,7 +7599,7 @@
 # This bug is HP SR number 8606223364.
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking size of unsigned char" >&5
 $as_echo_n "checking size of unsigned char... " >&6; }
-if test "${ac_cv_sizeof_unsigned_char+set}" = set; then :
+if ${ac_cv_sizeof_unsigned_char+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (unsigned char))" "ac_cv_sizeof_unsigned_char"        "$ac_includes_default"; then :
@@ -7585,7 +7609,7 @@
      { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error 77 "cannot compute sizeof (unsigned char)
-See \`config.log' for more details" "$LINENO" 5 ; }
+See \`config.log' for more details" "$LINENO" 5; }
    else
      ac_cv_sizeof_unsigned_char=0
    fi
@@ -7608,7 +7632,7 @@
 # This bug is HP SR number 8606223364.
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking size of unsigned int" >&5
 $as_echo_n "checking size of unsigned int... " >&6; }
-if test "${ac_cv_sizeof_unsigned_int+set}" = set; then :
+if ${ac_cv_sizeof_unsigned_int+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (unsigned int))" "ac_cv_sizeof_unsigned_int"        "$ac_includes_default"; then :
@@ -7618,7 +7642,7 @@
      { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error 77 "cannot compute sizeof (unsigned int)
-See \`config.log' for more details" "$LINENO" 5 ; }
+See \`config.log' for more details" "$LINENO" 5; }
    else
      ac_cv_sizeof_unsigned_int=0
    fi
@@ -7641,7 +7665,7 @@
 # This bug is HP SR number 8606223364.
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking size of unsigned long" >&5
 $as_echo_n "checking size of unsigned long... " >&6; }
-if test "${ac_cv_sizeof_unsigned_long+set}" = set; then :
+if ${ac_cv_sizeof_unsigned_long+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (unsigned long))" "ac_cv_sizeof_unsigned_long"        "$ac_includes_default"; then :
@@ -7651,7 +7675,7 @@
      { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error 77 "cannot compute sizeof (unsigned long)
-See \`config.log' for more details" "$LINENO" 5 ; }
+See \`config.log' for more details" "$LINENO" 5; }
    else
      ac_cv_sizeof_unsigned_long=0
    fi
@@ -7675,7 +7699,7 @@
 # This bug is HP SR number 8606223364.
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking size of unsigned long long" >&5
 $as_echo_n "checking size of unsigned long long... " >&6; }
-if test "${ac_cv_sizeof_unsigned_long_long+set}" = set; then :
+if ${ac_cv_sizeof_unsigned_long_long+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (unsigned long long))" "ac_cv_sizeof_unsigned_long_long"        "$ac_includes_default"; then :
@@ -7685,7 +7709,7 @@
      { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error 77 "cannot compute sizeof (unsigned long long)
-See \`config.log' for more details" "$LINENO" 5 ; }
+See \`config.log' for more details" "$LINENO" 5; }
    else
      ac_cv_sizeof_unsigned_long_long=0
    fi
@@ -7709,7 +7733,7 @@
 # This bug is HP SR number 8606223364.
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking size of unsigned short" >&5
 $as_echo_n "checking size of unsigned short... " >&6; }
-if test "${ac_cv_sizeof_unsigned_short+set}" = set; then :
+if ${ac_cv_sizeof_unsigned_short+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (unsigned short))" "ac_cv_sizeof_unsigned_short"        "$ac_includes_default"; then :
@@ -7719,7 +7743,7 @@
      { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error 77 "cannot compute sizeof (unsigned short)
-See \`config.log' for more details" "$LINENO" 5 ; }
+See \`config.log' for more details" "$LINENO" 5; }
    else
      ac_cv_sizeof_unsigned_short=0
    fi
@@ -7742,7 +7766,7 @@
 # This bug is HP SR number 8606223364.
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking size of void *" >&5
 $as_echo_n "checking size of void *... " >&6; }
-if test "${ac_cv_sizeof_void_p+set}" = set; then :
+if ${ac_cv_sizeof_void_p+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (void *))" "ac_cv_sizeof_void_p"        "$ac_includes_default"; then :
@@ -7752,7 +7776,7 @@
      { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error 77 "cannot compute sizeof (void *)
-See \`config.log' for more details" "$LINENO" 5 ; }
+See \`config.log' for more details" "$LINENO" 5; }
    else
      ac_cv_sizeof_void_p=0
    fi
@@ -7771,12 +7795,12 @@
 
 
 ac_fn_c_check_type "$LINENO" "char" "ac_cv_type_char" "$ac_includes_default"
-if test "x$ac_cv_type_char" = x""yes; then :
+if test "x$ac_cv_type_char" = xyes; then :
 
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking alignment of char" >&5
 $as_echo_n "checking alignment of char... " >&6; }
-if test "${fp_cv_alignment_char+set}" = set; then :
+if ${fp_cv_alignment_char+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test "$ac_cv_type_char" = yes; then
@@ -7799,12 +7823,12 @@
 _ACEOF
 
 ac_fn_c_check_type "$LINENO" "double" "ac_cv_type_double" "$ac_includes_default"
-if test "x$ac_cv_type_double" = x""yes; then :
+if test "x$ac_cv_type_double" = xyes; then :
 
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking alignment of double" >&5
 $as_echo_n "checking alignment of double... " >&6; }
-if test "${fp_cv_alignment_double+set}" = set; then :
+if ${fp_cv_alignment_double+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test "$ac_cv_type_double" = yes; then
@@ -7827,12 +7851,12 @@
 _ACEOF
 
 ac_fn_c_check_type "$LINENO" "float" "ac_cv_type_float" "$ac_includes_default"
-if test "x$ac_cv_type_float" = x""yes; then :
+if test "x$ac_cv_type_float" = xyes; then :
 
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking alignment of float" >&5
 $as_echo_n "checking alignment of float... " >&6; }
-if test "${fp_cv_alignment_float+set}" = set; then :
+if ${fp_cv_alignment_float+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test "$ac_cv_type_float" = yes; then
@@ -7855,12 +7879,12 @@
 _ACEOF
 
 ac_fn_c_check_type "$LINENO" "int" "ac_cv_type_int" "$ac_includes_default"
-if test "x$ac_cv_type_int" = x""yes; then :
+if test "x$ac_cv_type_int" = xyes; then :
 
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking alignment of int" >&5
 $as_echo_n "checking alignment of int... " >&6; }
-if test "${fp_cv_alignment_int+set}" = set; then :
+if ${fp_cv_alignment_int+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test "$ac_cv_type_int" = yes; then
@@ -7883,12 +7907,12 @@
 _ACEOF
 
 ac_fn_c_check_type "$LINENO" "long" "ac_cv_type_long" "$ac_includes_default"
-if test "x$ac_cv_type_long" = x""yes; then :
+if test "x$ac_cv_type_long" = xyes; then :
 
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking alignment of long" >&5
 $as_echo_n "checking alignment of long... " >&6; }
-if test "${fp_cv_alignment_long+set}" = set; then :
+if ${fp_cv_alignment_long+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test "$ac_cv_type_long" = yes; then
@@ -7912,12 +7936,12 @@
 
 if test "$ac_cv_type_long_long" = yes; then
 ac_fn_c_check_type "$LINENO" "long long" "ac_cv_type_long_long" "$ac_includes_default"
-if test "x$ac_cv_type_long_long" = x""yes; then :
+if test "x$ac_cv_type_long_long" = xyes; then :
 
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking alignment of long long" >&5
 $as_echo_n "checking alignment of long long... " >&6; }
-if test "${fp_cv_alignment_long_long+set}" = set; then :
+if ${fp_cv_alignment_long_long+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test "$ac_cv_type_long_long" = yes; then
@@ -7941,12 +7965,12 @@
 
 fi
 ac_fn_c_check_type "$LINENO" "short" "ac_cv_type_short" "$ac_includes_default"
-if test "x$ac_cv_type_short" = x""yes; then :
+if test "x$ac_cv_type_short" = xyes; then :
 
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking alignment of short" >&5
 $as_echo_n "checking alignment of short... " >&6; }
-if test "${fp_cv_alignment_short+set}" = set; then :
+if ${fp_cv_alignment_short+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test "$ac_cv_type_short" = yes; then
@@ -7969,12 +7993,12 @@
 _ACEOF
 
 ac_fn_c_check_type "$LINENO" "unsigned char" "ac_cv_type_unsigned_char" "$ac_includes_default"
-if test "x$ac_cv_type_unsigned_char" = x""yes; then :
+if test "x$ac_cv_type_unsigned_char" = xyes; then :
 
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking alignment of unsigned char" >&5
 $as_echo_n "checking alignment of unsigned char... " >&6; }
-if test "${fp_cv_alignment_unsigned_char+set}" = set; then :
+if ${fp_cv_alignment_unsigned_char+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test "$ac_cv_type_unsigned_char" = yes; then
@@ -7997,12 +8021,12 @@
 _ACEOF
 
 ac_fn_c_check_type "$LINENO" "unsigned int" "ac_cv_type_unsigned_int" "$ac_includes_default"
-if test "x$ac_cv_type_unsigned_int" = x""yes; then :
+if test "x$ac_cv_type_unsigned_int" = xyes; then :
 
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking alignment of unsigned int" >&5
 $as_echo_n "checking alignment of unsigned int... " >&6; }
-if test "${fp_cv_alignment_unsigned_int+set}" = set; then :
+if ${fp_cv_alignment_unsigned_int+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test "$ac_cv_type_unsigned_int" = yes; then
@@ -8025,12 +8049,12 @@
 _ACEOF
 
 ac_fn_c_check_type "$LINENO" "unsigned long" "ac_cv_type_unsigned_long" "$ac_includes_default"
-if test "x$ac_cv_type_unsigned_long" = x""yes; then :
+if test "x$ac_cv_type_unsigned_long" = xyes; then :
 
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking alignment of unsigned long" >&5
 $as_echo_n "checking alignment of unsigned long... " >&6; }
-if test "${fp_cv_alignment_unsigned_long+set}" = set; then :
+if ${fp_cv_alignment_unsigned_long+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test "$ac_cv_type_unsigned_long" = yes; then
@@ -8054,12 +8078,12 @@
 
 if test "$ac_cv_type_long_long" = yes; then
 ac_fn_c_check_type "$LINENO" "unsigned long long" "ac_cv_type_unsigned_long_long" "$ac_includes_default"
-if test "x$ac_cv_type_unsigned_long_long" = x""yes; then :
+if test "x$ac_cv_type_unsigned_long_long" = xyes; then :
 
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking alignment of unsigned long long" >&5
 $as_echo_n "checking alignment of unsigned long long... " >&6; }
-if test "${fp_cv_alignment_unsigned_long_long+set}" = set; then :
+if ${fp_cv_alignment_unsigned_long_long+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test "$ac_cv_type_unsigned_long_long" = yes; then
@@ -8083,12 +8107,12 @@
 
 fi
 ac_fn_c_check_type "$LINENO" "unsigned short" "ac_cv_type_unsigned_short" "$ac_includes_default"
-if test "x$ac_cv_type_unsigned_short" = x""yes; then :
+if test "x$ac_cv_type_unsigned_short" = xyes; then :
 
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking alignment of unsigned short" >&5
 $as_echo_n "checking alignment of unsigned short... " >&6; }
-if test "${fp_cv_alignment_unsigned_short+set}" = set; then :
+if ${fp_cv_alignment_unsigned_short+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test "$ac_cv_type_unsigned_short" = yes; then
@@ -8117,7 +8141,7 @@
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking alignment of void *" >&5
 $as_echo_n "checking alignment of void *... " >&6; }
-if test "${fp_cv_alignment_void_p+set}" = set; then :
+if ${fp_cv_alignment_void_p+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test "$ac_cv_type_void_p" = yes; then
@@ -8142,7 +8166,7 @@
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for WinExec" >&5
 $as_echo_n "checking for WinExec... " >&6; }
-if test "${fp_cv_func_WinExec+set}" = set; then :
+if ${fp_cv_func_WinExec+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -8174,7 +8198,7 @@
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GetModuleFileName" >&5
 $as_echo_n "checking for GetModuleFileName... " >&6; }
-if test "${fp_cv_func_GetModuleFileName+set}" = set; then :
+if ${fp_cv_func_GetModuleFileName+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -8207,7 +8231,7 @@
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking return type of signal handlers" >&5
 $as_echo_n "checking return type of signal handlers... " >&6; }
-if test "${ac_cv_type_signal+set}" = set; then :
+if ${ac_cv_type_signal+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -8261,7 +8285,7 @@
   { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error $? "cannot run test program while cross compiling
-See \`config.log' for more details" "$LINENO" 5 ; }
+See \`config.log' for more details" "$LINENO" 5; }
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
@@ -8291,7 +8315,7 @@
 #define _POSIX_C_SOURCE 199506L
 #include <time.h>
 "
-if test "x$ac_cv_have_decl_ctime_r" = x""yes; then :
+if test "x$ac_cv_have_decl_ctime_r" = xyes; then :
   ac_have_decl=1
 else
   ac_have_decl=0
@@ -8304,7 +8328,7 @@
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for closedir in -lmingwex" >&5
 $as_echo_n "checking for closedir in -lmingwex... " >&6; }
-if test "${ac_cv_lib_mingwex_closedir+set}" = set; then :
+if ${ac_cv_lib_mingwex_closedir+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
@@ -8338,7 +8362,7 @@
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_mingwex_closedir" >&5
 $as_echo "$ac_cv_lib_mingwex_closedir" >&6; }
-if test "x$ac_cv_lib_mingwex_closedir" = x""yes; then :
+if test "x$ac_cv_lib_mingwex_closedir" = xyes; then :
   HaveLibMingwEx=YES
 else
   HaveLibMingwEx=NO
@@ -8354,7 +8378,7 @@
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for atan in -lm" >&5
 $as_echo_n "checking for atan in -lm... " >&6; }
-if test "${ac_cv_lib_m_atan+set}" = set; then :
+if ${ac_cv_lib_m_atan+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
@@ -8388,7 +8412,7 @@
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_m_atan" >&5
 $as_echo "$ac_cv_lib_m_atan" >&6; }
-if test "x$ac_cv_lib_m_atan" = x""yes; then :
+if test "x$ac_cv_lib_m_atan" = xyes; then :
   HaveLibM=YES
 else
   HaveLibM=NO
@@ -8403,7 +8427,7 @@
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for xmalloc in -liberty" >&5
 $as_echo_n "checking for xmalloc in -liberty... " >&6; }
-if test "${ac_cv_lib_iberty_xmalloc+set}" = set; then :
+if ${ac_cv_lib_iberty_xmalloc+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
@@ -8437,7 +8461,7 @@
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_iberty_xmalloc" >&5
 $as_echo "$ac_cv_lib_iberty_xmalloc" >&6; }
-if test "x$ac_cv_lib_iberty_xmalloc" = x""yes; then :
+if test "x$ac_cv_lib_iberty_xmalloc" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_LIBIBERTY 1
 _ACEOF
@@ -8448,7 +8472,7 @@
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for bfd_init in -lbfd" >&5
 $as_echo_n "checking for bfd_init in -lbfd... " >&6; }
-if test "${ac_cv_lib_bfd_bfd_init+set}" = set; then :
+if ${ac_cv_lib_bfd_bfd_init+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
@@ -8482,7 +8506,7 @@
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_bfd_bfd_init" >&5
 $as_echo "$ac_cv_lib_bfd_bfd_init" >&6; }
-if test "x$ac_cv_lib_bfd_bfd_init" = x""yes; then :
+if test "x$ac_cv_lib_bfd_bfd_init" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_LIBBFD 1
 _ACEOF
@@ -8496,7 +8520,7 @@
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5
 $as_echo_n "checking for dlopen in -ldl... " >&6; }
-if test "${ac_cv_lib_dl_dlopen+set}" = set; then :
+if ${ac_cv_lib_dl_dlopen+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
@@ -8530,7 +8554,7 @@
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5
 $as_echo "$ac_cv_lib_dl_dlopen" >&6; }
-if test "x$ac_cv_lib_dl_dlopen" = x""yes; then :
+if test "x$ac_cv_lib_dl_dlopen" = xyes; then :
   HaveLibDL=YES
 
 $as_echo "#define HAVE_LIBDL 1" >>confdefs.h
@@ -8543,11 +8567,22 @@
 
 
 
+ac_fn_c_check_type "$LINENO" "size_t" "ac_cv_type_size_t" "$ac_includes_default"
+if test "x$ac_cv_type_size_t" = xyes; then :
+
+else
+
+cat >>confdefs.h <<_ACEOF
+#define size_t unsigned int
+_ACEOF
+
+fi
+
 # The Ultrix 4.2 mips builtin alloca declared by alloca.h only works
 # for constant arguments.  Useless!
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for working alloca.h" >&5
 $as_echo_n "checking for working alloca.h... " >&6; }
-if test "${ac_cv_working_alloca_h+set}" = set; then :
+if ${ac_cv_working_alloca_h+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -8580,7 +8615,7 @@
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for alloca" >&5
 $as_echo_n "checking for alloca... " >&6; }
-if test "${ac_cv_func_alloca_works+set}" = set; then :
+if ${ac_cv_func_alloca_works+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -8599,7 +8634,7 @@
  #pragma alloca
 #   else
 #    ifndef alloca /* predefined by HP cc +Olibcalls */
-char *alloca ();
+void *alloca (size_t);
 #    endif
 #   endif
 #  endif
@@ -8643,7 +8678,7 @@
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether \`alloca.c' needs Cray hooks" >&5
 $as_echo_n "checking whether \`alloca.c' needs Cray hooks... " >&6; }
-if test "${ac_cv_os_cray+set}" = set; then :
+if ${ac_cv_os_cray+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -8684,7 +8719,7 @@
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking stack direction for C alloca" >&5
 $as_echo_n "checking stack direction for C alloca... " >&6; }
-if test "${ac_cv_c_stack_direction+set}" = set; then :
+if ${ac_cv_c_stack_direction+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test "$cross_compiling" = yes; then :
@@ -8734,7 +8769,7 @@
 
 
 ac_fn_c_check_type "$LINENO" "pid_t" "ac_cv_type_pid_t" "$ac_includes_default"
-if test "x$ac_cv_type_pid_t" = x""yes; then :
+if test "x$ac_cv_type_pid_t" = xyes; then :
 
 else
 
@@ -8747,7 +8782,7 @@
 for ac_header in vfork.h
 do :
   ac_fn_c_check_header_mongrel "$LINENO" "vfork.h" "ac_cv_header_vfork_h" "$ac_includes_default"
-if test "x$ac_cv_header_vfork_h" = x""yes; then :
+if test "x$ac_cv_header_vfork_h" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_VFORK_H 1
 _ACEOF
@@ -8771,7 +8806,7 @@
 if test "x$ac_cv_func_fork" = xyes; then
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for working fork" >&5
 $as_echo_n "checking for working fork... " >&6; }
-if test "${ac_cv_func_fork_works+set}" = set; then :
+if ${ac_cv_func_fork_works+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test "$cross_compiling" = yes; then :
@@ -8824,7 +8859,7 @@
 if test "x$ac_cv_func_vfork" = xyes; then
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for working vfork" >&5
 $as_echo_n "checking for working vfork... " >&6; }
-if test "${ac_cv_func_vfork_works+set}" = set; then :
+if ${ac_cv_func_vfork_works+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test "$cross_compiling" = yes; then :
@@ -8960,7 +8995,7 @@
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for an ANSI C-conforming const" >&5
 $as_echo_n "checking for an ANSI C-conforming const... " >&6; }
-if test "${ac_cv_c_const+set}" = set; then :
+if ${ac_cv_c_const+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -9041,7 +9076,7 @@
 
  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether byte ordering is bigendian" >&5
 $as_echo_n "checking whether byte ordering is bigendian... " >&6; }
-if test "${ac_cv_c_bigendian+set}" = set; then :
+if ${ac_cv_c_bigendian+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_cv_c_bigendian=unknown
@@ -9260,12 +9295,12 @@
      ;; #(
    *)
      as_fn_error $? "unknown endianness
- presetting ac_cv_c_bigendian=no (or yes) will help" "$LINENO" 5  ;;
+ presetting ac_cv_c_bigendian=no (or yes) will help" "$LINENO" 5 ;;
  esac
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether float word order is big endian" >&5
 $as_echo_n "checking whether float word order is big endian... " >&6; }
-if test "${fptools_cv_float_word_order_bigendian+set}" = set; then :
+if ${fptools_cv_float_word_order_bigendian+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -9304,7 +9339,7 @@
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for nlist in -lelf" >&5
 $as_echo_n "checking for nlist in -lelf... " >&6; }
-if test "${ac_cv_lib_elf_nlist+set}" = set; then :
+if ${ac_cv_lib_elf_nlist+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
@@ -9338,13 +9373,13 @@
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_elf_nlist" >&5
 $as_echo "$ac_cv_lib_elf_nlist" >&6; }
-if test "x$ac_cv_lib_elf_nlist" = x""yes; then :
+if test "x$ac_cv_lib_elf_nlist" = xyes; then :
   LIBS="-lelf $LIBS"
 fi
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking leading underscore in symbol names" >&5
 $as_echo_n "checking leading underscore in symbol names... " >&6; }
-if test "${fptools_cv_leading_underscore+set}" = set; then :
+if ${fptools_cv_leading_underscore+:} false; then :
   $as_echo_n "(cached) " >&6
 else
 
@@ -9415,7 +9450,7 @@
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ld understands -x" >&5
 $as_echo_n "checking whether ld understands -x... " >&6; }
-if test "${fp_cv_ld_x+set}" = set; then :
+if ${fp_cv_ld_x+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   echo 'foo() {}' > conftest.c
@@ -9439,7 +9474,7 @@
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ld is GNU ld" >&5
 $as_echo_n "checking whether ld is GNU ld... " >&6; }
-if test "${fp_cv_gnu_ld+set}" = set; then :
+if ${fp_cv_gnu_ld+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if ${LdCmd} --version 2> /dev/null | grep "GNU" > /dev/null 2>&1; then
@@ -9514,7 +9549,7 @@
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for clock_gettime in -lrt" >&5
 $as_echo_n "checking for clock_gettime in -lrt... " >&6; }
-if test "${ac_cv_lib_rt_clock_gettime+set}" = set; then :
+if ${ac_cv_lib_rt_clock_gettime+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
@@ -9548,7 +9583,7 @@
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_rt_clock_gettime" >&5
 $as_echo "$ac_cv_lib_rt_clock_gettime" >&6; }
-if test "x$ac_cv_lib_rt_clock_gettime" = x""yes; then :
+if test "x$ac_cv_lib_rt_clock_gettime" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_LIBRT 1
 _ACEOF
@@ -9571,14 +9606,14 @@
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for a working timer_create(CLOCK_REALTIME)" >&5
 $as_echo_n "checking for a working timer_create(CLOCK_REALTIME)... " >&6; }
-if test "${fptools_cv_timer_create_works+set}" = set; then :
+if ${fptools_cv_timer_create_works+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test "$cross_compiling" = yes; then :
   { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error $? "cannot run test program while cross compiling
-See \`config.log' for more details" "$LINENO" 5 ; }
+See \`config.log' for more details" "$LINENO" 5; }
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
@@ -9760,7 +9795,7 @@
 for ac_header in sys/eventfd.h
 do :
   ac_fn_c_check_header_mongrel "$LINENO" "sys/eventfd.h" "ac_cv_header_sys_eventfd_h" "$ac_includes_default"
-if test "x$ac_cv_header_sys_eventfd_h" = x""yes; then :
+if test "x$ac_cv_header_sys_eventfd_h" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_SYS_EVENTFD_H 1
 _ACEOF
@@ -9772,7 +9807,7 @@
 for ac_func in eventfd
 do :
   ac_fn_c_check_func "$LINENO" "eventfd" "ac_cv_func_eventfd"
-if test "x$ac_cv_func_eventfd" = x""yes; then :
+if test "x$ac_cv_func_eventfd" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_EVENTFD 1
 _ACEOF
@@ -9788,7 +9823,7 @@
 set dummy $ac_prog; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_GTK_CONFIG+set}" = set; then :
+if ${ac_cv_path_GTK_CONFIG+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   case $GTK_CONFIG in
@@ -9841,7 +9876,7 @@
 #Checking for PAPI
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for PAPI_library_init in -lpapi" >&5
 $as_echo_n "checking for PAPI_library_init in -lpapi... " >&6; }
-if test "${ac_cv_lib_papi_PAPI_library_init+set}" = set; then :
+if ${ac_cv_lib_papi_PAPI_library_init+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
@@ -9875,14 +9910,14 @@
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_papi_PAPI_library_init" >&5
 $as_echo "$ac_cv_lib_papi_PAPI_library_init" >&6; }
-if test "x$ac_cv_lib_papi_PAPI_library_init" = x""yes; then :
+if test "x$ac_cv_lib_papi_PAPI_library_init" = xyes; then :
   HavePapiLib=YES
 else
   HavePapiLib=NO
 fi
 
 ac_fn_c_check_header_mongrel "$LINENO" "papi.h" "ac_cv_header_papi_h" "$ac_includes_default"
-if test "x$ac_cv_header_papi_h" = x""yes; then :
+if test "x$ac_cv_header_papi_h" = xyes; then :
   HavePapiHeader=YES
 else
   HavePapiHeader=NO
@@ -9895,7 +9930,7 @@
 for ac_func in __mingw_vfprintf
 do :
   ac_fn_c_check_func "$LINENO" "__mingw_vfprintf" "ac_cv_func___mingw_vfprintf"
-if test "x$ac_cv_func___mingw_vfprintf" = x""yes; then :
+if test "x$ac_cv_func___mingw_vfprintf" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE___MINGW_VFPRINTF 1
 _ACEOF
@@ -10018,10 +10053,21 @@
      :end' >>confcache
 if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
   if test -w "$cache_file"; then
-    test "x$cache_file" != "x/dev/null" &&
+    if test "x$cache_file" != "x/dev/null"; then
       { $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5
 $as_echo "$as_me: updating cache $cache_file" >&6;}
-    cat confcache >$cache_file
+      if test ! -f "$cache_file" || test -h "$cache_file"; then
+	cat confcache >"$cache_file"
+      else
+        case $cache_file in #(
+        */* | ?:*)
+	  mv -f confcache "$cache_file"$$ &&
+	  mv -f "$cache_file"$$ "$cache_file" ;; #(
+        *)
+	  mv -f confcache "$cache_file" ;;
+	esac
+      fi
+    fi
   else
     { $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5
 $as_echo "$as_me: not updating unwritable cache $cache_file" >&6;}
@@ -10054,7 +10100,7 @@
 
 
 
-: ${CONFIG_STATUS=./config.status}
+: "${CONFIG_STATUS=./config.status}"
 ac_write_fail=0
 ac_clean_files_save=$ac_clean_files
 ac_clean_files="$ac_clean_files $CONFIG_STATUS"
@@ -10155,6 +10201,7 @@
 IFS=" ""	$as_nl"
 
 # Find who we are.  Look in the path if we contain no directory separator.
+as_myself=
 case $0 in #((
   *[\\/]* ) as_myself=$0 ;;
   *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -10462,7 +10509,7 @@
 # values after options handling.
 ac_log="
 This file was extended by The Glorious Glasgow Haskell Compilation System $as_me 7.0.3, which was
-generated by GNU Autoconf 2.67.  Invocation command line was
+generated by GNU Autoconf 2.68.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
   CONFIG_HEADERS  = $CONFIG_HEADERS
@@ -10528,7 +10575,7 @@
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
 The Glorious Glasgow Haskell Compilation System config.status 7.0.3
-configured by $0, generated by GNU Autoconf 2.67,
+configured by $0, generated by GNU Autoconf 2.68,
   with options \\"\$ac_cs_config\\"
 
 Copyright (C) 2010 Free Software Foundation, Inc.
@@ -10666,7 +10713,7 @@
     "distrib/configure.ac") CONFIG_FILES="$CONFIG_FILES distrib/configure.ac" ;;
     "mk/stamp-h") CONFIG_COMMANDS="$CONFIG_COMMANDS mk/stamp-h" ;;
 
-  *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5 ;;
+  *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
   esac
 done
 
@@ -10689,9 +10736,10 @@
 # after its creation but before its name has been assigned to `$tmp'.
 $debug ||
 {
-  tmp=
+  tmp= ac_tmp=
   trap 'exit_status=$?
-  { test -z "$tmp" || test ! -d "$tmp" || rm -fr "$tmp"; } && exit $exit_status
+  : "${ac_tmp:=$tmp}"
+  { test ! -d "$ac_tmp" || rm -fr "$ac_tmp"; } && exit $exit_status
 ' 0
   trap 'as_fn_exit 1' 1 2 13 15
 }
@@ -10699,12 +10747,13 @@
 
 {
   tmp=`(umask 077 && mktemp -d "./confXXXXXX") 2>/dev/null` &&
-  test -n "$tmp" && test -d "$tmp"
+  test -d "$tmp"
 }  ||
 {
   tmp=./conf$$-$RANDOM
   (umask 077 && mkdir "$tmp")
 } || as_fn_error $? "cannot create a temporary directory in ." "$LINENO" 5
+ac_tmp=$tmp
 
 # Set up the scripts for CONFIG_FILES section.
 # No need to generate them if there are no CONFIG_FILES.
@@ -10726,7 +10775,7 @@
   ac_cs_awk_cr=$ac_cr
 fi
 
-echo 'BEGIN {' >"$tmp/subs1.awk" &&
+echo 'BEGIN {' >"$ac_tmp/subs1.awk" &&
 _ACEOF
 
 
@@ -10754,7 +10803,7 @@
 rm -f conf$$subs.sh
 
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-cat >>"\$tmp/subs1.awk" <<\\_ACAWK &&
+cat >>"\$ac_tmp/subs1.awk" <<\\_ACAWK &&
 _ACEOF
 sed -n '
 h
@@ -10802,7 +10851,7 @@
 rm -f conf$$subs.awk
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 _ACAWK
-cat >>"\$tmp/subs1.awk" <<_ACAWK &&
+cat >>"\$ac_tmp/subs1.awk" <<_ACAWK &&
   for (key in S) S_is_set[key] = 1
   FS = ""
 
@@ -10834,7 +10883,7 @@
   sed "s/$ac_cr\$//; s/$ac_cr/$ac_cs_awk_cr/g"
 else
   cat
-fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \
+fi < "$ac_tmp/subs1.awk" > "$ac_tmp/subs.awk" \
   || as_fn_error $? "could not setup config files machinery" "$LINENO" 5
 _ACEOF
 
@@ -10868,7 +10917,7 @@
 # No need to generate them if there are no CONFIG_HEADERS.
 # This happens for instance with `./config.status Makefile'.
 if test -n "$CONFIG_HEADERS"; then
-cat >"$tmp/defines.awk" <<\_ACAWK ||
+cat >"$ac_tmp/defines.awk" <<\_ACAWK ||
 BEGIN {
 _ACEOF
 
@@ -10880,8 +10929,8 @@
 # handling of long lines.
 ac_delim='%!_!# '
 for ac_last_try in false false :; do
-  ac_t=`sed -n "/$ac_delim/p" confdefs.h`
-  if test -z "$ac_t"; then
+  ac_tt=`sed -n "/$ac_delim/p" confdefs.h`
+  if test -z "$ac_tt"; then
     break
   elif $ac_last_try; then
     as_fn_error $? "could not make $CONFIG_HEADERS" "$LINENO" 5
@@ -10982,7 +11031,7 @@
   esac
   case $ac_mode$ac_tag in
   :[FHL]*:*);;
-  :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5 ;;
+  :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5;;
   :[FH]-) ac_tag=-:-;;
   :[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
   esac
@@ -11001,7 +11050,7 @@
     for ac_f
     do
       case $ac_f in
-      -) ac_f="$tmp/stdin";;
+      -) ac_f="$ac_tmp/stdin";;
       *) # Look for the file first in the build tree, then in the source tree
 	 # (if the path is not absolute).  The absolute path cannot be DOS-style,
 	 # because $ac_f cannot contain `:'.
@@ -11010,7 +11059,7 @@
 	   [\\/$]*) false;;
 	   *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;
 	   esac ||
-	   as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5 ;;
+	   as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5;;
       esac
       case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac
       as_fn_append ac_file_inputs " '$ac_f'"
@@ -11036,8 +11085,8 @@
     esac
 
     case $ac_tag in
-    *:-:* | *:-) cat >"$tmp/stdin" \
-      || as_fn_error $? "could not create $ac_file" "$LINENO" 5  ;;
+    *:-:* | *:-) cat >"$ac_tmp/stdin" \
+      || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;;
     esac
     ;;
   esac
@@ -11167,21 +11216,22 @@
 s&@INSTALL@&$ac_INSTALL&;t t
 $ac_datarootdir_hack
 "
-eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$tmp/out \
-  || as_fn_error $? "could not create $ac_file" "$LINENO" 5
+eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$ac_tmp/subs.awk" \
+  >$ac_tmp/out || as_fn_error $? "could not create $ac_file" "$LINENO" 5
 
 test -z "$ac_datarootdir_hack$ac_datarootdir_seen" &&
-  { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } &&
-  { ac_out=`sed -n '/^[	 ]*datarootdir[	 ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } &&
+  { ac_out=`sed -n '/\${datarootdir}/p' "$ac_tmp/out"`; test -n "$ac_out"; } &&
+  { ac_out=`sed -n '/^[	 ]*datarootdir[	 ]*:*=/p' \
+      "$ac_tmp/out"`; test -z "$ac_out"; } &&
   { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir'
 which seems to be undefined.  Please make sure it is defined" >&5
 $as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'
 which seems to be undefined.  Please make sure it is defined" >&2;}
 
-  rm -f "$tmp/stdin"
+  rm -f "$ac_tmp/stdin"
   case $ac_file in
-  -) cat "$tmp/out" && rm -f "$tmp/out";;
-  *) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";;
+  -) cat "$ac_tmp/out" && rm -f "$ac_tmp/out";;
+  *) rm -f "$ac_file" && mv "$ac_tmp/out" "$ac_file";;
   esac \
   || as_fn_error $? "could not create $ac_file" "$LINENO" 5
  ;;
@@ -11192,20 +11242,20 @@
   if test x"$ac_file" != x-; then
     {
       $as_echo "/* $configure_input  */" \
-      && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs"
-    } >"$tmp/config.h" \
+      && eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs"
+    } >"$ac_tmp/config.h" \
       || as_fn_error $? "could not create $ac_file" "$LINENO" 5
-    if diff "$ac_file" "$tmp/config.h" >/dev/null 2>&1; then
+    if diff "$ac_file" "$ac_tmp/config.h" >/dev/null 2>&1; then
       { $as_echo "$as_me:${as_lineno-$LINENO}: $ac_file is unchanged" >&5
 $as_echo "$as_me: $ac_file is unchanged" >&6;}
     else
       rm -f "$ac_file"
-      mv "$tmp/config.h" "$ac_file" \
+      mv "$ac_tmp/config.h" "$ac_file" \
 	|| as_fn_error $? "could not create $ac_file" "$LINENO" 5
     fi
   else
     $as_echo "/* $configure_input  */" \
-      && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" \
+      && eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs" \
       || as_fn_error $? "could not create -" "$LINENO" 5
   fi
  ;;
