This makes configuring cpu types a bit nicer.

1 files changed, 3340 insertions, 0 deletions

diff --git a/sources/gcc-003-config-arch-and-float.patch b/sources/gcc-003-config-arch-and-float.patch
new file mode 100644
index 000000000..45078b8f9
--- /dev/null
+++ b/sources/gcc-003-config-arch-and-float.patch
@@ -0,0 +1,3340 @@
+diff -urN gcc-3.2.1/gcc.orig/Makefile.in gcc-3.2.1/gcc/Makefile.in
+--- gcc-3.2.1/gcc.orig/Makefile.in	2002-10-14 15:04:16.000000000 -0600
++++ gcc-3.2.1/gcc/Makefile.in	2003-01-15 02:07:46.000000000 -0700
+@@ -1235,6 +1235,7 @@
+ # Language-independent files.
+ 
+ DRIVER_DEFINES = \
++  @target_default_options@ \
+   -DSTANDARD_STARTFILE_PREFIX=\"$(unlibsubdir)/\" \
+   -DSTANDARD_EXEC_PREFIX=\"$(libdir)/gcc-lib/\" \
+   -DDEFAULT_TARGET_VERSION=\"$(version)\" \
+diff -urN gcc-3.2.1/gcc.orig/config/mips/mips.h gcc-3.2.1/gcc/config/mips/mips.h
+--- gcc-3.2.1/gcc.orig/config/mips/mips.h	2002-04-26 15:32:14.000000000 -0600
++++ gcc-3.2.1/gcc/config/mips/mips.h	2003-01-15 02:07:46.000000000 -0700
+@@ -606,6 +606,19 @@
+       N_("Specify cache flush function")},				\
+ }
+ 
++/* This is not quite ideal.  The last -mips<N> option specified wins, even
++   though -mips16 is orthogonal to the other options.  Handle the current
++   status quo for now.  */
++#define TARGET_DEFAULT_ARCH_P() \
++  (! option_present (*argcp, *argvp, "-march=") \
++   && (! last_option_present (*argcp, *argvp, "-mips") \
++       || !strcmp (last_option_present (*argcp, *argvp, "-mips"), "-mips16")))
++
++#define TARGET_DEFAULT_FLOAT_P() \
++  (! option_present (*argcp, *argvp, "-msoft-float") \
++   && ! option_present (*argcp, *argvp, "-mhard-float") \
++   && ! option_present (*argcp, *argvp, "-msingle-float"))
++
+ /* This is meant to be redefined in the host dependent files.  */
+ #define SUBTARGET_TARGET_OPTIONS
+ 
+diff -urN gcc-3.2.1/gcc.orig/config.gcc gcc-3.2.1/gcc/config.gcc
+--- gcc-3.2.1/gcc.orig/config.gcc	2002-10-23 11:28:29.000000000 -0600
++++ gcc-3.2.1/gcc/config.gcc	2003-01-15 02:20:27.000000000 -0700
+@@ -3442,152 +3442,192 @@
+ 	;;
+ esac
+ 
+-# Distinguish i[34567]86
+-# Also, do not run mips-tfile on MIPS if using gas.
+-# Process --with-cpu= for PowerPC/rs6000
+-target_cpu_default2=
+-case $machine in
+-i486-*-*)
+-	target_cpu_default2=TARGET_CPU_DEFAULT_i486
+-	;;
+-i586-*-*)
+-	case $target_alias in
+-		k6_2-*)
+-			target_cpu_default2=TARGET_CPU_DEFAULT_k6_2
+-			;;
+-		k6_3-*)
+-			target_cpu_default2=TARGET_CPU_DEFAULT_k6_3
+-			;;
+-		k6-*)
+-			target_cpu_default2=TARGET_CPU_DEFAULT_k6
+-			;;
+-		pentium_mmx-*)
+-			target_cpu_default2=TARGET_CPU_DEFAULT_pentium_mmx
+-			;;
+-		*)
+-			target_cpu_default2=TARGET_CPU_DEFAULT_pentium
+-			;;
+-	esac
+-	;;
+-i686-*-* | i786-*-*)
+-	case $target_alias in
+-		athlon_xp-*|athlon_mp-*|athlon_4-*)
+-			target_cpu_default2=TARGET_CPU_DEFAULT_athlon_sse
+-			;;
+-		athlon_tbird-*|athlon-*)
+-			target_cpu_default2=TARGET_CPU_DEFAULT_athlon
+-			;;
+-		pentium2-*)
+-			target_cpu_default2=TARGET_CPU_DEFAULT_pentium2
+-			;;
+-		pentium3-*)
+-			target_cpu_default2=TARGET_CPU_DEFAULT_pentium3
+-			;;
+-		pentium4-*)
+-			target_cpu_default2=TARGET_CPU_DEFAULT_pentium4
+-			;;
+-		*)
+-			target_cpu_default2=TARGET_CPU_DEFAULT_pentiumpro
+-			;;
+-	esac
+-	;;
+-x86_64-*-*)
+-	# We should have hammer chip here, but it does not exist yet and
+-	# thus it is not supported.  Athlon_SSE is probably equivalent feature
+-	# wise to hammer from our point of view except for 64bit mode.
+-	target_cpu_default2=TARGET_CPU_DEFAULT_athlon_sse
+-	;;
+-alpha*-*-*)
+-	case $machine in
+-		alphaev6[78]*)
+-			target_cpu_default2="MASK_CPU_EV6|MASK_BWX|MASK_MAX|MASK_FIX|MASK_CIX"
+-			;;
+-		alphaev6*)
+-			target_cpu_default2="MASK_CPU_EV6|MASK_BWX|MASK_MAX|MASK_FIX"
+-			;;
+-		alphapca56*)
+-			target_cpu_default2="MASK_CPU_EV5|MASK_BWX|MASK_MAX"
+-			;;
+-		alphaev56*)
+-			target_cpu_default2="MASK_CPU_EV5|MASK_BWX"
+-			;;
+-		alphaev5*)
+-			target_cpu_default2="MASK_CPU_EV5"
+-			;;
+-	esac
+ 
+-	if test x$gas = xyes
+-	then
+-		if test "$target_cpu_default2" = ""
+-		then
+-			target_cpu_default2="MASK_GAS"
+-		else
+-			target_cpu_default2="${target_cpu_default2}|MASK_GAS"
+-		fi
+-	fi
+-	;;
+-arm*-*-*)
++# Process --with-cpu= settings for various machines
++if test x$pass2done = xyes
++then
+ 	case "x$with_cpu" in
+-		x)
+-			# The most generic
+-			target_cpu_default2="TARGET_CPU_generic"
+-			;;
+-
+-		# Distinguish cores, and major variants
+-		# arm7m doesn't exist, but D & I don't affect code
+-		xarm[236789] | xarm250 | xarm[67][01]0 \
+-		| xarm7m | xarm7dm | xarm7dmi | xarm[79]tdmi \
+-		| xarm7100 | xarm7500 | xarm7500fe | xarm810 \
+-		| xxscale \
+-		| xstrongarm | xstrongarm110 | xstrongarm1100)
+-			target_cpu_default2="TARGET_CPU_$with_cpu"
+-			;;
+-
+ 		xyes | xno)
+ 			echo "--with-cpu must be passed a value" 1>&2
+ 			exit 1
+-			;;
+-
+-		*)
+-			if test x$pass2done = xyes
+-			then
+-				echo "Unknown cpu used with --with-cpu=$with_cpu" 1>&2
+-				exit 1
+-			fi
+-			;;
+-	esac
+-	;;
++  			;;
++  	esac
+ 
+-hppa*-*-* | parisc*-*-*)
+-	if test x$gas = xyes
++	# If there is no $with_cpu option, try to infer one from ${machine}.
++	if test x$with_cpu = x
+ 	then
+-		target_cpu_default2="MASK_GAS|MASK_JUMP_IN_DELAY"
++		case $machine in
++		i486-*-*)
++			with_cpu=i486
++			;;
++		i586-*-*)
++			case $target_alias in
++			k6_2-*)
++				with_cpu=k6-2
++				;;
++			k6_3-*)
++				with_cpu=k6-3
++				;;
++			k6-*)
++				with_cpu=k6
++				;;
++			pentium_mmx-*)
++				with_cpu=pentium-mmx
++				;;
++			*)
++				with_cpu=pentium
++				;;
++			esac
++			;;
++		i686-*-* | i786-*-*)
++			case $target_alias in
++			athlon_xp-*|athlon_mp-*|athlon_4-*)
++				with_cpu=athlon-4
++				;;
++			athlon_tbird-*|athlon-*)
++				with_cpu=athlon
++				;;
++			pentium2-*)
++				with_cpu=pentium2
++				;;
++			pentium3-*)
++				with_cpu=pentium3
++				;;
++			pentium4-*)
++				with_cpu=pentium4
++				;;
++			*)
++				with_cpu=pentiumpro
++				;;
++			esac
++			;;
++		x86_64-*-*)
++			# We should have hammer chip here, but it does not
++			# exist yet and thus it is not supported.  Athlon_SSE
++			# is probably equivalent feature wise to hammer from
++			# our point of view except for 64bit mode.
++			with_cpu=athlon-sse
++			;;
++		alpha*-*-*)
++			case $machine in
++			alphaev6[78]*)
++				with_cpu=ev67
++				;;
++			alphaev6*)
++				with_cpu=ev6
++				;;
++			alphapca56*)
++				with_cpu=pca56
++				;;
++			alphaev56*)
++				with_cpu=ev56
++				;;
++			alphaev5*)
++				with_cpu=ev5
++				;;
++			esac
++  			;;
++		sparc*-*-*)
++			with_cpu="`echo $machine | sed 's/-.*$//'`"
++  			;;
++		esac
+ 	fi
+-	;;
+-
+-mips*-*-ecoff* | mips*-*-elf*)
+-	if test x$gas = xyes
+-	then
+-		if test x$gnu_ld = xyes
++  
++	case "$machine" in
++	alpha*-*-*)
++		if test x$gas = xyes
++  		then
++			if test "$target_cpu_default2" = ""
++			then
++				target_cpu_default2="MASK_GAS"
++			else
++				target_cpu_default2="${target_cpu_default2}|MASK_GAS"
++			fi
++  		fi
++		;;
++	arm*-*-*)
++		# Start with the most generic.
++		target_cpu_default2="TARGET_CPU_generic"
++  		# Distinguish cores, and major variants
++  		# arm7m doesn't exist, but D & I don't affect code
++		case "x$with_cpu" in
++		x | xarm[236789] | xarm250 | xarm[67][01]0 \
++  		| xarm7m | xarm7dm | xarm7dmi | xarm[79]tdmi \
++  		| xarm7100 | xarm7500 | xarm7500fe | xarm810 \
++  		| xxscale \
++  		| xstrongarm | xstrongarm110 | xstrongarm1100)
++			# OK
++  			;;
++  
++		*)
++			echo "Unknown cpu used with --with-cpu=$with_cpu" 1>&2
++  			exit 1
++  			;;
++		esac
++		;;
++	hppa*-*-* | parisc*-*-*)
++		if test x$gas = xyes
+ 		then
+-			target_cpu_default2="MASK_GAS|MASK_SPLIT_ADDR"
+-		else
+-			target_cpu_default2="MASK_GAS"
++			target_cpu_default2="MASK_GAS|MASK_JUMP_IN_DELAY"
+ 		fi
+-	fi
+-	;;
+-mips*-*-*)
+-	if test x$gas = xyes
+-	then
+-		target_cpu_default2="MASK_GAS"
+-	fi
+-	;;
+-powerpc*-*-* | rs6000-*-*)
+-        if test x$enable_altivec = xyes
+-        then
+-                tm_file="$tm_file rs6000/altivec-defs.h"
+-        fi
+-	case "x$with_cpu" in
++		case ".$with_schedule" in
++			.700 | .7100 | .7100LC | .7200 | .7300 | .8000)
++				;;
++			.)
++				case $machine in
++					hppa1* | parisc1*)
++						# Override default PA8000
++						# scheduling model.
++						with_schedule=7100LC
++						;;
++				esac
++				;;
++			*)
++				echo "Unknown cpu used with --with-schedule=$with_schedule" 1>&2
++  				exit 1
++				;;
++		esac
++		;;
++	mips*-*-*)
++		case $machine in
++		mips*-*-ecoff* | mips*-*-elf*)
++			if test x$gas = xyes
++			then
++				if test x$gnu_ld = xyes
++				then
++					target_cpu_default2="MASK_GAS|MASK_SPLIT_ADDR"
++				else
++					target_cpu_default2="MASK_GAS"
++				fi
++  			fi
++  			;;
++		mips*-*-*)
++			if test x$gas = xyes
++  			then
++  				target_cpu_default2="MASK_GAS"
++  			fi
++			;;
++		esac
++		case $machine in
++			mips*el-*-*)
++				tm_defines="TARGET_ENDIAN_DEFAULT=0 $tm_defines"
++				;;
++		esac
++		if test "x$enable_gofast" = xyes
++  		then
++			tm_defines="INIT_SUBTARGET_OPTABS=INIT_GOFAST_OPTABS $tm_defines"
++			tm_file="gofast.h $tm_file"
++			tmake_file="mips/t-gofast $tmake_file"
++		else
++			tmake_file="mips/t-mips $tmake_file"
++  		fi
++  		;;
++	powerpc*-*-* | rs6000-*-*)
++        	if test x$enable_altivec = xyes
++	        then
++        	        tm_file="$tm_file rs6000/altivec-defs.h"
++	        fi
++		case "x$with_cpu" in
+ 		x)
+ 			;;
+ 
+@@ -3603,49 +3643,53 @@
+ 			tm_file="$tm_file rs6000/softfloat.h"
+ 			;;
+ 
+-		xyes | xno)
+-			echo "--with-cpu must be passed a value" 1>&2
+-			exit 1
+-			;;
+-
+ 		*)
+-			if test x$pass2done = xyes
+-			then
+-				echo "Unknown cpu used with --with-cpu=$with_cpu" 1>&2
+-				exit 1
+-			fi
+-			;;
+-	esac
+-	;;
+-sparc*-*-*)
+-	case ".$with_cpu" in
+-		.)
+-			target_cpu_default2=TARGET_CPU_"`echo $machine | sed 's/-.*$//'`"
+-			;;
++			echo "Unknown cpu used with --with-cpu=$with_cpu" 1>&2
++			exit 1
++  			;;
++		esac
++		c_target_objs="${c_target_objs} rs6000-c.o"
++		cxx_target_objs="${cxx_target_objs} rs6000-c.o"
++		tmake_file="${tmake_file} rs6000/t-rs6000-c-rule"
++		;;
++	sparc*-*-*)
++		# $with_cpu won't be empty; a default will be set above.
++		case .$with_cpu in
+ 		.supersparc | .hypersparc | .ultrasparc | .v7 | .v8 | .v9)
+ 			target_cpu_default2="TARGET_CPU_$with_cpu"
+ 			;;
+ 		*)
+-			if test x$pass2done = xyes
+-			then
+-				echo "Unknown cpu used with --with-cpu=$with_cpu" 1>&2
+-				exit 1
+-			fi
+-			;;
+-	esac
+-	;;
+-esac
++			echo "Unknown cpu used with --with-cpu=$with_cpu" 1>&2
++			exit 1
++  			;;
++		esac
++		;;
++  	esac
++  
++	t=
++	for option in cpu arch tune schedule float
++	do
++		val=`eval 'echo $with_'$option`
++		if test -n "$val"; then
++			upper=`echo $option | tr '[a-z]' '[A-Z]'`
++			option="TARGET_DEFAULT_OPTION_$upper"
++			t="${t} -D${option}=\"\\\"${val}\\\"\""
++		fi
++	done
++	target_default_options="${t}"
+ 
+-if test "$target_cpu_default2" != ""
+-then
+-	if test "$target_cpu_default" != ""
+-	then
+-		target_cpu_default="(${target_cpu_default}|${target_cpu_default2})"
+-	else
+-		target_cpu_default=$target_cpu_default2
+-	fi
++	if test "$target_cpu_default2" != ""
++  	then
++		if test "$target_cpu_default" != ""
++		then
++			target_cpu_default="(${target_cpu_default}|${target_cpu_default2})"
++		else
++			target_cpu_default=$target_cpu_default2
++		fi
++ 	fi
+ fi
+ 
++
+ # Save data on machine being used to compile GCC in build_xm_file.
+ # Save data on host machine in vars host_xm_file and host_xmake_file.
+ if test x$pass1done = x
+diff -urN gcc-3.2.1/gcc.orig/configure gcc-3.2.1/gcc/configure
+--- gcc-3.2.1/gcc.orig/configure	2002-09-06 04:58:48.000000000 -0600
++++ gcc-3.2.1/gcc/configure	2003-01-15 02:24:34.000000000 -0700
+@@ -24,6 +24,16 @@
+ ac_help="$ac_help
+   --with-elf              arrange to use ELF instead of host debug format"
+ ac_help="$ac_help
++  --with-cpu              default to -mcpu=CPU"
++ac_help="$ac_help
++  --with-arch             default to -march=CPU"
++ac_help="$ac_help
++  --with-schedule         default to -mschedule=CPU"
++ac_help="$ac_help
++  --with-tune             default to -mtune=CPU"
++ac_help="$ac_help
++  --with-float            default to the specified type of floating point"
++ac_help="$ac_help
+   --with-local-prefix=DIR specifies directory to put local include"
+ ac_help="$ac_help
+   --with-gxx-include-dir=DIR
+@@ -109,7 +119,6 @@
+ program_transform_name=s,x,x,
+ silent=
+ site=
+-sitefile=
+ srcdir=
+ target=NONE
+ verbose=
+@@ -224,7 +233,6 @@
+   --help                  print this message
+   --no-create             do not create output files
+   --quiet, --silent       do not print \`checking...' messages
+-  --site-file=FILE        use FILE as the site file
+   --version               print the version of autoconf that created configure
+ Directory and file names:
+   --prefix=PREFIX         install architecture-independent files in PREFIX
+@@ -395,11 +403,6 @@
+   -site=* | --site=* | --sit=*)
+     site="$ac_optarg" ;;
+ 
+-  -site-file | --site-file | --site-fil | --site-fi | --site-f)
+-    ac_prev=sitefile ;;
+-  -site-file=* | --site-file=* | --site-fil=* | --site-fi=* | --site-f=*)
+-    sitefile="$ac_optarg" ;;
+-
+   -srcdir | --srcdir | --srcdi | --srcd | --src | --sr)
+     ac_prev=srcdir ;;
+   -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*)
+@@ -565,16 +568,12 @@
+ srcdir=`echo "${srcdir}" | sed 's%\([^/]\)/*$%\1%'`
+ 
+ # Prefer explicitly selected file to automatically selected ones.
+-if test -z "$sitefile"; then
+-  if test -z "$CONFIG_SITE"; then
+-    if test "x$prefix" != xNONE; then
+-      CONFIG_SITE="$prefix/share/config.site $prefix/etc/config.site"
+-    else
+-      CONFIG_SITE="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site"
+-    fi
++if test -z "$CONFIG_SITE"; then
++  if test "x$prefix" != xNONE; then
++    CONFIG_SITE="$prefix/share/config.site $prefix/etc/config.site"
++  else
++    CONFIG_SITE="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site"
+   fi
+-else
+-  CONFIG_SITE="$sitefile"
+ fi
+ for ac_site_file in $CONFIG_SITE; do
+   if test -r "$ac_site_file"; then
+@@ -629,7 +628,7 @@
+ # - two terminals occur directly after each other
+ # - the path contains an element with a dot in it
+ echo $ac_n "checking LIBRARY_PATH variable""... $ac_c" 1>&6
+-echo "configure:633: checking LIBRARY_PATH variable" >&5
++echo "configure:632: checking LIBRARY_PATH variable" >&5
+ case ${LIBRARY_PATH} in
+   [:\;]* | *[:\;] | *[:\;][:\;]* |  *[:\;]. | .[:\;]*| . | *[:\;].[:\;]* )
+     library_path_setting="contains current directory"
+@@ -654,7 +653,7 @@
+ # - two terminals occur directly after each other
+ # - the path contains an element with a dot in it
+ echo $ac_n "checking GCC_EXEC_PREFIX variable""... $ac_c" 1>&6
+-echo "configure:658: checking GCC_EXEC_PREFIX variable" >&5
++echo "configure:657: checking GCC_EXEC_PREFIX variable" >&5
+ case ${GCC_EXEC_PREFIX} in
+   [:\;]* | *[:\;] | *[:\;][:\;]* |  *[:\;]. | .[:\;]*| . | *[:\;].[:\;]* )
+     gcc_exec_prefix_setting="contains current directory"
+@@ -750,6 +749,40 @@
+ fi
+ 
+ 
++# With a particular CPU
++# Check whether --with-cpu or --without-cpu was given.
++if test "${with_cpu+set}" = set; then
++  withval="$with_cpu"
++  :
++fi
++
++# Check whether --with-arch or --without-arch was given.
++if test "${with_arch+set}" = set; then
++  withval="$with_arch"
++  :
++fi
++
++# Check whether --with-schedule or --without-schedule was given.
++if test "${with_schedule+set}" = set; then
++  withval="$with_schedule"
++  :
++fi
++
++# Check whether --with-tune or --without-tune was given.
++if test "${with_tune+set}" = set; then
++  withval="$with_tune"
++  :
++fi
++
++
++# Default floating-point setting
++# Check whether --with-float or --without-float was given.
++if test "${with_float+set}" = set; then
++  withval="$with_float"
++  :
++fi
++
++
+ # Specify the local prefix
+ local_prefix=
+ # Check whether --with-local-prefix or --without-local-prefix was given.
+@@ -1041,7 +1074,7 @@
+ fi
+ 
+ echo $ac_n "checking host system type""... $ac_c" 1>&6
+-echo "configure:1045: checking host system type" >&5
++echo "configure:1078: checking host system type" >&5
+ 
+ host_alias=$host
+ case "$host_alias" in
+@@ -1062,7 +1095,7 @@
+ echo "$ac_t""$host" 1>&6
+ 
+ echo $ac_n "checking target system type""... $ac_c" 1>&6
+-echo "configure:1066: checking target system type" >&5
++echo "configure:1099: checking target system type" >&5
+ 
+ target_alias=$target
+ case "$target_alias" in
+@@ -1080,7 +1113,7 @@
+ echo "$ac_t""$target" 1>&6
+ 
+ echo $ac_n "checking build system type""... $ac_c" 1>&6
+-echo "configure:1084: checking build system type" >&5
++echo "configure:1117: checking build system type" >&5
+ 
+ build_alias=$build
+ case "$build_alias" in
+@@ -1128,7 +1161,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:1132: checking for $ac_word" >&5
++echo "configure:1165: 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
+@@ -1158,7 +1191,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:1162: checking for $ac_word" >&5
++echo "configure:1195: 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
+@@ -1209,7 +1242,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:1213: checking for $ac_word" >&5
++echo "configure:1246: 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
+@@ -1241,7 +1274,7 @@
+ fi
+ 
+ echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6
+-echo "configure:1245: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
++echo "configure:1278: 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.
+@@ -1252,12 +1285,12 @@
+ 
+ cat > conftest.$ac_ext << EOF
+ 
+-#line 1256 "configure"
++#line 1289 "configure"
+ #include "confdefs.h"
+ 
+ main(){return(0);}
+ EOF
+-if { (eval echo configure:1261: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:1294: \"$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
+@@ -1283,12 +1316,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:1287: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
++echo "configure:1320: 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:1292: checking whether we are using GNU C" >&5
++echo "configure:1325: 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
+@@ -1297,7 +1330,7 @@
+   yes;
+ #endif
+ EOF
+-if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1301: \"$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:1334: \"$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
+@@ -1316,7 +1349,7 @@
+ ac_save_CFLAGS="$CFLAGS"
+ CFLAGS=
+ echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
+-echo "configure:1320: checking whether ${CC-cc} accepts -g" >&5
++echo "configure:1353: 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
+@@ -1349,10 +1382,10 @@
+ 
+ if test "x$CC" != xcc; then
+   echo $ac_n "checking whether $CC and cc understand -c and -o together""... $ac_c" 1>&6
+-echo "configure:1353: checking whether $CC and cc understand -c and -o together" >&5
++echo "configure:1386: checking whether $CC and cc understand -c and -o together" >&5
+ else
+   echo $ac_n "checking whether cc understands -c and -o together""... $ac_c" 1>&6
+-echo "configure:1356: checking whether cc understands -c and -o together" >&5
++echo "configure:1389: checking whether cc understands -c and -o together" >&5
+ fi
+ set dummy $CC; ac_cc="`echo $2 |
+ 		       sed -e 's/[^a-zA-Z0-9_]/_/g' -e 's/^[0-9]/_/'`"
+@@ -1364,16 +1397,16 @@
+ # We do the test twice because some compilers refuse to overwrite an
+ # existing .o file with -o, though they will create one.
+ ac_try='${CC-cc} -c conftest.c -o conftest.o 1>&5'
+-if { (eval echo configure:1368: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } &&
+-   test -f conftest.o && { (eval echo configure:1369: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; };
++if { (eval echo configure:1401: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } &&
++   test -f conftest.o && { (eval echo configure:1402: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; };
+ then
+   eval ac_cv_prog_cc_${ac_cc}_c_o=yes
+   if test "x$CC" != xcc; then
+     # Test first that cc exists at all.
+-    if { ac_try='cc -c conftest.c 1>&5'; { (eval echo configure:1374: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; }; then
++    if { ac_try='cc -c conftest.c 1>&5'; { (eval echo configure:1407: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; }; then
+       ac_try='cc -c conftest.c -o conftest.o 1>&5'
+-      if { (eval echo configure:1376: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } &&
+-	 test -f conftest.o && { (eval echo configure:1377: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; };
++      if { (eval echo configure:1409: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } &&
++	 test -f conftest.o && { (eval echo configure:1410: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; };
+       then
+         # cc works too.
+         :
+@@ -1419,7 +1452,7 @@
+ # Extract the first word of "${ac_tool_prefix}gnatbind", so it can be a program name with args.
+ set dummy ${ac_tool_prefix}gnatbind; ac_word=$2
+ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:1423: checking for $ac_word" >&5
++echo "configure:1456: checking for $ac_word" >&5
+ if eval "test \"`echo '$''{'ac_cv_prog_GNATBIND'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -1451,7 +1484,7 @@
+   # Extract the first word of "gnatbind", so it can be a program name with args.
+ set dummy gnatbind; ac_word=$2
+ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:1455: checking for $ac_word" >&5
++echo "configure:1488: checking for $ac_word" >&5
+ if eval "test \"`echo '$''{'ac_cv_prog_GNATBIND'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -1484,7 +1517,7 @@
+ fi
+ 
+ echo $ac_n "checking for compiler driver that understands Ada""... $ac_c" 1>&6
+-echo "configure:1488: checking for compiler driver that understands Ada" >&5
++echo "configure:1521: checking for compiler driver that understands Ada" >&5
+ if eval "test \"`echo '$''{'gcc_cv_prog_adac'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -1529,21 +1562,21 @@
+ 
+ 
+ echo $ac_n "checking whether ${CC-cc} accepts -Wno-long-long""... $ac_c" 1>&6
+-echo "configure:1533: checking whether ${CC-cc} accepts -Wno-long-long" >&5
++echo "configure:1566: checking whether ${CC-cc} accepts -Wno-long-long" >&5
+ if eval "test \"`echo '$''{'ac_cv_prog_cc_no_long_long'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   save_CFLAGS="$CFLAGS"
+ CFLAGS="-Wno-long-long"
+ cat > conftest.$ac_ext <<EOF
+-#line 1540 "configure"
++#line 1573 "configure"
+ #include "confdefs.h"
+ 
+ int main() {
+ 
+ ; return 0; }
+ EOF
+-if { (eval echo configure:1547: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:1580: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+   rm -rf conftest*
+   ac_cv_prog_cc_no_long_long=yes
+ else
+@@ -1560,7 +1593,7 @@
+ 
+ if test x$have_gnat != xno ; then 
+ echo $ac_n "checking whether ${ADAC} accepts -Wno-long-long""... $ac_c" 1>&6
+-echo "configure:1564: checking whether ${ADAC} accepts -Wno-long-long" >&5
++echo "configure:1597: checking whether ${ADAC} accepts -Wno-long-long" >&5
+ if eval "test \"`echo '$''{'ac_cv_prog_adac_no_long_long'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -1588,7 +1621,7 @@
+ 
+ 
+ echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6
+-echo "configure:1592: checking how to run the C preprocessor" >&5
++echo "configure:1625: checking how to run the C preprocessor" >&5
+ # On Suns, sometimes $CPP names a directory.
+ if test -n "$CPP" && test -d "$CPP"; then
+   CPP=
+@@ -1603,13 +1636,13 @@
+   # On the NeXT, cc -E runs the code through the compiler's parser,
+   # not just through cpp.
+   cat > conftest.$ac_ext <<EOF
+-#line 1607 "configure"
++#line 1640 "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:1613: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:1646: \"$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
+   :
+@@ -1620,13 +1653,13 @@
+   rm -rf conftest*
+   CPP="${CC-cc} -E -traditional-cpp"
+   cat > conftest.$ac_ext <<EOF
+-#line 1624 "configure"
++#line 1657 "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:1630: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:1663: \"$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
+   :
+@@ -1637,13 +1670,13 @@
+   rm -rf conftest*
+   CPP="${CC-cc} -nologo -E"
+   cat > conftest.$ac_ext <<EOF
+-#line 1641 "configure"
++#line 1674 "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:1647: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:1680: \"$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
+   :
+@@ -1668,21 +1701,21 @@
+ echo "$ac_t""$CPP" 1>&6
+ 
+ echo $ac_n "checking for inline""... $ac_c" 1>&6
+-echo "configure:1672: checking for inline" >&5
++echo "configure:1705: checking for inline" >&5
+ if eval "test \"`echo '$''{'ac_cv_c_inline'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   ac_cv_c_inline=no
+ for ac_kw in inline __inline__ __inline; do
+   cat > conftest.$ac_ext <<EOF
+-#line 1679 "configure"
++#line 1712 "configure"
+ #include "confdefs.h"
+ 
+ int main() {
+ } $ac_kw foo() {
+ ; return 0; }
+ EOF
+-if { (eval echo configure:1686: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:1719: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+   rm -rf conftest*
+   ac_cv_c_inline=$ac_kw; break
+ else
+@@ -1708,19 +1741,19 @@
+ esac
+ 
+ echo $ac_n "checking for volatile""... $ac_c" 1>&6
+-echo "configure:1712: checking for volatile" >&5
++echo "configure:1745: checking for volatile" >&5
+ if eval "test \"`echo '$''{'gcc_cv_c_volatile'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 1717 "configure"
++#line 1750 "configure"
+ #include "confdefs.h"
+ 
+ int main() {
+ volatile int foo;
+ ; return 0; }
+ EOF
+-if { (eval echo configure:1724: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:1757: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+   rm -rf conftest*
+   gcc_cv_c_volatile=yes
+ else
+@@ -1742,7 +1775,7 @@
+ 
+ 
+ echo $ac_n "checking for long double""... $ac_c" 1>&6
+-echo "configure:1746: checking for long double" >&5
++echo "configure:1779: checking for long double" >&5
+ if eval "test \"`echo '$''{'gcc_cv_c_long_double'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -1750,7 +1783,7 @@
+   gcc_cv_c_long_double=yes
+ else
+ cat > conftest.$ac_ext <<EOF
+-#line 1754 "configure"
++#line 1787 "configure"
+ #include "confdefs.h"
+ 
+ int main() {
+@@ -1760,7 +1793,7 @@
+ switch (0) case 0: case (sizeof(long double) >= sizeof(double)):;
+ ; return 0; }
+ EOF
+-if { (eval echo configure:1764: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:1797: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+   rm -rf conftest*
+   gcc_cv_c_long_double=yes
+ else
+@@ -1782,19 +1815,19 @@
+ fi
+ 
+ echo $ac_n "checking for long long int""... $ac_c" 1>&6
+-echo "configure:1786: checking for long long int" >&5
++echo "configure:1819: checking for long long int" >&5
+ if eval "test \"`echo '$''{'ac_cv_c_long_long'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 1791 "configure"
++#line 1824 "configure"
+ #include "confdefs.h"
+ 
+ int main() {
+ long long int i;
+ ; return 0; }
+ EOF
+-if { (eval echo configure:1798: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:1831: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+   rm -rf conftest*
+   ac_cv_c_long_long=yes
+ else
+@@ -1814,19 +1847,19 @@
+ 
+   fi
+ echo $ac_n "checking for __int64""... $ac_c" 1>&6
+-echo "configure:1818: checking for __int64" >&5
++echo "configure:1851: checking for __int64" >&5
+ if eval "test \"`echo '$''{'ac_cv_c___int64'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 1823 "configure"
++#line 1856 "configure"
+ #include "confdefs.h"
+ 
+ int main() {
+ __int64 i;
+ ; return 0; }
+ EOF
+-if { (eval echo configure:1830: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:1863: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+   rm -rf conftest*
+   ac_cv_c___int64=yes
+ else
+@@ -1847,19 +1880,19 @@
+   fi
+ 
+ echo $ac_n "checking for built-in _Bool""... $ac_c" 1>&6
+-echo "configure:1851: checking for built-in _Bool" >&5
++echo "configure:1884: checking for built-in _Bool" >&5
+ if eval "test \"`echo '$''{'gcc_cv_c__bool'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 1856 "configure"
++#line 1889 "configure"
+ #include "confdefs.h"
+ 
+ int main() {
+ _Bool foo;
+ ; return 0; }
+ EOF
+-if { (eval echo configure:1863: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:1896: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+   rm -rf conftest*
+   gcc_cv_c__bool=yes
+ else
+@@ -1883,13 +1916,13 @@
+ 
+ # sizeof(char) is 1 by definition.
+ echo $ac_n "checking size of short""... $ac_c" 1>&6
+-echo "configure:1887: checking size of short" >&5
++echo "configure:1920: 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
+   for ac_size in 4 8 1 2 16  ; do # List sizes in rough order of prevalence.
+   cat > conftest.$ac_ext <<EOF
+-#line 1893 "configure"
++#line 1926 "configure"
+ #include "confdefs.h"
+ #include "confdefs.h"
+ #include <sys/types.h>
+@@ -1899,7 +1932,7 @@
+ switch (0) case 0: case (sizeof (short) == $ac_size):;
+ ; return 0; }
+ EOF
+-if { (eval echo configure:1903: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:1936: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+   rm -rf conftest*
+   ac_cv_sizeof_short=$ac_size
+ else
+@@ -1922,13 +1955,13 @@
+ 
+ 
+ echo $ac_n "checking size of int""... $ac_c" 1>&6
+-echo "configure:1926: checking size of int" >&5
++echo "configure:1959: 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
+   for ac_size in 4 8 1 2 16  ; do # List sizes in rough order of prevalence.
+   cat > conftest.$ac_ext <<EOF
+-#line 1932 "configure"
++#line 1965 "configure"
+ #include "confdefs.h"
+ #include "confdefs.h"
+ #include <sys/types.h>
+@@ -1938,7 +1971,7 @@
+ switch (0) case 0: case (sizeof (int) == $ac_size):;
+ ; return 0; }
+ EOF
+-if { (eval echo configure:1942: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:1975: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+   rm -rf conftest*
+   ac_cv_sizeof_int=$ac_size
+ else
+@@ -1961,13 +1994,13 @@
+ 
+ 
+ echo $ac_n "checking size of long""... $ac_c" 1>&6
+-echo "configure:1965: checking size of long" >&5
++echo "configure:1998: 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
+   for ac_size in 4 8 1 2 16  ; do # List sizes in rough order of prevalence.
+   cat > conftest.$ac_ext <<EOF
+-#line 1971 "configure"
++#line 2004 "configure"
+ #include "confdefs.h"
+ #include "confdefs.h"
+ #include <sys/types.h>
+@@ -1977,7 +2010,7 @@
+ switch (0) case 0: case (sizeof (long) == $ac_size):;
+ ; return 0; }
+ EOF
+-if { (eval echo configure:1981: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:2014: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+   rm -rf conftest*
+   ac_cv_sizeof_long=$ac_size
+ else
+@@ -2001,13 +2034,13 @@
+ 
+ if test $ac_cv_c_long_long = yes; then
+   echo $ac_n "checking size of long long""... $ac_c" 1>&6
+-echo "configure:2005: checking size of long long" >&5
++echo "configure:2038: 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
+   for ac_size in 4 8 1 2 16  ; do # List sizes in rough order of prevalence.
+   cat > conftest.$ac_ext <<EOF
+-#line 2011 "configure"
++#line 2044 "configure"
+ #include "confdefs.h"
+ #include "confdefs.h"
+ #include <sys/types.h>
+@@ -2017,7 +2050,7 @@
+ switch (0) case 0: case (sizeof (long long) == $ac_size):;
+ ; return 0; }
+ EOF
+-if { (eval echo configure:2021: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:2054: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+   rm -rf conftest*
+   ac_cv_sizeof_long_long=$ac_size
+ else
+@@ -2042,13 +2075,13 @@
+ fi
+ if test $ac_cv_c___int64 = yes; then
+   echo $ac_n "checking size of __int64""... $ac_c" 1>&6
+-echo "configure:2046: checking size of __int64" >&5
++echo "configure:2079: checking size of __int64" >&5
+ if eval "test \"`echo '$''{'ac_cv_sizeof___int64'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   for ac_size in 4 8 1 2 16  ; do # List sizes in rough order of prevalence.
+   cat > conftest.$ac_ext <<EOF
+-#line 2052 "configure"
++#line 2085 "configure"
+ #include "confdefs.h"
+ #include "confdefs.h"
+ #include <sys/types.h>
+@@ -2058,7 +2091,7 @@
+ switch (0) case 0: case (sizeof (__int64) == $ac_size):;
+ ; return 0; }
+ EOF
+-if { (eval echo configure:2062: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:2095: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+   rm -rf conftest*
+   ac_cv_sizeof___int64=$ac_size
+ else
+@@ -2083,12 +2116,12 @@
+ fi
+ 
+ echo $ac_n "checking execution character set""... $ac_c" 1>&6
+-echo "configure:2087: checking execution character set" >&5
++echo "configure:2120: checking execution character set" >&5
+ if eval "test \"`echo '$''{'ac_cv_c_charset'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 2092 "configure"
++#line 2125 "configure"
+ #include "confdefs.h"
+ #if '\n' == 0x0A && ' ' == 0x20 && '0' == 0x30 \
+    && 'A' == 0x41 && 'a' == 0x61 && '!' == 0x21
+@@ -2104,7 +2137,7 @@
+ 
+   if test x${ac_cv_c_charset+set} != xset; then
+     cat > conftest.$ac_ext <<EOF
+-#line 2108 "configure"
++#line 2141 "configure"
+ #include "confdefs.h"
+ #if '\n' == 0x15 && ' ' == 0x40 && '0' == 0xF0 \
+    && 'A' == 0xC1 && 'a' == 0x81 && '!' == 0x5A
+@@ -2165,7 +2198,7 @@
+ 
+ 
+ echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6
+-echo "configure:2169: checking whether ${MAKE-make} sets \${MAKE}" >&5
++echo "configure:2202: checking whether ${MAKE-make} sets \${MAKE}" >&5
+ set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+@@ -2193,7 +2226,7 @@
+ 
+ 
+ echo $ac_n "checking whether a default assembler was specified""... $ac_c" 1>&6
+-echo "configure:2197: checking whether a default assembler was specified" >&5
++echo "configure:2230: checking whether a default assembler was specified" >&5
+ if test x"${DEFAULT_ASSEMBLER+set}" = x"set"; then
+     if test x"$gas_flag" = x"no"; then
+     	echo "$ac_t""yes ($DEFAULT_ASSEMBLER)" 1>&6
+@@ -2205,7 +2238,7 @@
+ fi
+ 
+ echo $ac_n "checking whether a default linker was specified""... $ac_c" 1>&6
+-echo "configure:2209: checking whether a default linker was specified" >&5
++echo "configure:2242: checking whether a default linker was specified" >&5
+ if test x"${DEFAULT_LINKER+set}" = x"set"; then
+     if test x"$gnu_ld_flag" = x"no"; then
+ 	echo "$ac_t""yes ($DEFAULT_LINKER)" 1>&6
+@@ -2217,12 +2250,12 @@
+ fi
+ 
+ echo $ac_n "checking for GNU C library""... $ac_c" 1>&6
+-echo "configure:2221: checking for GNU C library" >&5
++echo "configure:2254: checking for GNU C library" >&5
+ if eval "test \"`echo '$''{'gcc_cv_glibc'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 2226 "configure"
++#line 2259 "configure"
+ #include "confdefs.h"
+ #include <features.h>
+ int main() {
+@@ -2232,7 +2265,7 @@
+ #endif
+ ; return 0; }
+ EOF
+-if { (eval echo configure:2236: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:2269: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+   rm -rf conftest*
+   gcc_cv_glibc=yes
+ else
+@@ -2258,7 +2291,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:2262: checking for $ac_word" >&5
++echo "configure:2295: checking for $ac_word" >&5
+ if eval "test \"`echo '$''{'ac_cv_prog_AWK'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -2288,7 +2321,7 @@
+ done
+ 
+ echo $ac_n "checking whether ln works""... $ac_c" 1>&6
+-echo "configure:2292: checking whether ln works" >&5
++echo "configure:2325: checking whether ln works" >&5
+ if eval "test \"`echo '$''{'gcc_cv_prog_LN'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -2320,7 +2353,7 @@
+ fi
+ 
+ echo $ac_n "checking whether ln -s works""... $ac_c" 1>&6
+-echo "configure:2324: checking whether ln -s works" >&5
++echo "configure:2357: checking whether ln -s works" >&5
+ if eval "test \"`echo '$''{'gcc_cv_prog_LN_S'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -2354,7 +2387,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:2358: checking for $ac_word" >&5
++echo "configure:2391: 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
+@@ -2392,7 +2425,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:2396: checking for a BSD compatible install" >&5
++echo "configure:2429: 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
+@@ -2443,12 +2476,12 @@
+ 
+ 
+ echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6
+-echo "configure:2447: checking for ANSI C header files" >&5
++echo "configure:2480: 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 2452 "configure"
++#line 2485 "configure"
+ #include "confdefs.h"
+ #include <stdlib.h>
+ #include <stdarg.h>
+@@ -2456,7 +2489,7 @@
+ #include <float.h>
+ EOF
+ ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+-{ (eval echo configure:2460: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:2493: \"$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*
+@@ -2473,7 +2506,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 2477 "configure"
++#line 2510 "configure"
+ #include "confdefs.h"
+ #include <string.h>
+ EOF
+@@ -2491,7 +2524,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 2495 "configure"
++#line 2528 "configure"
+ #include "confdefs.h"
+ #include <stdlib.h>
+ EOF
+@@ -2512,7 +2545,7 @@
+   :
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 2516 "configure"
++#line 2549 "configure"
+ #include "confdefs.h"
+ #include <ctype.h>
+ #define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
+@@ -2523,7 +2556,7 @@
+ exit (0); }
+ 
+ EOF
+-if { (eval echo configure:2527: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:2560: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+ then
+   :
+ else
+@@ -2547,12 +2580,12 @@
+ fi
+ 
+ echo $ac_n "checking whether time.h and sys/time.h may both be included""... $ac_c" 1>&6
+-echo "configure:2551: checking whether time.h and sys/time.h may both be included" >&5
++echo "configure:2584: 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 2556 "configure"
++#line 2589 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ #include <sys/time.h>
+@@ -2561,7 +2594,7 @@
+ struct tm *tp;
+ ; return 0; }
+ EOF
+-if { (eval echo configure:2565: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:2598: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+   rm -rf conftest*
+   ac_cv_header_time=yes
+ else
+@@ -2582,19 +2615,19 @@
+ fi
+ 
+ echo $ac_n "checking for working stdbool.h""... $ac_c" 1>&6
+-echo "configure:2586: checking for working stdbool.h" >&5
++echo "configure:2619: checking for working stdbool.h" >&5
+ if eval "test \"`echo '$''{'ac_cv_header_stdbool_h'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 2591 "configure"
++#line 2624 "configure"
+ #include "confdefs.h"
+ #include <stdbool.h>
+ int main() {
+ bool foo = false;
+ ; return 0; }
+ EOF
+-if { (eval echo configure:2598: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:2631: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+   rm -rf conftest*
+   ac_cv_header_stdbool_h=yes
+ else
+@@ -2615,12 +2648,12 @@
+ fi
+ 
+ echo $ac_n "checking whether string.h and strings.h may both be included""... $ac_c" 1>&6
+-echo "configure:2619: checking whether string.h and strings.h may both be included" >&5
++echo "configure:2652: checking whether string.h and strings.h may both be included" >&5
+ if eval "test \"`echo '$''{'gcc_cv_header_string'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 2624 "configure"
++#line 2657 "configure"
+ #include "confdefs.h"
+ #include <string.h>
+ #include <strings.h>
+@@ -2628,7 +2661,7 @@
+ 
+ ; return 0; }
+ EOF
+-if { (eval echo configure:2632: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:2665: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+   rm -rf conftest*
+   gcc_cv_header_string=yes
+ else
+@@ -2649,12 +2682,12 @@
+ fi
+ 
+ echo $ac_n "checking for sys/wait.h that is POSIX.1 compatible""... $ac_c" 1>&6
+-echo "configure:2653: checking for sys/wait.h that is POSIX.1 compatible" >&5
++echo "configure:2686: checking for sys/wait.h that is POSIX.1 compatible" >&5
+ if eval "test \"`echo '$''{'ac_cv_header_sys_wait_h'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 2658 "configure"
++#line 2691 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ #include <sys/wait.h>
+@@ -2670,7 +2703,7 @@
+ s = WIFEXITED (s) ? WEXITSTATUS (s) : 1;
+ ; return 0; }
+ EOF
+-if { (eval echo configure:2674: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:2707: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+   rm -rf conftest*
+   ac_cv_header_sys_wait_h=yes
+ else
+@@ -2697,17 +2730,17 @@
+ do
+ ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
+ echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
+-echo "configure:2701: checking for $ac_hdr" >&5
++echo "configure:2734: 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 2706 "configure"
++#line 2739 "configure"
+ #include "confdefs.h"
+ #include <$ac_hdr>
+ EOF
+ ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+-{ (eval echo configure:2711: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:2744: \"$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*
+@@ -2737,17 +2770,17 @@
+ # Check for thread headers.
+ ac_safe=`echo "thread.h" | sed 'y%./+-%__p_%'`
+ echo $ac_n "checking for thread.h""... $ac_c" 1>&6
+-echo "configure:2741: checking for thread.h" >&5
++echo "configure:2774: checking for thread.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 2746 "configure"
++#line 2779 "configure"
+ #include "confdefs.h"
+ #include <thread.h>
+ EOF
+ ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+-{ (eval echo configure:2751: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:2784: \"$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*
+@@ -2771,17 +2804,17 @@
+ 
+ ac_safe=`echo "pthread.h" | sed 'y%./+-%__p_%'`
+ echo $ac_n "checking for pthread.h""... $ac_c" 1>&6
+-echo "configure:2775: checking for pthread.h" >&5
++echo "configure:2808: checking for pthread.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 2780 "configure"
++#line 2813 "configure"
+ #include "confdefs.h"
+ #include <pthread.h>
+ EOF
+ ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+-{ (eval echo configure:2785: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:2818: \"$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*
+@@ -2806,12 +2839,12 @@
+ 
+ # These tests can't be done till we know if we have limits.h.
+ echo $ac_n "checking for CHAR_BIT""... $ac_c" 1>&6
+-echo "configure:2810: checking for CHAR_BIT" >&5
++echo "configure:2843: checking for CHAR_BIT" >&5
+ if eval "test \"`echo '$''{'gcc_cv_decl_char_bit'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 2815 "configure"
++#line 2848 "configure"
+ #include "confdefs.h"
+ #ifdef HAVE_LIMITS_H
+ #include <limits.h>
+@@ -2836,7 +2869,7 @@
+ echo "$ac_t""$gcc_cv_decl_char_bit" 1>&6
+ if test $gcc_cv_decl_char_bit = no; then
+   echo $ac_n "checking number of bits in a byte""... $ac_c" 1>&6
+-echo "configure:2840: checking number of bits in a byte" >&5
++echo "configure:2873: checking number of bits in a byte" >&5
+ if eval "test \"`echo '$''{'gcc_cv_c_nbby'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -2844,7 +2877,7 @@
+  gcc_cv_c_nbby=
+  while test $i -lt 65; do
+    cat > conftest.$ac_ext <<EOF
+-#line 2848 "configure"
++#line 2881 "configure"
+ #include "confdefs.h"
+ 
+ int main() {
+@@ -2854,7 +2887,7 @@
+   ; }
+ ; return 0; }
+ EOF
+-if { (eval echo configure:2858: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:2891: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+   rm -rf conftest*
+   gcc_cv_c_nbby=$i; break
+ else
+@@ -2879,7 +2912,7 @@
+ fi
+ fi
+ echo $ac_n "checking byte ordering""... $ac_c" 1>&6
+-echo "configure:2883: checking byte ordering" >&5
++echo "configure:2916: checking byte ordering" >&5
+ if eval "test \"`echo '$''{'ac_cv_c_compile_endian'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -2893,7 +2926,7 @@
+ cross_compiling=$ac_cv_prog_cc_cross
+ 
+ cat > conftest.$ac_ext <<EOF
+-#line 2897 "configure"
++#line 2930 "configure"
+ #include "confdefs.h"
+ 
+ #ifdef HAVE_LIMITS_H
+@@ -2913,7 +2946,7 @@
+     'X', '\n'
+ };
+ EOF
+-if { (eval echo configure:2917: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:2950: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+   od -c conftest.o |
+     sed 's/^[0-7]*[ 	]*/ /
+ 	  s/\*/./g
+@@ -2952,7 +2985,7 @@
+ fi
+ 
+ echo $ac_n "checking floating point format""... $ac_c" 1>&6
+-echo "configure:2956: checking floating point format" >&5
++echo "configure:2989: checking floating point format" >&5
+ if eval "test \"`echo '$''{'ac_cv_c_float_format'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -2965,7 +2998,7 @@
+ cross_compiling=$ac_cv_prog_cc_cross
+ 
+ cat > conftest.$ac_ext <<EOF
+-#line 2969 "configure"
++#line 3002 "configure"
+ #include "confdefs.h"
+ /* This will not work unless sizeof(double) == 8.  */
+ extern char sizeof_double_must_be_8 [sizeof(double) == 8 ? 1 : -1];
+@@ -2987,7 +3020,7 @@
+   C(-5.22995989424860458374e+10)  /* IBMHEXFP - s/390 format, EBCDIC */
+ };
+ EOF
+-if { (eval echo configure:2991: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:3024: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+   od -c conftest.o |
+     sed 's/^[0-7]*[ 	]*/ /
+ 	  s/\*/./g
+@@ -3076,7 +3109,7 @@
+ # Extract the first word of "mktemp", so it can be a program name with args.
+ set dummy mktemp; ac_word=$2
+ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:3080: checking for $ac_word" >&5
++echo "configure:3113: checking for $ac_word" >&5
+ if eval "test \"`echo '$''{'ac_cv_prog_have_mktemp_command'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -3115,7 +3148,7 @@
+   # Extract the first word of "makeinfo", so it can be a program name with args.
+ set dummy makeinfo; ac_word=$2
+ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:3119: checking for $ac_word" >&5
++echo "configure:3152: checking for $ac_word" >&5
+ if eval "test \"`echo '$''{'ac_cv_prog_MAKEINFO'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -3144,13 +3177,13 @@
+ if test -n "$MAKEINFO"; then
+   # Found it, now check the version.
+   echo $ac_n "checking for modern makeinfo""... $ac_c" 1>&6
+-echo "configure:3148: checking for modern makeinfo" >&5
++echo "configure:3181: checking for modern makeinfo" >&5
+ if eval "test \"`echo '$''{'gcc_cv_prog_makeinfo_modern'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+     ac_prog_version=`$MAKEINFO --version 2>&1 |
+                    sed -n 's/^.*GNU texinfo.* \([0-9][0-9.]*\).*$/\1/p'`
+-  echo "configure:3154: version of makeinfo is $ac_prog_version" >&5
++  echo "configure:3187: version of makeinfo is $ac_prog_version" >&5
+   case $ac_prog_version in
+     '')     gcc_cv_prog_makeinfo_modern=no;;
+     4.[1-9]*)
+@@ -3178,7 +3211,7 @@
+ 
+ # Is pod2man recent enough to regenerate manpages?
+ echo $ac_n "checking for recent Pod::Man""... $ac_c" 1>&6
+-echo "configure:3182: checking for recent Pod::Man" >&5
++echo "configure:3215: checking for recent Pod::Man" >&5
+ if (perl -e 'use 1.10 Pod::Man') >/dev/null 2>&1; then
+   echo "$ac_t""yes" 1>&6
+   GENERATED_MANPAGES=generated-manpages		
+@@ -3194,7 +3227,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:3198: checking for $ac_word" >&5
++echo "configure:3231: checking for $ac_word" >&5
+ if eval "test \"`echo '$''{'ac_cv_prog_FLEX'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -3231,7 +3264,7 @@
+   # Extract the first word of "bison", so it can be a program name with args.
+ set dummy bison; ac_word=$2
+ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:3235: checking for $ac_word" >&5
++echo "configure:3268: checking for $ac_word" >&5
+ if eval "test \"`echo '$''{'ac_cv_prog_BISON'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -3263,7 +3296,7 @@
+ # These libraries may be used by collect2.
+ # We may need a special search path to get them linked.
+ echo $ac_n "checking for collect2 libraries""... $ac_c" 1>&6
+-echo "configure:3267: checking for collect2 libraries" >&5
++echo "configure:3300: checking for collect2 libraries" >&5
+ if eval "test \"`echo '$''{'gcc_cv_collect2_libs'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -3274,7 +3307,7 @@
+ do
+ 	LIBS="$libs"
+ 	cat > conftest.$ac_ext <<EOF
+-#line 3278 "configure"
++#line 3311 "configure"
+ #include "confdefs.h"
+ /* Override any gcc2 internal prototype to avoid an error.  */
+ /* We use char because int might match the return type of a gcc2
+@@ -3285,7 +3318,7 @@
+ ldopen()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:3289: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:3322: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   gcc_cv_collect2_libs="$libs"; break
+ else
+@@ -3311,14 +3344,14 @@
+ LIBS=
+ 
+ echo $ac_n "checking for library containing exc_resume""... $ac_c" 1>&6
+-echo "configure:3315: checking for library containing exc_resume" >&5
++echo "configure:3348: checking for library containing exc_resume" >&5
+ if eval "test \"`echo '$''{'ac_cv_search_exc_resume'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   ac_func_search_save_LIBS="$LIBS"
+ ac_cv_search_exc_resume="no"
+ cat > conftest.$ac_ext <<EOF
+-#line 3322 "configure"
++#line 3355 "configure"
+ #include "confdefs.h"
+ /* Override any gcc2 internal prototype to avoid an error.  */
+ /* We use char because int might match the return type of a gcc2
+@@ -3329,7 +3362,7 @@
+ exc_resume()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:3333: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:3366: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   ac_cv_search_exc_resume="none required"
+ else
+@@ -3340,7 +3373,7 @@
+ test "$ac_cv_search_exc_resume" = "no" && for i in exc; do
+ LIBS="-l$i  $ac_func_search_save_LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 3344 "configure"
++#line 3377 "configure"
+ #include "confdefs.h"
+ /* Override any gcc2 internal prototype to avoid an error.  */
+ /* We use char because int might match the return type of a gcc2
+@@ -3351,7 +3384,7 @@
+ exc_resume()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:3355: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:3388: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   ac_cv_search_exc_resume="-l$i"
+ break
+@@ -3380,12 +3413,12 @@
+ 
+ 
+ echo $ac_n "checking for preprocessor stringizing operator""... $ac_c" 1>&6
+-echo "configure:3384: checking for preprocessor stringizing operator" >&5
++echo "configure:3417: checking for preprocessor stringizing operator" >&5
+ if eval "test \"`echo '$''{'ac_cv_c_stringize'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 3389 "configure"
++#line 3422 "configure"
+ #include "confdefs.h"
+ 
+ #define x(y) #y
+@@ -3418,12 +3451,12 @@
+ # Use <inttypes.h> only if it exists,
+ # doesn't clash with <sys/types.h>, and declares intmax_t.
+ echo $ac_n "checking for inttypes.h""... $ac_c" 1>&6
+-echo "configure:3422: checking for inttypes.h" >&5
++echo "configure:3455: checking for inttypes.h" >&5
+ if eval "test \"`echo '$''{'gcc_cv_header_inttypes_h'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 3427 "configure"
++#line 3460 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ #include <inttypes.h>
+@@ -3431,7 +3464,7 @@
+ intmax_t i = -1;
+ ; return 0; }
+ EOF
+-if { (eval echo configure:3435: \"$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*
+   gcc_cv_header_inttypes_h=yes
+ else
+@@ -3457,12 +3490,12 @@
+ 	fwrite_unlocked fprintf_unlocked getrusage nl_langinfo lstat
+ do
+ echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
+-echo "configure:3461: checking for $ac_func" >&5
++echo "configure:3494: 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 3466 "configure"
++#line 3499 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char $ac_func(); below.  */
+@@ -3485,7 +3518,7 @@
+ 
+ ; return 0; }
+ EOF
+-if { (eval echo configure:3489: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:3522: \"$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
+@@ -3511,12 +3544,12 @@
+ 
+ 
+ echo $ac_n "checking for ssize_t""... $ac_c" 1>&6
+-echo "configure:3515: checking for ssize_t" >&5
++echo "configure:3548: checking for ssize_t" >&5
+ if eval "test \"`echo '$''{'ac_cv_type_ssize_t'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 3520 "configure"
++#line 3553 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ #if STDC_HEADERS
+@@ -3547,12 +3580,12 @@
+ # Try to determine the array type of the second argument of getgroups
+ # for the target system (int or gid_t).
+ echo $ac_n "checking for uid_t in sys/types.h""... $ac_c" 1>&6
+-echo "configure:3551: checking for uid_t in sys/types.h" >&5
++echo "configure:3584: checking for uid_t in sys/types.h" >&5
+ if eval "test \"`echo '$''{'ac_cv_type_uid_t'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 3556 "configure"
++#line 3589 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ EOF
+@@ -3581,7 +3614,7 @@
+ fi
+ 
+ echo $ac_n "checking type of array argument to getgroups""... $ac_c" 1>&6
+-echo "configure:3585: checking type of array argument to getgroups" >&5
++echo "configure:3618: checking type of array argument to getgroups" >&5
+ if eval "test \"`echo '$''{'ac_cv_type_getgroups'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -3589,7 +3622,7 @@
+   ac_cv_type_getgroups=cross
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 3593 "configure"
++#line 3626 "configure"
+ #include "confdefs.h"
+ 
+ /* Thanks to Mike Rendell for this test.  */
+@@ -3614,7 +3647,7 @@
+ }
+ 
+ EOF
+-if { (eval echo configure:3618: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:3651: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+ then
+     ac_cv_type_getgroups=gid_t
+ else
+@@ -3628,7 +3661,7 @@
+ 
+ if test $ac_cv_type_getgroups = cross; then
+         cat > conftest.$ac_ext <<EOF
+-#line 3632 "configure"
++#line 3665 "configure"
+ #include "confdefs.h"
+ #include <unistd.h>
+ EOF
+@@ -3669,7 +3702,7 @@
+ 
+ 
+ echo $ac_n "checking whether the printf functions support %p""... $ac_c" 1>&6
+-echo "configure:3673: checking whether the printf functions support %p" >&5
++echo "configure:3706: checking whether the printf functions support %p" >&5
+ if eval "test \"`echo '$''{'gcc_cv_func_printf_ptr'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -3677,7 +3710,7 @@
+   gcc_cv_func_printf_ptr=no
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 3681 "configure"
++#line 3714 "configure"
+ #include "confdefs.h"
+ #include <stdio.h>
+ 
+@@ -3690,7 +3723,7 @@
+   return (p != q);
+ }
+ EOF
+-if { (eval echo configure:3694: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:3727: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+ then
+   gcc_cv_func_printf_ptr=yes
+ else
+@@ -3728,12 +3761,12 @@
+   ;;
+ esac
+ echo $ac_n "checking for pid_t""... $ac_c" 1>&6
+-echo "configure:3732: checking for pid_t" >&5
++echo "configure:3765: checking for pid_t" >&5
+ if eval "test \"`echo '$''{'ac_cv_type_pid_t'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 3737 "configure"
++#line 3770 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ #if STDC_HEADERS
+@@ -3762,17 +3795,17 @@
+ 
+ ac_safe=`echo "vfork.h" | sed 'y%./+-%__p_%'`
+ echo $ac_n "checking for vfork.h""... $ac_c" 1>&6
+-echo "configure:3766: checking for vfork.h" >&5
++echo "configure:3799: checking for vfork.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 3771 "configure"
++#line 3804 "configure"
+ #include "confdefs.h"
+ #include <vfork.h>
+ EOF
+ ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+-{ (eval echo configure:3776: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:3809: \"$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*
+@@ -3797,18 +3830,18 @@
+ fi
+ 
+ echo $ac_n "checking for working vfork""... $ac_c" 1>&6
+-echo "configure:3801: checking for working vfork" >&5
++echo "configure:3834: checking for working vfork" >&5
+ if eval "test \"`echo '$''{'ac_cv_func_vfork_works'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   if test "$cross_compiling" = yes; then
+   echo $ac_n "checking for vfork""... $ac_c" 1>&6
+-echo "configure:3807: checking for vfork" >&5
++echo "configure:3840: checking for vfork" >&5
+ if eval "test \"`echo '$''{'ac_cv_func_vfork'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 3812 "configure"
++#line 3845 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char vfork(); below.  */
+@@ -3831,7 +3864,7 @@
+ 
+ ; return 0; }
+ EOF
+-if { (eval echo configure:3835: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:3868: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_func_vfork=yes"
+ else
+@@ -3853,7 +3886,7 @@
+ ac_cv_func_vfork_works=$ac_cv_func_vfork
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 3857 "configure"
++#line 3890 "configure"
+ #include "confdefs.h"
+ /* Thanks to Paul Eggert for this test.  */
+ #include <stdio.h>
+@@ -3948,7 +3981,7 @@
+   }
+ }
+ EOF
+-if { (eval echo configure:3952: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:3985: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+ then
+   ac_cv_func_vfork_works=yes
+ else
+@@ -3973,12 +4006,12 @@
+ for ac_func in getpagesize
+ do
+ echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
+-echo "configure:3977: checking for $ac_func" >&5
++echo "configure:4010: 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 3982 "configure"
++#line 4015 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char $ac_func(); below.  */
+@@ -4001,7 +4034,7 @@
+ 
+ ; return 0; }
+ EOF
+-if { (eval echo configure:4005: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:4038: \"$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
+@@ -4272,7 +4305,7 @@
+ EOF
+ 
+ echo $ac_n "checking for working mmap from /dev/zero""... $ac_c" 1>&6
+-echo "configure:4276: checking for working mmap from /dev/zero" >&5
++echo "configure:4309: checking for working mmap from /dev/zero" >&5
+ if eval "test \"`echo '$''{'ac_cv_func_mmap_dev_zero'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -4288,11 +4321,11 @@
+   esac
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 4292 "configure"
++#line 4325 "configure"
+ #include "confdefs.h"
+ #include "ct-mmap.inc"
+ EOF
+-if { (eval echo configure:4296: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:4329: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+ then
+   ac_cv_func_mmap_dev_zero=yes
+ else
+@@ -4319,7 +4352,7 @@
+ fi
+ 
+ echo $ac_n "checking for working mmap with MAP_ANON(YMOUS)""... $ac_c" 1>&6
+-echo "configure:4323: checking for working mmap with MAP_ANON(YMOUS)" >&5
++echo "configure:4356: checking for working mmap with MAP_ANON(YMOUS)" >&5
+ if eval "test \"`echo '$''{'ac_cv_func_mmap_anon'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -4329,12 +4362,12 @@
+  ac_cv_func_mmap_anon=no
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 4333 "configure"
++#line 4366 "configure"
+ #include "confdefs.h"
+ #define USE_MAP_ANON
+ #include "ct-mmap.inc"
+ EOF
+-if { (eval echo configure:4338: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:4371: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+ then
+   ac_cv_func_mmap_anon=yes
+ else
+@@ -4362,7 +4395,7 @@
+ rm -f ct-mmap.inc
+ 
+ echo $ac_n "checking for working mmap of a file""... $ac_c" 1>&6
+-echo "configure:4366: checking for working mmap of a file" >&5
++echo "configure:4399: checking for working mmap of a file" >&5
+ if eval "test \"`echo '$''{'ac_cv_func_mmap_file'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -4377,7 +4410,7 @@
+   ac_cv_func_mmap_file=no
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 4381 "configure"
++#line 4414 "configure"
+ #include "confdefs.h"
+ 
+ /* Test by Zack Weinberg.  Modified from MMAP_ANYWHERE test by
+@@ -4414,7 +4447,7 @@
+   exit(0);
+ }
+ EOF
+-if { (eval echo configure:4418: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:4451: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+ then
+   ac_cv_func_mmap_file=yes
+ else
+@@ -4453,7 +4486,7 @@
+ 
+ 
+   echo $ac_n "checking for iconv""... $ac_c" 1>&6
+-echo "configure:4457: checking for iconv" >&5
++echo "configure:4490: checking for iconv" >&5
+ if eval "test \"`echo '$''{'am_cv_func_iconv'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -4461,7 +4494,7 @@
+     am_cv_func_iconv="no, consider installing GNU libiconv"
+     am_cv_lib_iconv=no
+     cat > conftest.$ac_ext <<EOF
+-#line 4465 "configure"
++#line 4498 "configure"
+ #include "confdefs.h"
+ #include <stdlib.h>
+ #include <iconv.h>
+@@ -4471,7 +4504,7 @@
+        iconv_close(cd);
+ ; return 0; }
+ EOF
+-if { (eval echo configure:4475: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:4508: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   am_cv_func_iconv=yes
+ else
+@@ -4483,7 +4516,7 @@
+       am_save_LIBS="$LIBS"
+       LIBS="$LIBS $am_cv_libiconv_ldpath -liconv"
+       cat > conftest.$ac_ext <<EOF
+-#line 4487 "configure"
++#line 4520 "configure"
+ #include "confdefs.h"
+ #include <stdlib.h>
+ #include <iconv.h>
+@@ -4493,7 +4526,7 @@
+          iconv_close(cd);
+ ; return 0; }
+ EOF
+-if { (eval echo configure:4497: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:4530: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   am_cv_lib_iconv=yes
+         am_cv_func_iconv=yes
+@@ -4514,13 +4547,13 @@
+ EOF
+ 
+     echo $ac_n "checking for iconv declaration""... $ac_c" 1>&6
+-echo "configure:4518: checking for iconv declaration" >&5
++echo "configure:4551: checking for iconv declaration" >&5
+     if eval "test \"`echo '$''{'am_cv_proto_iconv'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   
+       cat > conftest.$ac_ext <<EOF
+-#line 4524 "configure"
++#line 4557 "configure"
+ #include "confdefs.h"
+ 
+ #include <stdlib.h>
+@@ -4539,7 +4572,7 @@
+ 
+ ; return 0; }
+ EOF
+-if { (eval echo configure:4543: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:4576: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+   rm -rf conftest*
+   am_cv_proto_iconv_arg1=""
+ else
+@@ -4577,12 +4610,12 @@
+ do
+   ac_tr_decl=HAVE_DECL_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
+ echo $ac_n "checking whether $ac_func is declared""... $ac_c" 1>&6
+-echo "configure:4581: checking whether $ac_func is declared" >&5
++echo "configure:4614: checking whether $ac_func is declared" >&5
+ if eval "test \"`echo '$''{'gcc_cv_have_decl_$ac_func'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 4586 "configure"
++#line 4619 "configure"
+ #include "confdefs.h"
+ #undef $ac_tr_decl
+ #define $ac_tr_decl 1
+@@ -4596,7 +4629,7 @@
+ #endif
+ ; return 0; }
+ EOF
+-if { (eval echo configure:4600: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:4633: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+   rm -rf conftest*
+   eval "gcc_cv_have_decl_$ac_func=yes"
+ else
+@@ -4695,12 +4728,12 @@
+ do
+   ac_tr_decl=HAVE_DECL_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
+ echo $ac_n "checking whether $ac_func is declared""... $ac_c" 1>&6
+-echo "configure:4699: checking whether $ac_func is declared" >&5
++echo "configure:4732: checking whether $ac_func is declared" >&5
+ if eval "test \"`echo '$''{'gcc_cv_have_decl_$ac_func'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 4704 "configure"
++#line 4737 "configure"
+ #include "confdefs.h"
+ #undef $ac_tr_decl
+ #define $ac_tr_decl 1
+@@ -4718,7 +4751,7 @@
+ #endif
+ ; return 0; }
+ EOF
+-if { (eval echo configure:4722: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:4755: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+   rm -rf conftest*
+   eval "gcc_cv_have_decl_$ac_func=yes"
+ else
+@@ -4760,12 +4793,12 @@
+ do
+   ac_tr_decl=HAVE_DECL_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
+ echo $ac_n "checking whether $ac_func is declared""... $ac_c" 1>&6
+-echo "configure:4764: checking whether $ac_func is declared" >&5
++echo "configure:4797: checking whether $ac_func is declared" >&5
+ if eval "test \"`echo '$''{'gcc_cv_have_decl_$ac_func'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 4769 "configure"
++#line 4802 "configure"
+ #include "confdefs.h"
+ #undef $ac_tr_decl
+ #define $ac_tr_decl 1
+@@ -4783,7 +4816,7 @@
+ #endif
+ ; return 0; }
+ EOF
+-if { (eval echo configure:4787: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:4820: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+   rm -rf conftest*
+   eval "gcc_cv_have_decl_$ac_func=yes"
+ else
+@@ -4817,13 +4850,13 @@
+ 
+ # More time-related stuff.
+ echo $ac_n "checking for struct tms""... $ac_c" 1>&6
+-echo "configure:4821: checking for struct tms" >&5
++echo "configure:4854: checking for struct tms" >&5
+ if eval "test \"`echo '$''{'ac_cv_struct_tms'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   
+ cat > conftest.$ac_ext <<EOF
+-#line 4827 "configure"
++#line 4860 "configure"
+ #include "confdefs.h"
+ 
+ #include "ansidecl.h"
+@@ -4836,7 +4869,7 @@
+ struct tms tms;
+ ; return 0; }
+ EOF
+-if { (eval echo configure:4840: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:4873: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+   rm -rf conftest*
+   ac_cv_struct_tms=yes
+ else
+@@ -4859,13 +4892,13 @@
+ # use gcc_cv_* here because this doesn't match the behavior of AC_CHECK_TYPE.
+ # revisit after autoconf 2.50.
+ echo $ac_n "checking for clock_t""... $ac_c" 1>&6
+-echo "configure:4863: checking for clock_t" >&5
++echo "configure:4896: checking for clock_t" >&5
+ if eval "test \"`echo '$''{'gcc_cv_type_clock_t'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   
+ cat > conftest.$ac_ext <<EOF
+-#line 4869 "configure"
++#line 4902 "configure"
+ #include "confdefs.h"
+ 
+ #include "ansidecl.h"
+@@ -4875,7 +4908,7 @@
+ clock_t x;
+ ; return 0; }
+ EOF
+-if { (eval echo configure:4879: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:4912: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+   rm -rf conftest*
+   gcc_cv_type_clock_t=yes
+ else
+@@ -4900,12 +4933,12 @@
+ 
+ # mkdir takes a single argument on some systems. 
+ echo $ac_n "checking if mkdir takes one argument""... $ac_c" 1>&6
+-echo "configure:4904: checking if mkdir takes one argument" >&5
++echo "configure:4937: checking if mkdir takes one argument" >&5
+ if eval "test \"`echo '$''{'gcc_cv_mkdir_takes_one_arg'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 4909 "configure"
++#line 4942 "configure"
+ #include "confdefs.h"
+ 
+ #include <sys/types.h>
+@@ -4922,7 +4955,7 @@
+ mkdir ("foo", 0);
+ ; return 0; }
+ EOF
+-if { (eval echo configure:4926: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:4959: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+   rm -rf conftest*
+   gcc_cv_mkdir_takes_one_arg=no
+ else
+@@ -5190,14 +5223,14 @@
+ 
+             
+ echo $ac_n "checking for library containing strerror""... $ac_c" 1>&6
+-echo "configure:5194: checking for library containing strerror" >&5
++echo "configure:5227: checking for library containing strerror" >&5
+ if eval "test \"`echo '$''{'ac_cv_search_strerror'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   ac_func_search_save_LIBS="$LIBS"
+ ac_cv_search_strerror="no"
+ cat > conftest.$ac_ext <<EOF
+-#line 5201 "configure"
++#line 5234 "configure"
+ #include "confdefs.h"
+ /* Override any gcc2 internal prototype to avoid an error.  */
+ /* We use char because int might match the return type of a gcc2
+@@ -5208,7 +5241,7 @@
+ strerror()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:5212: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:5245: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   ac_cv_search_strerror="none required"
+ else
+@@ -5219,7 +5252,7 @@
+ test "$ac_cv_search_strerror" = "no" && for i in cposix; do
+ LIBS="-l$i  $ac_func_search_save_LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 5223 "configure"
++#line 5256 "configure"
+ #include "confdefs.h"
+ /* Override any gcc2 internal prototype to avoid an error.  */
+ /* We use char because int might match the return type of a gcc2
+@@ -5230,7 +5263,7 @@
+ strerror()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:5234: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:5267: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   ac_cv_search_strerror="-l$i"
+ break
+@@ -5253,12 +5286,12 @@
+   
+ 
+ echo $ac_n "checking for working const""... $ac_c" 1>&6
+-echo "configure:5257: checking for working const" >&5
++echo "configure:5290: 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 5262 "configure"
++#line 5295 "configure"
+ #include "confdefs.h"
+ 
+ int main() {
+@@ -5307,7 +5340,7 @@
+ 
+ ; return 0; }
+ EOF
+-if { (eval echo configure:5311: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:5344: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+   rm -rf conftest*
+   ac_cv_c_const=yes
+ else
+@@ -5328,12 +5361,12 @@
+ fi
+ 
+ echo $ac_n "checking for off_t""... $ac_c" 1>&6
+-echo "configure:5332: checking for off_t" >&5
++echo "configure:5365: checking for off_t" >&5
+ if eval "test \"`echo '$''{'ac_cv_type_off_t'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 5337 "configure"
++#line 5370 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ #if STDC_HEADERS
+@@ -5361,12 +5394,12 @@
+ fi
+ 
+ echo $ac_n "checking for size_t""... $ac_c" 1>&6
+-echo "configure:5365: checking for size_t" >&5
++echo "configure:5398: checking for size_t" >&5
+ if eval "test \"`echo '$''{'ac_cv_type_size_t'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 5370 "configure"
++#line 5403 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ #if STDC_HEADERS
+@@ -5396,19 +5429,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:5400: checking for working alloca.h" >&5
++echo "configure:5433: 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 5405 "configure"
++#line 5438 "configure"
+ #include "confdefs.h"
+ #include <alloca.h>
+ int main() {
+ char *p = alloca(2 * sizeof(int));
+ ; return 0; }
+ EOF
+-if { (eval echo configure:5412: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:5445: \"$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
+@@ -5429,12 +5462,12 @@
+ fi
+ 
+ echo $ac_n "checking for alloca""... $ac_c" 1>&6
+-echo "configure:5433: checking for alloca" >&5
++echo "configure:5466: 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 5438 "configure"
++#line 5471 "configure"
+ #include "confdefs.h"
+ 
+ #ifdef __GNUC__
+@@ -5462,7 +5495,7 @@
+ char *p = (char *) alloca(1);
+ ; return 0; }
+ EOF
+-if { (eval echo configure:5466: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:5499: \"$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
+@@ -5494,12 +5527,12 @@
+ 
+ 
+ echo $ac_n "checking whether alloca needs Cray hooks""... $ac_c" 1>&6
+-echo "configure:5498: checking whether alloca needs Cray hooks" >&5
++echo "configure:5531: 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 5503 "configure"
++#line 5536 "configure"
+ #include "confdefs.h"
+ #if defined(CRAY) && ! defined(CRAY2)
+ webecray
+@@ -5524,12 +5557,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:5528: checking for $ac_func" >&5
++echo "configure:5561: 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 5533 "configure"
++#line 5566 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char $ac_func(); below.  */
+@@ -5552,7 +5585,7 @@
+ 
+ ; return 0; }
+ EOF
+-if { (eval echo configure:5556: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:5589: \"$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
+@@ -5579,7 +5612,7 @@
+ fi
+ 
+ echo $ac_n "checking stack direction for C alloca""... $ac_c" 1>&6
+-echo "configure:5583: checking stack direction for C alloca" >&5
++echo "configure:5616: 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
+@@ -5587,7 +5620,7 @@
+   ac_cv_c_stack_direction=0
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 5591 "configure"
++#line 5624 "configure"
+ #include "confdefs.h"
+ find_stack_direction ()
+ {
+@@ -5606,7 +5639,7 @@
+   exit (find_stack_direction() < 0);
+ }
+ EOF
+-if { (eval echo configure:5610: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:5643: \"$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
+@@ -5629,12 +5662,12 @@
+ 
+ 
+     echo $ac_n "checking whether we are using the GNU C Library 2.1 or newer""... $ac_c" 1>&6
+-echo "configure:5633: checking whether we are using the GNU C Library 2.1 or newer" >&5
++echo "configure:5666: checking whether we are using the GNU C Library 2.1 or newer" >&5
+ if eval "test \"`echo '$''{'ac_cv_gnu_library_2_1'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 5638 "configure"
++#line 5671 "configure"
+ #include "confdefs.h"
+ 
+ #include <features.h>
+@@ -5670,17 +5703,17 @@
+ do
+ ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
+ echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
+-echo "configure:5674: checking for $ac_hdr" >&5
++echo "configure:5707: 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 5679 "configure"
++#line 5712 "configure"
+ #include "confdefs.h"
+ #include <$ac_hdr>
+ EOF
+ ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+-{ (eval echo configure:5684: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:5717: \"$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*
+@@ -5711,12 +5744,12 @@
+ strdup strtoul tsearch __argz_count __argz_stringify __argz_next
+ do
+ echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
+-echo "configure:5715: checking for $ac_func" >&5
++echo "configure:5748: 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 5720 "configure"
++#line 5753 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char $ac_func(); below.  */
+@@ -5739,7 +5772,7 @@
+ 
+ ; return 0; }
+ EOF
+-if { (eval echo configure:5743: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:5776: \"$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
+@@ -5780,7 +5813,7 @@
+ 
+ 
+   echo $ac_n "checking for iconv""... $ac_c" 1>&6
+-echo "configure:5784: checking for iconv" >&5
++echo "configure:5817: checking for iconv" >&5
+ if eval "test \"`echo '$''{'am_cv_func_iconv'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -5788,7 +5821,7 @@
+     am_cv_func_iconv="no, consider installing GNU libiconv"
+     am_cv_lib_iconv=no
+     cat > conftest.$ac_ext <<EOF
+-#line 5792 "configure"
++#line 5825 "configure"
+ #include "confdefs.h"
+ #include <stdlib.h>
+ #include <iconv.h>
+@@ -5798,7 +5831,7 @@
+        iconv_close(cd);
+ ; return 0; }
+ EOF
+-if { (eval echo configure:5802: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:5835: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   am_cv_func_iconv=yes
+ else
+@@ -5810,7 +5843,7 @@
+       am_save_LIBS="$LIBS"
+       LIBS="$LIBS $am_cv_libiconv_ldpath -liconv"
+       cat > conftest.$ac_ext <<EOF
+-#line 5814 "configure"
++#line 5847 "configure"
+ #include "confdefs.h"
+ #include <stdlib.h>
+ #include <iconv.h>
+@@ -5820,7 +5853,7 @@
+          iconv_close(cd);
+ ; return 0; }
+ EOF
+-if { (eval echo configure:5824: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:5857: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   am_cv_lib_iconv=yes
+         am_cv_func_iconv=yes
+@@ -5841,13 +5874,13 @@
+ EOF
+ 
+     echo $ac_n "checking for iconv declaration""... $ac_c" 1>&6
+-echo "configure:5845: checking for iconv declaration" >&5
++echo "configure:5878: checking for iconv declaration" >&5
+     if eval "test \"`echo '$''{'am_cv_proto_iconv'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   
+       cat > conftest.$ac_ext <<EOF
+-#line 5851 "configure"
++#line 5884 "configure"
+ #include "confdefs.h"
+ 
+ #include <stdlib.h>
+@@ -5866,7 +5899,7 @@
+ 
+ ; return 0; }
+ EOF
+-if { (eval echo configure:5870: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:5903: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+   rm -rf conftest*
+   am_cv_proto_iconv_arg1=""
+ else
+@@ -5895,19 +5928,19 @@
+ 
+    
+   echo $ac_n "checking for nl_langinfo and CODESET""... $ac_c" 1>&6
+-echo "configure:5899: checking for nl_langinfo and CODESET" >&5
++echo "configure:5932: checking for nl_langinfo and CODESET" >&5
+ if eval "test \"`echo '$''{'am_cv_langinfo_codeset'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 5904 "configure"
++#line 5937 "configure"
+ #include "confdefs.h"
+ #include <langinfo.h>
+ int main() {
+ char* cs = nl_langinfo(CODESET);
+ ; return 0; }
+ EOF
+-if { (eval echo configure:5911: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:5944: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   am_cv_langinfo_codeset=yes
+ else
+@@ -5930,19 +5963,19 @@
+ 
+    if test $ac_cv_header_locale_h = yes; then
+     echo $ac_n "checking for LC_MESSAGES""... $ac_c" 1>&6
+-echo "configure:5934: checking for LC_MESSAGES" >&5
++echo "configure:5967: checking for LC_MESSAGES" >&5
+ if eval "test \"`echo '$''{'am_cv_val_LC_MESSAGES'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 5939 "configure"
++#line 5972 "configure"
+ #include "confdefs.h"
+ #include <locale.h>
+ int main() {
+ return LC_MESSAGES
+ ; return 0; }
+ EOF
+-if { (eval echo configure:5946: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:5979: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   am_cv_val_LC_MESSAGES=yes
+ else
+@@ -5963,7 +5996,7 @@
+     fi
+   fi
+    echo $ac_n "checking whether NLS is requested""... $ac_c" 1>&6
+-echo "configure:5967: checking whether NLS is requested" >&5
++echo "configure:6000: checking whether NLS is requested" >&5
+         # Check whether --enable-nls or --disable-nls was given.
+ if test "${enable_nls+set}" = set; then
+   enableval="$enable_nls"
+@@ -5986,7 +6019,7 @@
+ EOF
+ 
+       echo $ac_n "checking whether included gettext is requested""... $ac_c" 1>&6
+-echo "configure:5990: checking whether included gettext is requested" >&5
++echo "configure:6023: checking whether included gettext is requested" >&5
+       # Check whether --with-included-gettext or --without-included-gettext was given.
+ if test "${with_included_gettext+set}" = set; then
+   withval="$with_included_gettext"
+@@ -6006,17 +6039,17 @@
+ 
+ 	ac_safe=`echo "libintl.h" | sed 'y%./+-%__p_%'`
+ echo $ac_n "checking for libintl.h""... $ac_c" 1>&6
+-echo "configure:6010: checking for libintl.h" >&5
++echo "configure:6043: checking for libintl.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 6015 "configure"
++#line 6048 "configure"
+ #include "confdefs.h"
+ #include <libintl.h>
+ EOF
+ ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+-{ (eval echo configure:6020: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:6053: \"$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*
+@@ -6037,12 +6070,12 @@
+ EOF
+ 
+            echo $ac_n "checking for GNU gettext in libc""... $ac_c" 1>&6
+-echo "configure:6041: checking for GNU gettext in libc" >&5
++echo "configure:6074: checking for GNU gettext in libc" >&5
+ if eval "test \"`echo '$''{'gt_cv_func_gnugettext1_libc'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 6046 "configure"
++#line 6079 "configure"
+ #include "confdefs.h"
+ #include <libintl.h>
+ extern int _nl_msg_cat_cntr;
+@@ -6051,7 +6084,7 @@
+ return (int) gettext ("") + _nl_msg_cat_cntr
+ ; return 0; }
+ EOF
+-if { (eval echo configure:6055: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:6088: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   gt_cv_func_gnugettext1_libc=yes
+ else
+@@ -6067,14 +6100,14 @@
+ 
+ 	   if test "$gt_cv_func_gnugettext1_libc" != "yes"; then
+ 	     echo $ac_n "checking for GNU gettext in libintl""... $ac_c" 1>&6
+-echo "configure:6071: checking for GNU gettext in libintl" >&5
++echo "configure:6104: checking for GNU gettext in libintl" >&5
+ if eval "test \"`echo '$''{'gt_cv_func_gnugettext1_libintl'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   gt_save_LIBS="$LIBS"
+ 		LIBS="$LIBS -lintl $LIBICONV"
+ 		cat > conftest.$ac_ext <<EOF
+-#line 6078 "configure"
++#line 6111 "configure"
+ #include "confdefs.h"
+ #include <libintl.h>
+ extern int _nl_msg_cat_cntr;
+@@ -6083,7 +6116,7 @@
+ return (int) gettext ("") + _nl_msg_cat_cntr
+ ; return 0; }
+ EOF
+-if { (eval echo configure:6087: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:6120: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   gt_cv_func_gnugettext1_libintl=yes
+ else
+@@ -6116,12 +6149,12 @@
+ 	     for ac_func in dcgettext
+ do
+ echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
+-echo "configure:6120: checking for $ac_func" >&5
++echo "configure:6153: 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 6125 "configure"
++#line 6158 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char $ac_func(); below.  */
+@@ -6144,7 +6177,7 @@
+ 
+ ; return 0; }
+ EOF
+-if { (eval echo configure:6148: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:6181: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_func_$ac_func=yes"
+ else
+@@ -6173,7 +6206,7 @@
+ 	     	     # Extract the first word of "msgfmt", so it can be a program name with args.
+ set dummy msgfmt; ac_word=$2
+ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:6177: checking for $ac_word" >&5
++echo "configure:6210: checking for $ac_word" >&5
+ if eval "test \"`echo '$''{'ac_cv_path_MSGFMT'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -6207,7 +6240,7 @@
+ 	     # Extract the first word of "gmsgfmt", so it can be a program name with args.
+ set dummy gmsgfmt; ac_word=$2
+ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:6211: checking for $ac_word" >&5
++echo "configure:6244: checking for $ac_word" >&5
+ if eval "test \"`echo '$''{'ac_cv_path_GMSGFMT'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -6244,7 +6277,7 @@
+ 	     	     # Extract the first word of "xgettext", so it can be a program name with args.
+ set dummy xgettext; ac_word=$2
+ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:6248: checking for $ac_word" >&5
++echo "configure:6281: checking for $ac_word" >&5
+ if eval "test \"`echo '$''{'ac_cv_path_XGETTEXT'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -6294,7 +6327,7 @@
+         # Extract the first word of "msgfmt", so it can be a program name with args.
+ set dummy msgfmt; ac_word=$2
+ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:6298: checking for $ac_word" >&5
++echo "configure:6331: checking for $ac_word" >&5
+ if eval "test \"`echo '$''{'ac_cv_path_MSGFMT'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -6328,7 +6361,7 @@
+         # Extract the first word of "gmsgfmt", so it can be a program name with args.
+ set dummy gmsgfmt; ac_word=$2
+ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:6332: checking for $ac_word" >&5
++echo "configure:6365: checking for $ac_word" >&5
+ if eval "test \"`echo '$''{'ac_cv_path_GMSGFMT'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -6364,7 +6397,7 @@
+         # Extract the first word of "xgettext", so it can be a program name with args.
+ set dummy xgettext; ac_word=$2
+ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:6368: checking for $ac_word" >&5
++echo "configure:6401: checking for $ac_word" >&5
+ if eval "test \"`echo '$''{'ac_cv_path_XGETTEXT'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -6436,7 +6469,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:6440: checking for $ac_word" >&5
++echo "configure:6473: checking for $ac_word" >&5
+ if eval "test \"`echo '$''{'ac_cv_prog_INTLBISON'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -6469,7 +6502,7 @@
+       ac_verc_fail=yes
+     else
+             echo $ac_n "checking version of bison""... $ac_c" 1>&6
+-echo "configure:6473: checking version of bison" >&5
++echo "configure:6506: checking version of bison" >&5
+       ac_prog_version=`$INTLBISON --version 2>&1 | sed -n 's/^.*GNU Bison.* \([0-9]*\.[0-9.]*\).*$/\1/p'`
+       case $ac_prog_version in
+         '') ac_prog_version="v. ?.??, bad"; ac_verc_fail=yes;;
+@@ -6514,7 +6547,7 @@
+ 
+          if test "x$CATOBJEXT" != x; then
+      echo $ac_n "checking for catalogs to be installed""... $ac_c" 1>&6
+-echo "configure:6518: checking for catalogs to be installed" >&5
++echo "configure:6551: checking for catalogs to be installed" >&5
+      # Look for .po and .gmo files in the source directory.
+      CATALOGS=
+      XLINGUAS=
+@@ -6572,7 +6605,7 @@
+ case $host_os in
+ 	win32 | pe | cygwin* | mingw32* | uwin*)
+ echo $ac_n "checking whether windows registry support is requested""... $ac_c" 1>&6
+-echo "configure:6576: checking whether windows registry support is requested" >&5
++echo "configure:6609: checking whether windows registry support is requested" >&5
+ if test "x$enable_win32_registry" != xno; then
+   cat >> confdefs.h <<\EOF
+ #define ENABLE_WIN32_REGISTRY 1
+@@ -6581,14 +6614,14 @@
+   echo "$ac_t""yes" 1>&6
+   
+ echo $ac_n "checking for library containing RegOpenKeyExA""... $ac_c" 1>&6
+-echo "configure:6585: checking for library containing RegOpenKeyExA" >&5
++echo "configure:6618: checking for library containing RegOpenKeyExA" >&5
+ if eval "test \"`echo '$''{'ac_cv_search_RegOpenKeyExA'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   ac_func_search_save_LIBS="$LIBS"
+ ac_cv_search_RegOpenKeyExA="no"
+ cat > conftest.$ac_ext <<EOF
+-#line 6592 "configure"
++#line 6625 "configure"
+ #include "confdefs.h"
+ /* Override any gcc2 internal prototype to avoid an error.  */
+ /* We use char because int might match the return type of a gcc2
+@@ -6599,7 +6632,7 @@
+ RegOpenKeyExA()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:6603: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:6636: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   ac_cv_search_RegOpenKeyExA="none required"
+ else
+@@ -6610,7 +6643,7 @@
+ test "$ac_cv_search_RegOpenKeyExA" = "no" && for i in advapi32; do
+ LIBS="-l$i  $ac_func_search_save_LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 6614 "configure"
++#line 6647 "configure"
+ #include "confdefs.h"
+ /* Override any gcc2 internal prototype to avoid an error.  */
+ /* We use char because int might match the return type of a gcc2
+@@ -6621,7 +6654,7 @@
+ RegOpenKeyExA()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:6625: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:6658: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   ac_cv_search_RegOpenKeyExA="-l$i"
+ break
+@@ -6663,7 +6696,7 @@
+ 
+ if test "x$enable_win32_registry" != xno; then
+   echo $ac_n "checking registry key on windows hosts""... $ac_c" 1>&6
+-echo "configure:6667: checking registry key on windows hosts" >&5
++echo "configure:6700: checking registry key on windows hosts" >&5
+   cat >> confdefs.h <<EOF
+ #define WIN32_REGISTRY_KEY "$gcc_cv_win32_registry_key"
+ EOF
+@@ -6868,7 +6901,7 @@
+ 
+ # Figure out what assembler we will be using.
+ echo $ac_n "checking what assembler to use""... $ac_c" 1>&6
+-echo "configure:6872: checking what assembler to use" >&5
++echo "configure:6905: checking what assembler to use" >&5
+ gcc_cv_as=
+ gcc_cv_gas_major_version=
+ gcc_cv_gas_minor_version=
+@@ -6962,7 +6995,7 @@
+ 
+ # Figure out what linker we will be using.
+ echo $ac_n "checking what linker to use""... $ac_c" 1>&6
+-echo "configure:6966: checking what linker to use" >&5
++echo "configure:6999: checking what linker to use" >&5
+ gcc_cv_ld=
+ gcc_cv_gld_major_version=
+ gcc_cv_gld_minor_version=
+@@ -7055,7 +7088,7 @@
+ 
+ # Figure out what nm we will be using.
+ echo $ac_n "checking what nm to use""... $ac_c" 1>&6
+-echo "configure:7059: checking what nm to use" >&5
++echo "configure:7092: checking what nm to use" >&5
+ if test -x nm$host_exeext; then
+ 	gcc_cv_nm=./nm$host_exeext
+ elif test "x$program_prefix" != xNONE; then
+@@ -7067,7 +7100,7 @@
+ 
+ # Figure out what objdump we will be using.
+ echo $ac_n "checking what objdump to use""... $ac_c" 1>&6
+-echo "configure:7071: checking what objdump to use" >&5
++echo "configure:7104: checking what objdump to use" >&5
+ if test -x objdump$host_exeext; then
+ 	gcc_cv_objdump=./objdump$host_exeext
+ elif test "x$program_prefix" != xNONE; then
+@@ -7079,7 +7112,7 @@
+ 
+ # Figure out what assembler alignment features are present.
+ echo $ac_n "checking assembler alignment features""... $ac_c" 1>&6
+-echo "configure:7083: checking assembler alignment features" >&5
++echo "configure:7116: checking assembler alignment features" >&5
+ gcc_cv_as_alignment_features=none
+ if test x$gcc_cv_gas_major_version != x -a x$gcc_cv_gas_minor_version != x; then
+ 	# Gas version 2.6 and later support for .balign and .p2align.
+@@ -7127,7 +7160,7 @@
+ echo "$ac_t""$gcc_cv_as_alignment_features" 1>&6
+ 
+ echo $ac_n "checking assembler subsection support""... $ac_c" 1>&6
+-echo "configure:7131: checking assembler subsection support" >&5
++echo "configure:7164: checking assembler subsection support" >&5
+ gcc_cv_as_subsections=no
+ if test x$gcc_cv_gas_major_version != x -a x$gcc_cv_gas_minor_version != x; then
+   if test "$gcc_cv_gas_major_version" -eq 2 -a "$gcc_cv_gas_minor_version" -ge 9 -o "$gcc_cv_gas_major_version" -gt 2 && grep 'obj_format = elf' ../gas/Makefile > /dev/null; then
+@@ -7167,7 +7200,7 @@
+ echo "$ac_t""$gcc_cv_as_subsections" 1>&6
+ 
+ echo $ac_n "checking assembler weak support""... $ac_c" 1>&6
+-echo "configure:7171: checking assembler weak support" >&5
++echo "configure:7204: checking assembler weak support" >&5
+ gcc_cv_as_weak=no
+ if test x$gcc_cv_gas_major_version != x -a x$gcc_cv_gas_minor_version != x; then
+   if test "$gcc_cv_gas_major_version" -eq 2 -a "$gcc_cv_gas_minor_version" -ge 2 -o "$gcc_cv_gas_major_version" -gt 2; then
+@@ -7190,7 +7223,7 @@
+ echo "$ac_t""$gcc_cv_as_weak" 1>&6
+ 
+ echo $ac_n "checking assembler hidden support""... $ac_c" 1>&6
+-echo "configure:7194: checking assembler hidden support" >&5
++echo "configure:7227: checking assembler hidden support" >&5
+ gcc_cv_as_hidden=no
+ if test x$gcc_cv_gas_major_version != x -a x$gcc_cv_gas_minor_version != x; then
+   if test "$gcc_cv_gas_major_version" -eq 2	\
+@@ -7254,7 +7287,7 @@
+ 
+ 
+ echo $ac_n "checking assembler leb128 support""... $ac_c" 1>&6
+-echo "configure:7258: checking assembler leb128 support" >&5
++echo "configure:7291: checking assembler leb128 support" >&5
+ gcc_cv_as_leb128=no
+ if test x$gcc_cv_gas_major_version != x -a x$gcc_cv_gas_minor_version != x; then
+   if test "$gcc_cv_gas_major_version" -eq 2 -a "$gcc_cv_gas_minor_version" -ge 11 -o "$gcc_cv_gas_major_version" -gt 2 && grep 'obj_format = elf' ../gas/Makefile > /dev/null; then
+@@ -7299,7 +7332,7 @@
+ echo "$ac_t""$gcc_cv_as_leb128" 1>&6
+ 
+ echo $ac_n "checking assembler eh_frame optimization""... $ac_c" 1>&6
+-echo "configure:7303: checking assembler eh_frame optimization" >&5
++echo "configure:7336: checking assembler eh_frame optimization" >&5
+ gcc_cv_as_eh_frame=no
+ if test x$gcc_cv_gas_major_version != x -a x$gcc_cv_gas_minor_version != x; then
+   if test "$gcc_cv_gas_major_version" -eq 2 -a "$gcc_cv_gas_minor_version" -ge 12 -o "$gcc_cv_gas_major_version" -gt 2 && grep 'obj_format = elf' ../gas/Makefile > /dev/null; then
+@@ -7380,7 +7413,7 @@
+ echo "$ac_t""$gcc_cv_as_eh_frame" 1>&6
+ 
+ echo $ac_n "checking assembler section merging support""... $ac_c" 1>&6
+-echo "configure:7384: checking assembler section merging support" >&5
++echo "configure:7417: checking assembler section merging support" >&5
+ gcc_cv_as_shf_merge=no
+ if test x$gcc_cv_gas_major_version != x -a x$gcc_cv_gas_minor_version != x; then
+   if test "$gcc_cv_gas_major_version" -eq 2 -a "$gcc_cv_gas_minor_version" -ge 12 -o "$gcc_cv_gas_major_version" -gt 2 && grep 'obj_format = elf' ../gas/Makefile > /dev/null; then
+@@ -7406,7 +7439,7 @@
+   # All TARGET_ABI_OSF targets.
+   alpha*-*-osf* | alpha*-*-linux* | alpha*-*-*bsd*)
+     echo $ac_n "checking assembler supports explicit relocations""... $ac_c" 1>&6
+-echo "configure:7410: checking assembler supports explicit relocations" >&5
++echo "configure:7443: checking assembler supports explicit relocations" >&5
+ if eval "test \"`echo '$''{'gcc_cv_as_explicit_relocs'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -7456,7 +7489,7 @@
+     ;;
+   sparc*-*-*)
+     echo $ac_n "checking assembler .register pseudo-op support""... $ac_c" 1>&6
+-echo "configure:7460: checking assembler .register pseudo-op support" >&5
++echo "configure:7493: checking assembler .register pseudo-op support" >&5
+ if eval "test \"`echo '$''{'gcc_cv_as_register_pseudo_op'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -7484,7 +7517,7 @@
+     fi
+ 
+     echo $ac_n "checking assembler supports -relax""... $ac_c" 1>&6
+-echo "configure:7488: checking assembler supports -relax" >&5
++echo "configure:7521: checking assembler supports -relax" >&5
+ if eval "test \"`echo '$''{'gcc_cv_as_relax_opt'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -7512,7 +7545,7 @@
+     fi
+ 
+     echo $ac_n "checking assembler and linker support unaligned pc related relocs""... $ac_c" 1>&6
+-echo "configure:7516: checking assembler and linker support unaligned pc related relocs" >&5
++echo "configure:7549: checking assembler and linker support unaligned pc related relocs" >&5
+ if eval "test \"`echo '$''{'gcc_cv_as_sparc_ua_pcrel'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -7539,7 +7572,7 @@
+     fi
+ 
+     echo $ac_n "checking assembler and linker support unaligned pc related relocs against hidden symbols""... $ac_c" 1>&6
+-echo "configure:7543: checking assembler and linker support unaligned pc related relocs against hidden symbols" >&5
++echo "configure:7576: checking assembler and linker support unaligned pc related relocs against hidden symbols" >&5
+ if eval "test \"`echo '$''{'gcc_cv_as_sparc_ua_pcrel_hidden'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -7579,7 +7612,7 @@
+     fi
+ 
+     echo $ac_n "checking for assembler offsetable %lo() support""... $ac_c" 1>&6
+-echo "configure:7584: checking for assembler offsetable %lo() support" >&5
++echo "configure:7616: checking for assembler offsetable %lo() support" >&5
+ if eval "test \"`echo '$''{'gcc_cv_as_offsetable_lo10'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -7618,7 +7651,7 @@
+ 
+   i[34567]86-*-* | x86_64-*-*)
+     echo $ac_n "checking assembler instructions""... $ac_c" 1>&6
+-echo "configure:7624: checking assembler instructions" >&5
++echo "configure:7655: checking assembler instructions" >&5
+     gcc_cv_as_instructions=
+     if test x$gcc_cv_gas_major_version != x -a x$gcc_cv_gas_minor_version != x; then
+       if test "$gcc_cv_gas_major_version" -eq 2 -a "$gcc_cv_gas_minor_version" -ge 9 -o "$gcc_cv_gas_major_version" -gt 2; then
+@@ -7645,7 +7678,7 @@
+     echo "$ac_t""$gcc_cv_as_instructions" 1>&6
+ 
+     echo $ac_n "checking assembler GOTOFF in data directives""... $ac_c" 1>&6
+-echo "configure:7651: checking assembler GOTOFF in data directives" >&5
++echo "configure:7682: checking assembler GOTOFF in data directives" >&5
+     gcc_cv_as_gotoff_in_data=no
+     if test x$gcc_cv_gas_major_version != x -a x$gcc_cv_gas_minor_version != x
+     then
+@@ -7675,7 +7708,7 @@
+ esac
+ 
+ echo $ac_n "checking assembler dwarf2 debug_line support""... $ac_c" 1>&6
+-echo "configure:7681: checking assembler dwarf2 debug_line support" >&5
++echo "configure:7712: checking assembler dwarf2 debug_line support" >&5
+ gcc_cv_as_dwarf2_debug_line=no
+ # ??? Not all targets support dwarf2 debug_line, even within a version
+ # of gas.  Moreover, we need to emit a valid instruction to trigger any
+@@ -7731,7 +7764,7 @@
+ echo "$ac_t""$gcc_cv_as_dwarf2_debug_line" 1>&6
+ 
+ echo $ac_n "checking assembler --gdwarf2 support""... $ac_c" 1>&6
+-echo "configure:7737: checking assembler --gdwarf2 support" >&5
++echo "configure:7768: checking assembler --gdwarf2 support" >&5
+ gcc_cv_as_gdwarf2_flag=no
+ if test x$gcc_cv_gas_major_version != x -a x$gcc_cv_gas_minor_version != x;
+ then
+@@ -7760,7 +7793,7 @@
+ echo "$ac_t""$gcc_cv_as_gdwarf2_flag" 1>&6
+ 
+ echo $ac_n "checking assembler --gstabs support""... $ac_c" 1>&6
+-echo "configure:7766: checking assembler --gstabs support" >&5
++echo "configure:7797: checking assembler --gstabs support" >&5
+ gcc_cv_as_gstabs_flag=no
+ if test x$gcc_cv_gas_major_version != x -a x$gcc_cv_gas_minor_version != x;
+ then
+@@ -7788,7 +7821,7 @@
+ echo "$ac_t""$gcc_cv_as_gstabs_flag" 1>&6
+ 
+ echo $ac_n "checking linker PT_GNU_EH_FRAME support""... $ac_c" 1>&6
+-echo "configure:7794: checking linker PT_GNU_EH_FRAME support" >&5
++echo "configure:7825: checking linker PT_GNU_EH_FRAME support" >&5
+ gcc_cv_ld_eh_frame_hdr=no
+ if test x$gcc_cv_gld_major_version != x -a x$gcc_cv_gld_minor_version != x; then
+   if test "$gcc_cv_gld_major_version" -eq 2 -a "$gcc_cv_gld_minor_version" -ge 12 -o "$gcc_cv_gld_major_version" -gt 2 && grep 'EMUL = elf' ../ld/Makefile > /dev/null; then
+@@ -7803,7 +7836,7 @@
+ echo "$ac_t""$gcc_cv_ld_eh_frame_hdr" 1>&6
+ if test x"$gcc_cv_ld_eh_frame_hdr" = xyes; then
+   echo $ac_n "checking whether linker eh_frame optimizations work properly""... $ac_c" 1>&6
+-echo "configure:7809: checking whether linker eh_frame optimizations work properly" >&5
++echo "configure:7840: checking whether linker eh_frame optimizations work properly" >&5
+   gcc_cv_ld_eh_frame_hdr_works=no
+   if test x$gcc_cv_gld_major_version != x -a x$gcc_cv_gld_minor_version != x; then
+     if test "$gcc_cv_gld_major_version" -eq 2 -a "$gcc_cv_gld_minor_version" -ge 13 -o "$gcc_cv_gld_major_version" -gt 2 && grep 'EMUL = elf' ../ld/Makefile > /dev/null; then
+@@ -8033,7 +8066,7 @@
+ 
+ 
+ echo $ac_n "checking whether to enable maintainer-specific portions of Makefiles""... $ac_c" 1>&6
+-echo "configure:8039: checking whether to enable maintainer-specific portions of Makefiles" >&5
++echo "configure:8070: checking whether to enable maintainer-specific portions of Makefiles" >&5
+     # Check whether --enable-maintainer-mode or --disable-maintainer-mode was given.
+ if test "${enable_maintainer_mode+set}" = set; then
+   enableval="$enable_maintainer_mode"
+@@ -8325,6 +8358,7 @@
+ 
+ 
+ 
++
+ # Echo that links are built
+ if test x$host = x$target
+ then
+@@ -8641,6 +8675,7 @@
+ s%@c_target_objs@%$c_target_objs%g
+ s%@cxx_target_objs@%$cxx_target_objs%g
+ s%@target_cpu_default@%$target_cpu_default%g
++s%@target_default_options@%$target_default_options%g
+ /@target_overrides@/r $target_overrides
+ s%@target_overrides@%%g
+ /@host_overrides@/r $host_overrides
+diff -urN gcc-3.2.1/gcc.orig/configure.in gcc-3.2.1/gcc/configure.in
+--- gcc-3.2.1/gcc.orig/configure.in	2002-09-06 04:58:47.000000000 -0600
++++ gcc-3.2.1/gcc/configure.in	2003-01-15 02:07:46.000000000 -0700
+@@ -136,6 +136,20 @@
+ elf="$with_elf",
+ elf=no)
+ 
++# With a particular CPU
++AC_ARG_WITH(cpu,
++[  --with-cpu              default to -mcpu=CPU],,)
++AC_ARG_WITH(arch,
++[  --with-arch             default to -march=CPU],,)
++AC_ARG_WITH(schedule,
++[  --with-schedule         default to -mschedule=CPU],,)
++AC_ARG_WITH(tune,
++[  --with-tune             default to -mtune=CPU],,)
++
++# Default floating-point setting
++AC_ARG_WITH(float,
++[  --with-float            default to the specified type of floating point],,)
++
+ # Specify the local prefix
+ local_prefix=
+ AC_ARG_WITH(local-prefix,
+@@ -2551,6 +2565,7 @@
+ AC_SUBST(c_target_objs)
+ AC_SUBST(cxx_target_objs)
+ AC_SUBST(target_cpu_default)
++AC_SUBST(target_default_options)
+ 
+ AC_SUBST_FILE(target_overrides)
+ AC_SUBST_FILE(host_overrides)
+diff -urN gcc-3.2.1/gcc.orig/doc/install.texi gcc-3.2.1/gcc/doc/install.texi
+--- gcc-3.2.1/gcc.orig/doc/install.texi	2002-11-13 14:17:09.000000000 -0700
++++ gcc-3.2.1/gcc/doc/install.texi	2003-01-15 02:07:46.000000000 -0700
+@@ -705,11 +705,24 @@
+ 
+ @item --with-cpu=@var{cpu}
+ Specify which cpu variant the
+-compiler should generate code for by default.  This is currently
+-only supported on the some ports, specifically arm, powerpc, and
+-SPARC@.  If configure does not recognize the model name (e.g.@: arm700,
+-603e, or ultrasparc) you provide, please check the configure script
+-for a complete list of supported models.
++compiler should generate code for by default.  @var{cpu}
++will be used as the default value of the @code{-mcpu=} switch.
++This option is only supported on some ports, including arm, i386, powerpc,
++and SPARC@.
++
++@item --with-schedule=@var{cpu}
++@itemx --with-arch=@var{cpu}
++@itemx --with-tune=@var{cpu}
++These configure options provide default values for the @code{-mschedule=},
++@code{-march=}, and @code{-mtune=} options, respectively.  As with
++@code{--with-cpu} the legal values of @var{CPU} depend on the port; these
++options are not valid for all ports, only those which accept the respective
++options.
++
++@item --with-float=@var{type}
++Specify the default form of floating point.  The normal choices are ``hard''
++and ``soft''.  Which (if any) choices are recognized depends on the port;
++for instance, MIPS also recognizes ``single''.
+ 
+ @item --enable-altivec
+ Specify that the target supports AltiVec vector enhancements.  This
+diff -urN gcc-3.2.1/gcc.orig/gcc.c gcc-3.2.1/gcc/gcc.c
+--- gcc-3.2.1/gcc.orig/gcc.c	2002-10-14 15:55:26.000000000 -0600
++++ gcc-3.2.1/gcc/gcc.c	2003-01-15 02:07:46.000000000 -0700
+@@ -1002,6 +1002,139 @@
+  };
+ 
+ 
++static const char *last_option_present PARAMS ((int, const char *const *,
++						const char *))
++  ATTRIBUTE_UNUSED;
++static int option_present PARAMS ((int, const char *const *, const char *))
++  ATTRIBUTE_UNUSED;
++static void add_option PARAMS ((int *, const char *const **, const char *))
++  ATTRIBUTE_UNUSED;
++static void default_options PARAMS ((int *, const char *const **));
++
++static const char *
++last_option_present (argc, argv, option)
++     int argc;
++     const char *const *argv;
++     const char *option;
++{
++  const char *const *cur_arg = &argv[argc - 1];
++
++  while (cur_arg != argv)
++    {
++      if (strncmp (*cur_arg, option, strlen (option)) == 0)
++	return *cur_arg;
++      cur_arg --;
++    }
++
++  return NULL;
++}
++
++static int
++option_present (argc, argv, option)
++     int argc;
++     const char *const *argv;
++     const char *option;
++{
++  int i;
++  int len;
++
++  len = strlen (option);
++
++  for (i = 0; i < argc; i++)
++    if (option[len - 1] == '=')
++      {
++	if (strncmp (argv[i], option, len) == 0)
++	  return 1;
++      }
++    else
++      {
++	if (strcmp (argv[i], option) == 0)
++	  return 1;
++      }
++
++  return 0;
++}
++
++static void
++add_option (argcp, argvp, option)
++     int *argcp;
++     const char *const **argvp;
++     const char *option;
++{
++  const char **newargv = (const char **) xmalloc ((*argcp + 2) * sizeof (char *));
++  int i;
++
++  newargv[0] = (*argvp)[0];
++  newargv[1] = option;
++  for (i = 1; i < *argcp; i++)
++    newargv[i + 1] = (*argvp)[i];
++  newargv[i + 1] = NULL;
++
++  *argvp = newargv;
++  (*argcp)++;
++}
++
++#ifndef TARGET_DEFAULT_ARCH_P
++#define TARGET_DEFAULT_ARCH_P() (! option_present (*argcp, *argvp, "-march="))
++#endif
++
++#ifndef TARGET_DEFAULT_CPU_P
++#define TARGET_DEFAULT_CPU_P() (! option_present (*argcp, *argvp, "-mcpu="))
++#endif
++
++#ifndef TARGET_DEFAULT_SCHEDULE_P
++#define TARGET_DEFAULT_SCHEDULE_P() (! option_present (*argcp, *argvp, \
++						       "-mschedule="))
++#endif
++
++#ifndef TARGET_DEFAULT_TUNE_P
++#define TARGET_DEFAULT_TUNE_P() (! option_present (*argcp, *argvp, "-mtune="))
++#endif
++
++#ifndef TARGET_DEFAULT_FLOAT_P
++#define TARGET_DEFAULT_FLOAT_P() (! option_present (*argcp, *argvp, \
++						    "-msoft-float") \
++				  && ! option_present (*argcp, *argvp, \
++						       "-mhard-float"))
++#endif
++
++static void
++default_options (argcp, argvp)
++     int *argcp ATTRIBUTE_UNUSED;
++     const char *const **argvp ATTRIBUTE_UNUSED;
++{
++#ifdef TARGET_DEFAULT_OPTION_ARCH
++  if (TARGET_DEFAULT_ARCH_P ())
++    add_option (argcp, argvp, concat ("-march=", TARGET_DEFAULT_OPTION_ARCH,
++				      NULL));
++#endif
++
++#ifdef TARGET_DEFAULT_OPTION_CPU
++  if (TARGET_DEFAULT_CPU_P ())
++    add_option (argcp, argvp, concat ("-mcpu=", TARGET_DEFAULT_OPTION_CPU,
++				      NULL));
++#endif
++
++#ifdef TARGET_DEFAULT_OPTION_SCHEDULE
++  if (TARGET_DEFAULT_SCHEDULE_P ())
++    add_option (argcp, argvp, concat ("-mschedule=",
++				      TARGET_DEFAULT_OPTION_SCHEDULE, NULL));
++#endif
++
++#ifdef TARGET_DEFAULT_OPTION_TUNE
++  if (TARGET_DEFAULT_TUNE_P ())
++    add_option (argcp, argvp, concat ("-mtune=", TARGET_DEFAULT_OPTION_TUNE,
++				      NULL));
++#endif
++
++#ifdef TARGET_DEFAULT_OPTION_FLOAT
++  if (TARGET_DEFAULT_FLOAT_P ())
++    add_option (argcp, argvp, concat ("-m", TARGET_DEFAULT_OPTION_FLOAT, "-float",
++				      NULL));
++#endif
++}
++
++
+ #ifdef TARGET_OPTION_TRANSLATE_TABLE
+ static const struct {
+   const char *const option_found;
+@@ -3356,6 +3489,9 @@
+   /* Convert new-style -- options to old-style.  */
+   translate_options (&argc, &argv);
+ 
++  /* Add any default options.  */
++  default_options (&argc, &argv);
++
+   /* Do language-specific adjustment/addition of flags.  */
+   lang_specific_driver (&argc, &argv, &added_libraries);
+