diff --git a/gdb-6.3-warnings-20050317.patch b/gdb-6.3-warnings-20050317.patch
new file mode 100644
index 0000000..549c823
--- /dev/null
+++ b/gdb-6.3-warnings-20050317.patch
@@ -0,0 +1,5313 @@
+--- gdb-6.3/gdb/configure.fix	2005-03-21 18:12:23.000000000 -0500
++++ gdb-6.3/gdb/configure	2005-03-21 18:13:32.000000000 -0500
+@@ -79,7 +79,6 @@ program_suffix=NONE
+ program_transform_name=s,x,x,
+ silent=
+ site=
+-sitefile=
+ srcdir=
+ target=NONE
+ verbose=
+@@ -194,7 +193,6 @@ Configuration:
+   --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
+@@ -365,11 +363,6 @@ EOF
+   -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=*)
+@@ -535,16 +528,12 @@ fi
+ 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
+@@ -585,7 +574,7 @@ fi
+ 
+ 
+ echo $ac_n "checking whether to enable maintainer-specific portions of Makefiles""... $ac_c" 1>&6
+-echo "configure:589: checking whether to enable maintainer-specific portions of Makefiles" >&5
++echo "configure:578: 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"
+@@ -611,7 +600,7 @@ fi
+ # 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:615: checking for $ac_word" >&5
++echo "configure:604: 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
+@@ -641,7 +630,7 @@ if test -z "$CC"; then
+   # 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:645: checking for $ac_word" >&5
++echo "configure:634: 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
+@@ -692,7 +681,7 @@ fi
+       # 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:696: checking for $ac_word" >&5
++echo "configure:685: 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
+@@ -724,7 +713,7 @@ fi
+ fi
+ 
+ echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6
+-echo "configure:728: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
++echo "configure:717: 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.
+@@ -735,12 +724,12 @@ cross_compiling=$ac_cv_prog_cc_cross
+ 
+ cat > conftest.$ac_ext << EOF
+ 
+-#line 739 "configure"
++#line 728 "configure"
+ #include "confdefs.h"
+ 
+ main(){return(0);}
+ EOF
+-if { (eval echo configure:744: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:733: \"$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
+@@ -766,12 +755,12 @@ if test $ac_cv_prog_cc_works = no; then
+   { 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:770: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
++echo "configure:759: 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:775: checking whether we are using GNU C" >&5
++echo "configure:764: 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
+@@ -780,7 +769,7 @@ else
+   yes;
+ #endif
+ EOF
+-if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:784: \"$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:773: \"$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
+@@ -799,7 +788,7 @@ ac_test_CFLAGS="${CFLAGS+set}"
+ ac_save_CFLAGS="$CFLAGS"
+ CFLAGS=
+ echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
+-echo "configure:803: checking whether ${CC-cc} accepts -g" >&5
++echo "configure:792: 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
+@@ -836,7 +825,7 @@ EOF
+ 
+ 
+ echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6
+-echo "configure:840: checking how to run the C preprocessor" >&5
++echo "configure:829: checking how to run the C preprocessor" >&5
+ # On Suns, sometimes $CPP names a directory.
+ if test -n "$CPP" && test -d "$CPP"; then
+   CPP=
+@@ -851,13 +840,13 @@ else
+   # On the NeXT, cc -E runs the code through the compiler's parser,
+   # not just through cpp.
+   cat > conftest.$ac_ext <<EOF
+-#line 855 "configure"
++#line 844 "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:861: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:850: \"$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
+   :
+@@ -868,13 +857,13 @@ else
+   rm -rf conftest*
+   CPP="${CC-cc} -E -traditional-cpp"
+   cat > conftest.$ac_ext <<EOF
+-#line 872 "configure"
++#line 861 "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:878: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:867: \"$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
+   :
+@@ -885,13 +874,13 @@ else
+   rm -rf conftest*
+   CPP="${CC-cc} -nologo -E"
+   cat > conftest.$ac_ext <<EOF
+-#line 889 "configure"
++#line 878 "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:895: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:884: \"$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
+   :
+@@ -916,9 +905,9 @@ fi
+ echo "$ac_t""$CPP" 1>&6
+ 
+ echo $ac_n "checking for AIX""... $ac_c" 1>&6
+-echo "configure:920: checking for AIX" >&5
++echo "configure:909: checking for AIX" >&5
+ cat > conftest.$ac_ext <<EOF
+-#line 922 "configure"
++#line 911 "configure"
+ #include "confdefs.h"
+ #ifdef _AIX
+   yes
+@@ -940,7 +929,7 @@ rm -f conftest*
+ 
+ 
+ echo $ac_n "checking for POSIXized ISC""... $ac_c" 1>&6
+-echo "configure:944: checking for POSIXized ISC" >&5
++echo "configure:933: checking for POSIXized ISC" >&5
+ if test -d /etc/conf/kconfig.d &&
+   grep _POSIX_VERSION /usr/include/sys/unistd.h >/dev/null 2>&1
+ then
+@@ -964,7 +953,7 @@ fi
+ 
+ 
+ echo $ac_n "checking for ${CC-cc} option to accept ANSI C""... $ac_c" 1>&6
+-echo "configure:968: checking for ${CC-cc} option to accept ANSI C" >&5
++echo "configure:957: checking for ${CC-cc} option to accept ANSI C" >&5
+ if eval "test \"`echo '$''{'am_cv_prog_cc_stdc'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -981,7 +970,7 @@ for ac_arg in "" -qlanglvl=ansi -std1 -A
+ do
+   CC="$ac_save_CC $ac_arg"
+   cat > conftest.$ac_ext <<EOF
+-#line 985 "configure"
++#line 974 "configure"
+ #include "confdefs.h"
+ #include <stdarg.h>
+ #include <stdio.h>
+@@ -1018,7 +1007,7 @@ return f (e, argv, 0) != argv[0]  ||  f 
+ 
+ ; return 0; }
+ EOF
+-if { (eval echo configure:1022: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:1011: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+   rm -rf conftest*
+   am_cv_prog_cc_stdc="$ac_arg"; break
+ else
+@@ -1089,7 +1078,7 @@ else { echo "configure: error: can not r
+ fi
+ 
+ echo $ac_n "checking host system type""... $ac_c" 1>&6
+-echo "configure:1093: checking host system type" >&5
++echo "configure:1082: checking host system type" >&5
+ 
+ host_alias=$host
+ case "$host_alias" in
+@@ -1110,7 +1099,7 @@ host_os=`echo $host | sed 's/^\([^-]*\)-
+ echo "$ac_t""$host" 1>&6
+ 
+ echo $ac_n "checking target system type""... $ac_c" 1>&6
+-echo "configure:1114: checking target system type" >&5
++echo "configure:1103: checking target system type" >&5
+ 
+ target_alias=$target
+ case "$target_alias" in
+@@ -1128,7 +1117,7 @@ target_os=`echo $target | sed 's/^\([^-]
+ echo "$ac_t""$target" 1>&6
+ 
+ echo $ac_n "checking build system type""... $ac_c" 1>&6
+-echo "configure:1132: checking build system type" >&5
++echo "configure:1121: checking build system type" >&5
+ 
+ build_alias=$build
+ case "$build_alias" in
+@@ -1166,7 +1155,7 @@ fi
+ # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
+ set dummy ${ac_tool_prefix}ranlib; ac_word=$2
+ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:1170: checking for $ac_word" >&5
++echo "configure:1159: 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
+@@ -1198,7 +1187,7 @@ if test -n "$ac_tool_prefix"; then
+   # 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:1202: checking for $ac_word" >&5
++echo "configure:1191: 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
+@@ -1244,7 +1233,7 @@ CONFIG_UNINSTALL=
+ 
+ 
+ echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6
+-echo "configure:1248: checking whether ${MAKE-make} sets \${MAKE}" >&5
++echo "configure:1237: 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
+@@ -1273,7 +1262,7 @@ fi
+ # 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:1277: checking for $ac_word" >&5
++echo "configure:1266: 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
+@@ -1301,12 +1290,12 @@ else
+ fi
+ 
+ echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6
+-echo "configure:1305: checking for ANSI C header files" >&5
++echo "configure:1294: 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 1310 "configure"
++#line 1299 "configure"
+ #include "confdefs.h"
+ #include <stdlib.h>
+ #include <stdarg.h>
+@@ -1314,7 +1303,7 @@ else
+ #include <float.h>
+ EOF
+ ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+-{ (eval echo configure:1318: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:1307: \"$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*
+@@ -1331,7 +1320,7 @@ rm -f conftest*
+ 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 1335 "configure"
++#line 1324 "configure"
+ #include "confdefs.h"
+ #include <string.h>
+ EOF
+@@ -1349,7 +1338,7 @@ fi
+ 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 1353 "configure"
++#line 1342 "configure"
+ #include "confdefs.h"
+ #include <stdlib.h>
+ EOF
+@@ -1370,7 +1359,7 @@ if test "$cross_compiling" = yes; then
+   :
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 1374 "configure"
++#line 1363 "configure"
+ #include "confdefs.h"
+ #include <ctype.h>
+ #define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
+@@ -1381,7 +1370,7 @@ if (XOR (islower (i), ISLOWER (i)) || to
+ exit (0); }
+ 
+ EOF
+-if { (eval echo configure:1385: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:1374: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+ then
+   :
+ else
+@@ -1405,12 +1394,12 @@ EOF
+ fi
+ 
+ echo $ac_n "checking for working const""... $ac_c" 1>&6
+-echo "configure:1409: checking for working const" >&5
++echo "configure:1398: 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 1414 "configure"
++#line 1403 "configure"
+ #include "confdefs.h"
+ 
+ int main() {
+@@ -1459,7 +1448,7 @@ ccp = (char const *const *) p;
+ 
+ ; return 0; }
+ EOF
+-if { (eval echo configure:1463: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:1452: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+   rm -rf conftest*
+   ac_cv_c_const=yes
+ else
+@@ -1480,21 +1469,21 @@ EOF
+ fi
+ 
+ echo $ac_n "checking for inline""... $ac_c" 1>&6
+-echo "configure:1484: checking for inline" >&5
++echo "configure:1473: 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 1491 "configure"
++#line 1480 "configure"
+ #include "confdefs.h"
+ 
+ int main() {
+ } $ac_kw foo() {
+ ; return 0; }
+ EOF
+-if { (eval echo configure:1498: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:1487: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+   rm -rf conftest*
+   ac_cv_c_inline=$ac_kw; break
+ else
+@@ -1520,12 +1509,12 @@ EOF
+ esac
+ 
+ echo $ac_n "checking for off_t""... $ac_c" 1>&6
+-echo "configure:1524: checking for off_t" >&5
++echo "configure:1513: 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 1529 "configure"
++#line 1518 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ #if STDC_HEADERS
+@@ -1553,12 +1542,12 @@ EOF
+ fi
+ 
+ echo $ac_n "checking for size_t""... $ac_c" 1>&6
+-echo "configure:1557: checking for size_t" >&5
++echo "configure:1546: 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 1562 "configure"
++#line 1551 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ #if STDC_HEADERS
+@@ -1588,19 +1577,19 @@ fi
+ # 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:1592: checking for working alloca.h" >&5
++echo "configure:1581: 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 1597 "configure"
++#line 1586 "configure"
+ #include "confdefs.h"
+ #include <alloca.h>
+ int main() {
+ char *p = alloca(2 * sizeof(int));
+ ; return 0; }
+ EOF
+-if { (eval echo configure:1604: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:1593: \"$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
+@@ -1621,12 +1610,12 @@ EOF
+ fi
+ 
+ echo $ac_n "checking for alloca""... $ac_c" 1>&6
+-echo "configure:1625: checking for alloca" >&5
++echo "configure:1614: 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 1630 "configure"
++#line 1619 "configure"
+ #include "confdefs.h"
+ 
+ #ifdef __GNUC__
+@@ -1654,7 +1643,7 @@ int main() {
+ char *p = (char *) alloca(1);
+ ; return 0; }
+ EOF
+-if { (eval echo configure:1658: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:1647: \"$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
+@@ -1686,12 +1675,12 @@ EOF
+ 
+ 
+ echo $ac_n "checking whether alloca needs Cray hooks""... $ac_c" 1>&6
+-echo "configure:1690: checking whether alloca needs Cray hooks" >&5
++echo "configure:1679: 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 1695 "configure"
++#line 1684 "configure"
+ #include "confdefs.h"
+ #if defined(CRAY) && ! defined(CRAY2)
+ webecray
+@@ -1716,12 +1705,12 @@ echo "$ac_t""$ac_cv_os_cray" 1>&6
+ 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:1720: checking for $ac_func" >&5
++echo "configure:1709: 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 1725 "configure"
++#line 1714 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char $ac_func(); below.  */
+@@ -1744,7 +1733,7 @@ $ac_func();
+ 
+ ; return 0; }
+ EOF
+-if { (eval echo configure:1748: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:1737: \"$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
+@@ -1771,7 +1760,7 @@ done
+ fi
+ 
+ echo $ac_n "checking stack direction for C alloca""... $ac_c" 1>&6
+-echo "configure:1775: checking stack direction for C alloca" >&5
++echo "configure:1764: 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
+@@ -1779,7 +1768,7 @@ else
+   ac_cv_c_stack_direction=0
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 1783 "configure"
++#line 1772 "configure"
+ #include "confdefs.h"
+ find_stack_direction ()
+ {
+@@ -1798,7 +1787,7 @@ main ()
+   exit (find_stack_direction() < 0);
+ }
+ EOF
+-if { (eval echo configure:1802: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:1791: \"$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
+@@ -1823,17 +1812,17 @@ for ac_hdr in unistd.h
+ do
+ ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
+ echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
+-echo "configure:1827: checking for $ac_hdr" >&5
++echo "configure:1816: 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 1832 "configure"
++#line 1821 "configure"
+ #include "confdefs.h"
+ #include <$ac_hdr>
+ EOF
+ ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+-{ (eval echo configure:1837: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:1826: \"$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*
+@@ -1862,12 +1851,12 @@ done
+ for ac_func in getpagesize
+ do
+ echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
+-echo "configure:1866: checking for $ac_func" >&5
++echo "configure:1855: 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 1871 "configure"
++#line 1860 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char $ac_func(); below.  */
+@@ -1890,7 +1879,7 @@ $ac_func();
+ 
+ ; return 0; }
+ EOF
+-if { (eval echo configure:1894: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:1883: \"$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
+@@ -1915,7 +1904,7 @@ fi
+ done
+ 
+ echo $ac_n "checking for working mmap""... $ac_c" 1>&6
+-echo "configure:1919: checking for working mmap" >&5
++echo "configure:1908: checking for working mmap" >&5
+ if eval "test \"`echo '$''{'ac_cv_func_mmap_fixed_mapped'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -1923,7 +1912,7 @@ else
+   ac_cv_func_mmap_fixed_mapped=no
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 1927 "configure"
++#line 1916 "configure"
+ #include "confdefs.h"
+ 
+ /* Thanks to Mike Haertel and Jim Avera for this test.
+@@ -2063,7 +2052,7 @@ main()
+ }
+ 
+ EOF
+-if { (eval echo configure:2067: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:2056: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+ then
+   ac_cv_func_mmap_fixed_mapped=yes
+ else
+@@ -2091,17 +2080,17 @@ unistd.h values.h sys/param.h
+ do
+ ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
+ echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
+-echo "configure:2095: checking for $ac_hdr" >&5
++echo "configure:2084: 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 2100 "configure"
++#line 2089 "configure"
+ #include "confdefs.h"
+ #include <$ac_hdr>
+ EOF
+ ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+-{ (eval echo configure:2105: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:2094: \"$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*
+@@ -2131,12 +2120,12 @@ done
+ __argz_count __argz_stringify __argz_next
+ do
+ echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
+-echo "configure:2135: checking for $ac_func" >&5
++echo "configure:2124: 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 2140 "configure"
++#line 2129 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char $ac_func(); below.  */
+@@ -2159,7 +2148,7 @@ $ac_func();
+ 
+ ; return 0; }
+ EOF
+-if { (eval echo configure:2163: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:2152: \"$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
+@@ -2188,12 +2177,12 @@ done
+      for ac_func in stpcpy
+ do
+ echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
+-echo "configure:2192: checking for $ac_func" >&5
++echo "configure:2181: 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 2197 "configure"
++#line 2186 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char $ac_func(); below.  */
+@@ -2216,7 +2205,7 @@ $ac_func();
+ 
+ ; return 0; }
+ EOF
+-if { (eval echo configure:2220: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:2209: \"$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
+@@ -2250,19 +2239,19 @@ EOF
+ 
+    if test $ac_cv_header_locale_h = yes; then
+     echo $ac_n "checking for LC_MESSAGES""... $ac_c" 1>&6
+-echo "configure:2254: checking for LC_MESSAGES" >&5
++echo "configure:2243: 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 2259 "configure"
++#line 2248 "configure"
+ #include "confdefs.h"
+ #include <locale.h>
+ int main() {
+ return LC_MESSAGES
+ ; return 0; }
+ EOF
+-if { (eval echo configure:2266: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:2255: \"$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
+@@ -2283,7 +2272,7 @@ EOF
+     fi
+   fi
+    echo $ac_n "checking whether NLS is requested""... $ac_c" 1>&6
+-echo "configure:2287: checking whether NLS is requested" >&5
++echo "configure:2276: 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"
+@@ -2303,7 +2292,7 @@ fi
+ EOF
+ 
+       echo $ac_n "checking whether included gettext is requested""... $ac_c" 1>&6
+-echo "configure:2307: checking whether included gettext is requested" >&5
++echo "configure:2296: 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"
+@@ -2322,17 +2311,17 @@ fi
+ 
+ 	ac_safe=`echo "libintl.h" | sed 'y%./+-%__p_%'`
+ echo $ac_n "checking for libintl.h""... $ac_c" 1>&6
+-echo "configure:2326: checking for libintl.h" >&5
++echo "configure:2315: 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 2331 "configure"
++#line 2320 "configure"
+ #include "confdefs.h"
+ #include <libintl.h>
+ EOF
+ ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+-{ (eval echo configure:2336: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:2325: \"$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*
+@@ -2349,19 +2338,19 @@ fi
+ if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
+   echo "$ac_t""yes" 1>&6
+   echo $ac_n "checking for gettext in libc""... $ac_c" 1>&6
+-echo "configure:2353: checking for gettext in libc" >&5
++echo "configure:2342: checking for gettext in libc" >&5
+ if eval "test \"`echo '$''{'gt_cv_func_gettext_libc'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 2358 "configure"
++#line 2347 "configure"
+ #include "confdefs.h"
+ #include <libintl.h>
+ int main() {
+ return (int) gettext ("")
+ ; return 0; }
+ EOF
+-if { (eval echo configure:2365: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:2354: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   gt_cv_func_gettext_libc=yes
+ else
+@@ -2377,7 +2366,7 @@ echo "$ac_t""$gt_cv_func_gettext_libc" 1
+ 
+ 	   if test "$gt_cv_func_gettext_libc" != "yes"; then
+ 	     echo $ac_n "checking for bindtextdomain in -lintl""... $ac_c" 1>&6
+-echo "configure:2381: checking for bindtextdomain in -lintl" >&5
++echo "configure:2370: checking for bindtextdomain in -lintl" >&5
+ ac_lib_var=`echo intl'_'bindtextdomain | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+@@ -2385,7 +2374,7 @@ else
+   ac_save_LIBS="$LIBS"
+ LIBS="-lintl  $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 2389 "configure"
++#line 2378 "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
+@@ -2396,7 +2385,7 @@ int main() {
+ bindtextdomain()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:2400: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:2389: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_lib_$ac_lib_var=yes"
+ else
+@@ -2412,19 +2401,19 @@ fi
+ if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+   echo "$ac_t""yes" 1>&6
+   echo $ac_n "checking for gettext in libintl""... $ac_c" 1>&6
+-echo "configure:2416: checking for gettext in libintl" >&5
++echo "configure:2405: checking for gettext in libintl" >&5
+ if eval "test \"`echo '$''{'gt_cv_func_gettext_libintl'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 2421 "configure"
++#line 2410 "configure"
+ #include "confdefs.h"
+ 
+ int main() {
+ return (int) gettext ("")
+ ; return 0; }
+ EOF
+-if { (eval echo configure:2428: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:2417: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   gt_cv_func_gettext_libintl=yes
+ else
+@@ -2452,7 +2441,7 @@ EOF
+ 	      # 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:2456: checking for $ac_word" >&5
++echo "configure:2445: 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
+@@ -2486,12 +2475,12 @@ fi
+ 		for ac_func in dcgettext
+ do
+ echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
+-echo "configure:2490: checking for $ac_func" >&5
++echo "configure:2479: 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 2495 "configure"
++#line 2484 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char $ac_func(); below.  */
+@@ -2514,7 +2503,7 @@ $ac_func();
+ 
+ ; return 0; }
+ EOF
+-if { (eval echo configure:2518: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:2507: \"$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
+@@ -2541,7 +2530,7 @@ done
+ 		# 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:2545: checking for $ac_word" >&5
++echo "configure:2534: 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
+@@ -2577,7 +2566,7 @@ fi
+ 		# 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:2581: checking for $ac_word" >&5
++echo "configure:2570: 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
+@@ -2609,7 +2598,7 @@ else
+ fi
+ 
+ 		cat > conftest.$ac_ext <<EOF
+-#line 2613 "configure"
++#line 2602 "configure"
+ #include "confdefs.h"
+ 
+ int main() {
+@@ -2617,7 +2606,7 @@ extern int _nl_msg_cat_cntr;
+ 			       return _nl_msg_cat_cntr
+ ; return 0; }
+ EOF
+-if { (eval echo configure:2621: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:2610: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   CATOBJEXT=.gmo
+ 		   DATADIRNAME=share
+@@ -2649,7 +2638,7 @@ fi
+         # 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:2653: checking for $ac_word" >&5
++echo "configure:2642: 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
+@@ -2683,7 +2672,7 @@ fi
+         # 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:2687: checking for $ac_word" >&5
++echo "configure:2676: 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
+@@ -2719,7 +2708,7 @@ fi
+         # 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:2723: checking for $ac_word" >&5
++echo "configure:2712: 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
+@@ -2809,7 +2798,7 @@ fi
+        LINGUAS=
+      else
+        echo $ac_n "checking for catalogs to be installed""... $ac_c" 1>&6
+-echo "configure:2813: checking for catalogs to be installed" >&5
++echo "configure:2802: checking for catalogs to be installed" >&5
+        NEW_LINGUAS=
+        for lang in ${LINGUAS=$ALL_LINGUAS}; do
+          case "$ALL_LINGUAS" in
+@@ -2837,17 +2826,17 @@ echo "configure:2813: checking for catal
+       if test "$CATOBJEXT" = ".cat"; then
+ 	 ac_safe=`echo "linux/version.h" | sed 'y%./+-%__p_%'`
+ echo $ac_n "checking for linux/version.h""... $ac_c" 1>&6
+-echo "configure:2841: checking for linux/version.h" >&5
++echo "configure:2830: checking for linux/version.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 2846 "configure"
++#line 2835 "configure"
+ #include "confdefs.h"
+ #include <linux/version.h>
+ EOF
+ ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+-{ (eval echo configure:2851: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:2840: \"$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*
+@@ -2915,7 +2904,7 @@ localedir='${datadir}/locale'
+ if test "x$POSUB" != x; then
+ 
+     echo $ac_n "checking for catalogs to be installed""... $ac_c" 1>&6
+-echo "configure:2919: checking for catalogs to be installed" >&5
++echo "configure:2908: checking for catalogs to be installed" >&5
+   # Look for .po and .gmo files in the source directory.
+   CATALOGS=  
+   XLINGUAS=
+@@ -3135,17 +3124,17 @@ else
+ do
+ ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
+ echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
+-echo "configure:3139: checking for $ac_hdr" >&5
++echo "configure:3128: 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 3144 "configure"
++#line 3133 "configure"
+ #include "confdefs.h"
+ #include <$ac_hdr>
+ EOF
+ ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+-{ (eval echo configure:3149: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:3138: \"$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*
+@@ -3175,17 +3164,17 @@ done
+ do
+ ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
+ echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
+-echo "configure:3179: checking for $ac_hdr" >&5
++echo "configure:3168: 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 3184 "configure"
++#line 3173 "configure"
+ #include "confdefs.h"
+ #include <$ac_hdr>
+ EOF
+ ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+-{ (eval echo configure:3189: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:3178: \"$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*
+@@ -3223,17 +3212,17 @@ if test x"$enable_libunwind" = xyes; the
+ do
+ ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
+ echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
+-echo "configure:3227: checking for $ac_hdr" >&5
++echo "configure:3216: 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 3232 "configure"
++#line 3221 "configure"
+ #include "confdefs.h"
+ #include <$ac_hdr>
+ EOF
+ ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+-{ (eval echo configure:3237: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:3226: \"$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*
+@@ -3263,17 +3252,17 @@ done
+ do
+ ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
+ echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
+-echo "configure:3267: checking for $ac_hdr" >&5
++echo "configure:3256: 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 3272 "configure"
++#line 3261 "configure"
+ #include "confdefs.h"
+ #include <$ac_hdr>
+ EOF
+ ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+-{ (eval echo configure:3277: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:3266: \"$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*
+@@ -3326,12 +3315,12 @@ fi
+ for ac_func in monstartup _mcleanup
+ do
+ echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
+-echo "configure:3330: checking for $ac_func" >&5
++echo "configure:3319: 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 3335 "configure"
++#line 3324 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char $ac_func(); below.  */
+@@ -3354,7 +3343,7 @@ $ac_func();
+ 
+ ; return 0; }
+ EOF
+-if { (eval echo configure:3358: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:3347: \"$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
+@@ -3379,12 +3368,12 @@ fi
+ done
+ 
+ echo $ac_n "checking for _etext""... $ac_c" 1>&6
+-echo "configure:3383: checking for _etext" >&5
++echo "configure:3372: checking for _etext" >&5
+ if eval "test \"`echo '$''{'ac_cv_var__etext'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 3388 "configure"
++#line 3377 "configure"
+ #include "confdefs.h"
+ #include <stdlib.h>
+ extern char _etext;
+@@ -3393,7 +3382,7 @@ int main() {
+ free (&_etext);
+ ; return 0; }
+ EOF
+-if { (eval echo configure:3397: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:3386: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   ac_cv_var__etext=yes
+ else
+@@ -3421,19 +3410,19 @@ if test "$enable_profiling" = yes ; then
+   CFLAGS="$CFLAGS $PROFILE_CFLAGS"
+ 
+   echo $ac_n "checking whether $CC supports -pg""... $ac_c" 1>&6
+-echo "configure:3425: checking whether $CC supports -pg" >&5
++echo "configure:3414: checking whether $CC supports -pg" >&5
+ if eval "test \"`echo '$''{'ac_cv_cc_supports_pg'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 3430 "configure"
++#line 3419 "configure"
+ #include "confdefs.h"
+ 
+ int main() {
+ int x;
+ ; return 0; }
+ EOF
+-if { (eval echo configure:3437: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:3426: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+   rm -rf conftest*
+   ac_cv_cc_supports_pg=yes
+ else
+@@ -3463,7 +3452,7 @@ do
+ # 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:3467: checking for $ac_word" >&5
++echo "configure:3456: 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
+@@ -3504,7 +3493,7 @@ done
+ # 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:3508: checking for a BSD compatible install" >&5
++echo "configure:3497: 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
+@@ -3557,7 +3546,7 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCR
+ test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
+ 
+ echo $ac_n "checking whether ln -s works""... $ac_c" 1>&6
+-echo "configure:3561: checking whether ln -s works" >&5
++echo "configure:3550: checking whether ln -s works" >&5
+ if eval "test \"`echo '$''{'ac_cv_prog_LN_S'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -3580,7 +3569,7 @@ fi
+ # 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:3584: checking for $ac_word" >&5
++echo "configure:3573: 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
+@@ -3612,7 +3601,7 @@ do
+ # 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:3616: checking for $ac_word" >&5
++echo "configure:3605: checking for $ac_word" >&5
+ if eval "test \"`echo '$''{'ac_cv_prog_YACC'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -3646,7 +3635,7 @@ test -n "$YACC" || YACC="yacc"
+ # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
+ set dummy ${ac_tool_prefix}ar; ac_word=$2
+ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:3650: checking for $ac_word" >&5
++echo "configure:3639: checking for $ac_word" >&5
+ if eval "test \"`echo '$''{'ac_cv_prog_AR'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -3678,7 +3667,7 @@ fi
+ # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args.
+ set dummy ${ac_tool_prefix}dlltool; ac_word=$2
+ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:3682: checking for $ac_word" >&5
++echo "configure:3671: checking for $ac_word" >&5
+ if eval "test \"`echo '$''{'ac_cv_prog_DLLTOOL'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -3710,7 +3699,7 @@ fi
+ # Extract the first word of "${ac_tool_prefix}windres", so it can be a program name with args.
+ set dummy ${ac_tool_prefix}windres; ac_word=$2
+ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:3714: checking for $ac_word" >&5
++echo "configure:3703: checking for $ac_word" >&5
+ if eval "test \"`echo '$''{'ac_cv_prog_WINDRES'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -3744,7 +3733,7 @@ fi
+ # Extract the first word of "${ac_tool_prefix}mig", so it can be a program name with args.
+ set dummy ${ac_tool_prefix}mig; ac_word=$2
+ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:3748: checking for $ac_word" >&5
++echo "configure:3737: checking for $ac_word" >&5
+ if eval "test \"`echo '$''{'ac_cv_prog_MIG'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -3780,7 +3769,7 @@ fi
+ 
+ # We might need to link with -lm; most simulators need it.
+ echo $ac_n "checking for main in -lm""... $ac_c" 1>&6
+-echo "configure:3784: checking for main in -lm" >&5
++echo "configure:3773: checking for main in -lm" >&5
+ ac_lib_var=`echo m'_'main | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+@@ -3788,14 +3777,14 @@ else
+   ac_save_LIBS="$LIBS"
+ LIBS="-lm  $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 3792 "configure"
++#line 3781 "configure"
+ #include "confdefs.h"
+ 
+ int main() {
+ main()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:3799: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:3788: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_lib_$ac_lib_var=yes"
+ else
+@@ -3828,12 +3817,12 @@ fi
+ # libw that some versions of the GNU linker cannot hanle (GNU ld 2.9.1
+ # is known to have this problem).  Therefore we avoid libw if we can.
+ echo $ac_n "checking for wctype""... $ac_c" 1>&6
+-echo "configure:3832: checking for wctype" >&5
++echo "configure:3821: checking for wctype" >&5
+ if eval "test \"`echo '$''{'ac_cv_func_wctype'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 3837 "configure"
++#line 3826 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char wctype(); below.  */
+@@ -3856,7 +3845,7 @@ wctype();
+ 
+ ; return 0; }
+ EOF
+-if { (eval echo configure:3860: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:3849: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_func_wctype=yes"
+ else
+@@ -3874,7 +3863,7 @@ if eval "test \"`echo '$ac_cv_func_'wcty
+ else
+   echo "$ac_t""no" 1>&6
+ echo $ac_n "checking for wctype in -lw""... $ac_c" 1>&6
+-echo "configure:3878: checking for wctype in -lw" >&5
++echo "configure:3867: checking for wctype in -lw" >&5
+ ac_lib_var=`echo w'_'wctype | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+@@ -3882,7 +3871,7 @@ else
+   ac_save_LIBS="$LIBS"
+ LIBS="-lw  $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 3886 "configure"
++#line 3875 "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
+@@ -3893,7 +3882,7 @@ int main() {
+ wctype()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:3897: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:3886: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_lib_$ac_lib_var=yes"
+ else
+@@ -3926,14 +3915,14 @@ fi
+ # Some systems (e.g. Solaris) have `gethostbyname' in libnsl.
+ 
+ echo $ac_n "checking for library containing gethostbyname""... $ac_c" 1>&6
+-echo "configure:3930: checking for library containing gethostbyname" >&5
++echo "configure:3919: checking for library containing gethostbyname" >&5
+ if eval "test \"`echo '$''{'ac_cv_search_gethostbyname'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   ac_func_search_save_LIBS="$LIBS"
+ ac_cv_search_gethostbyname="no"
+ cat > conftest.$ac_ext <<EOF
+-#line 3937 "configure"
++#line 3926 "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
+@@ -3944,7 +3933,7 @@ int main() {
+ gethostbyname()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:3948: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:3937: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   ac_cv_search_gethostbyname="none required"
+ else
+@@ -3955,7 +3944,7 @@ rm -f conftest*
+ test "$ac_cv_search_gethostbyname" = "no" && for i in nsl; do
+ LIBS="-l$i  $ac_func_search_save_LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 3959 "configure"
++#line 3948 "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
+@@ -3966,7 +3955,7 @@ int main() {
+ gethostbyname()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:3970: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:3959: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   ac_cv_search_gethostbyname="-l$i"
+ break
+@@ -3990,14 +3979,14 @@ fi
+ # Some systems (e.g. Solaris) have `socketpair' in libsocket.
+ 
+ echo $ac_n "checking for library containing socketpair""... $ac_c" 1>&6
+-echo "configure:3994: checking for library containing socketpair" >&5
++echo "configure:3983: checking for library containing socketpair" >&5
+ if eval "test \"`echo '$''{'ac_cv_search_socketpair'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   ac_func_search_save_LIBS="$LIBS"
+ ac_cv_search_socketpair="no"
+ cat > conftest.$ac_ext <<EOF
+-#line 4001 "configure"
++#line 3990 "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
+@@ -4008,7 +3997,7 @@ int main() {
+ socketpair()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:4012: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:4001: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   ac_cv_search_socketpair="none required"
+ else
+@@ -4019,7 +4008,7 @@ rm -f conftest*
+ test "$ac_cv_search_socketpair" = "no" && for i in socket; do
+ LIBS="-l$i  $ac_func_search_save_LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 4023 "configure"
++#line 4012 "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
+@@ -4030,7 +4019,7 @@ int main() {
+ socketpair()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:4034: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:4023: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   ac_cv_search_socketpair="-l$i"
+ break
+@@ -4062,14 +4051,14 @@ fi
+ # a situation.
+ 
+ echo $ac_n "checking for library containing waddstr""... $ac_c" 1>&6
+-echo "configure:4066: checking for library containing waddstr" >&5
++echo "configure:4055: checking for library containing waddstr" >&5
+ if eval "test \"`echo '$''{'ac_cv_search_waddstr'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   ac_func_search_save_LIBS="$LIBS"
+ ac_cv_search_waddstr="no"
+ cat > conftest.$ac_ext <<EOF
+-#line 4073 "configure"
++#line 4062 "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
+@@ -4080,7 +4069,7 @@ int main() {
+ waddstr()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:4084: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:4073: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   ac_cv_search_waddstr="none required"
+ else
+@@ -4091,7 +4080,7 @@ rm -f conftest*
+ test "$ac_cv_search_waddstr" = "no" && for i in ncurses cursesX curses; do
+ LIBS="-l$i  $ac_func_search_save_LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 4095 "configure"
++#line 4084 "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
+@@ -4102,7 +4091,7 @@ int main() {
+ waddstr()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:4106: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:4095: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   ac_cv_search_waddstr="-l$i"
+ break
+@@ -4141,14 +4130,14 @@ esac
+ # These are the libraries checked by Readline.
+ 
+ echo $ac_n "checking for library containing tgetent""... $ac_c" 1>&6
+-echo "configure:4145: checking for library containing tgetent" >&5
++echo "configure:4134: checking for library containing tgetent" >&5
+ if eval "test \"`echo '$''{'ac_cv_search_tgetent'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   ac_func_search_save_LIBS="$LIBS"
+ ac_cv_search_tgetent="no"
+ cat > conftest.$ac_ext <<EOF
+-#line 4152 "configure"
++#line 4141 "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
+@@ -4159,7 +4148,7 @@ int main() {
+ tgetent()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:4163: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:4152: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   ac_cv_search_tgetent="none required"
+ else
+@@ -4170,7 +4159,7 @@ rm -f conftest*
+ test "$ac_cv_search_tgetent" = "no" && for i in termcap tinfo curses ncurses; do
+ LIBS="-l$i  $ac_func_search_save_LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 4174 "configure"
++#line 4163 "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
+@@ -4181,7 +4170,7 @@ int main() {
+ tgetent()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:4185: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:4174: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   ac_cv_search_tgetent="-l$i"
+ break
+@@ -4215,12 +4204,12 @@ for ac_hdr in dirent.h sys/ndir.h sys/di
+ do
+ ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
+ echo $ac_n "checking for $ac_hdr that defines DIR""... $ac_c" 1>&6
+-echo "configure:4219: checking for $ac_hdr that defines DIR" >&5
++echo "configure:4208: checking for $ac_hdr that defines DIR" >&5
+ if eval "test \"`echo '$''{'ac_cv_header_dirent_$ac_safe'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 4224 "configure"
++#line 4213 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ #include <$ac_hdr>
+@@ -4228,7 +4217,7 @@ int main() {
+ DIR *dirp = 0;
+ ; return 0; }
+ EOF
+-if { (eval echo configure:4232: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:4221: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+   rm -rf conftest*
+   eval "ac_cv_header_dirent_$ac_safe=yes"
+ else
+@@ -4253,7 +4242,7 @@ done
+ # Two versions of opendir et al. are in -ldir and -lx on SCO Xenix.
+ if test $ac_header_dirent = dirent.h; then
+ echo $ac_n "checking for opendir in -ldir""... $ac_c" 1>&6
+-echo "configure:4257: checking for opendir in -ldir" >&5
++echo "configure:4246: checking for opendir in -ldir" >&5
+ ac_lib_var=`echo dir'_'opendir | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+@@ -4261,7 +4250,7 @@ else
+   ac_save_LIBS="$LIBS"
+ LIBS="-ldir  $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 4265 "configure"
++#line 4254 "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
+@@ -4272,7 +4261,7 @@ int main() {
+ opendir()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:4276: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:4265: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_lib_$ac_lib_var=yes"
+ else
+@@ -4294,7 +4283,7 @@ fi
+ 
+ else
+ echo $ac_n "checking for opendir in -lx""... $ac_c" 1>&6
+-echo "configure:4298: checking for opendir in -lx" >&5
++echo "configure:4287: checking for opendir in -lx" >&5
+ ac_lib_var=`echo x'_'opendir | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+@@ -4302,7 +4291,7 @@ else
+   ac_save_LIBS="$LIBS"
+ LIBS="-lx  $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 4306 "configure"
++#line 4295 "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
+@@ -4313,7 +4302,7 @@ int main() {
+ opendir()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:4317: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:4306: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_lib_$ac_lib_var=yes"
+ else
+@@ -4336,12 +4325,12 @@ fi
+ fi
+ 
+ echo $ac_n "checking whether stat file-mode macros are broken""... $ac_c" 1>&6
+-echo "configure:4340: checking whether stat file-mode macros are broken" >&5
++echo "configure:4329: checking whether stat file-mode macros are broken" >&5
+ if eval "test \"`echo '$''{'ac_cv_header_stat_broken'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 4345 "configure"
++#line 4334 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ #include <sys/stat.h>
+@@ -4392,12 +4381,12 @@ EOF
+ fi
+ 
+ echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6
+-echo "configure:4396: checking for ANSI C header files" >&5
++echo "configure:4385: 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 4401 "configure"
++#line 4390 "configure"
+ #include "confdefs.h"
+ #include <stdlib.h>
+ #include <stdarg.h>
+@@ -4405,7 +4394,7 @@ else
+ #include <float.h>
+ EOF
+ ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+-{ (eval echo configure:4409: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:4398: \"$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*
+@@ -4422,7 +4411,7 @@ rm -f conftest*
+ 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 4426 "configure"
++#line 4415 "configure"
+ #include "confdefs.h"
+ #include <string.h>
+ EOF
+@@ -4440,7 +4429,7 @@ fi
+ 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 4444 "configure"
++#line 4433 "configure"
+ #include "confdefs.h"
+ #include <stdlib.h>
+ EOF
+@@ -4461,7 +4450,7 @@ if test "$cross_compiling" = yes; then
+   :
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 4465 "configure"
++#line 4454 "configure"
+ #include "confdefs.h"
+ #include <ctype.h>
+ #define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
+@@ -4472,7 +4461,7 @@ if (XOR (islower (i), ISLOWER (i)) || to
+ exit (0); }
+ 
+ EOF
+-if { (eval echo configure:4476: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:4465: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+ then
+   :
+ else
+@@ -4499,17 +4488,17 @@ for ac_hdr in link.h
+ do
+ ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
+ echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
+-echo "configure:4503: checking for $ac_hdr" >&5
++echo "configure:4492: 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 4508 "configure"
++#line 4497 "configure"
+ #include "confdefs.h"
+ #include <$ac_hdr>
+ EOF
+ ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+-{ (eval echo configure:4513: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:4502: \"$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*
+@@ -4539,17 +4528,17 @@ for ac_hdr in machine/reg.h
+ do
+ ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
+ echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
+-echo "configure:4543: checking for $ac_hdr" >&5
++echo "configure:4532: 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 4548 "configure"
++#line 4537 "configure"
+ #include "confdefs.h"
+ #include <$ac_hdr>
+ EOF
+ ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+-{ (eval echo configure:4553: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:4542: \"$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*
+@@ -4579,17 +4568,17 @@ for ac_hdr in nlist.h
+ do
+ ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
+ echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
+-echo "configure:4583: checking for $ac_hdr" >&5
++echo "configure:4572: 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 4588 "configure"
++#line 4577 "configure"
+ #include "confdefs.h"
+ #include <$ac_hdr>
+ EOF
+ ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+-{ (eval echo configure:4593: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:4582: \"$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*
+@@ -4619,17 +4608,17 @@ for ac_hdr in poll.h sys/poll.h
+ do
+ ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
+ echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
+-echo "configure:4623: checking for $ac_hdr" >&5
++echo "configure:4612: 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 4628 "configure"
++#line 4617 "configure"
+ #include "confdefs.h"
+ #include <$ac_hdr>
+ EOF
+ ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+-{ (eval echo configure:4633: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:4622: \"$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*
+@@ -4659,17 +4648,17 @@ for ac_hdr in proc_service.h thread_db.h
+ do
+ ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
+ echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
+-echo "configure:4663: checking for $ac_hdr" >&5
++echo "configure:4652: 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 4668 "configure"
++#line 4657 "configure"
+ #include "confdefs.h"
+ #include <$ac_hdr>
+ EOF
+ ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+-{ (eval echo configure:4673: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:4662: \"$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*
+@@ -4699,17 +4688,17 @@ for ac_hdr in stddef.h
+ do
+ ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
+ echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
+-echo "configure:4703: checking for $ac_hdr" >&5
++echo "configure:4692: 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 4708 "configure"
++#line 4697 "configure"
+ #include "confdefs.h"
+ #include <$ac_hdr>
+ EOF
+ ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+-{ (eval echo configure:4713: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:4702: \"$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*
+@@ -4739,17 +4728,17 @@ for ac_hdr in stdlib.h
+ do
+ ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
+ echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
+-echo "configure:4743: checking for $ac_hdr" >&5
++echo "configure:4732: 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 4748 "configure"
++#line 4737 "configure"
+ #include "confdefs.h"
+ #include <$ac_hdr>
+ EOF
+ ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+-{ (eval echo configure:4753: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:4742: \"$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*
+@@ -4779,17 +4768,17 @@ for ac_hdr in stdint.h
+ do
+ ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
+ echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
+-echo "configure:4783: checking for $ac_hdr" >&5
++echo "configure:4772: 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 4788 "configure"
++#line 4777 "configure"
+ #include "confdefs.h"
+ #include <$ac_hdr>
+ EOF
+ ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+-{ (eval echo configure:4793: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:4782: \"$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*
+@@ -4819,17 +4808,17 @@ for ac_hdr in string.h memory.h strings.
+ do
+ ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
+ echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
+-echo "configure:4823: checking for $ac_hdr" >&5
++echo "configure:4812: 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 4828 "configure"
++#line 4817 "configure"
+ #include "confdefs.h"
+ #include <$ac_hdr>
+ EOF
+ ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+-{ (eval echo configure:4833: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:4822: \"$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*
+@@ -4859,17 +4848,17 @@ for ac_hdr in sys/fault.h
+ do
+ ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
+ echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
+-echo "configure:4863: checking for $ac_hdr" >&5
++echo "configure:4852: 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 4868 "configure"
++#line 4857 "configure"
+ #include "confdefs.h"
+ #include <$ac_hdr>
+ EOF
+ ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+-{ (eval echo configure:4873: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:4862: \"$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*
+@@ -4899,17 +4888,17 @@ for ac_hdr in sys/file.h
+ do
+ ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
+ echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
+-echo "configure:4903: checking for $ac_hdr" >&5
++echo "configure:4892: 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 4908 "configure"
++#line 4897 "configure"
+ #include "confdefs.h"
+ #include <$ac_hdr>
+ EOF
+ ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+-{ (eval echo configure:4913: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:4902: \"$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*
+@@ -4939,17 +4928,17 @@ for ac_hdr in sys/filio.h
+ do
+ ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
+ echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
+-echo "configure:4943: checking for $ac_hdr" >&5
++echo "configure:4932: 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 4948 "configure"
++#line 4937 "configure"
+ #include "confdefs.h"
+ #include <$ac_hdr>
+ EOF
+ ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+-{ (eval echo configure:4953: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:4942: \"$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*
+@@ -4979,17 +4968,17 @@ for ac_hdr in sys/ioctl.h
+ do
+ ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
+ echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
+-echo "configure:4983: checking for $ac_hdr" >&5
++echo "configure:4972: 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 4988 "configure"
++#line 4977 "configure"
+ #include "confdefs.h"
+ #include <$ac_hdr>
+ EOF
+ ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+-{ (eval echo configure:4993: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:4982: \"$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*
+@@ -5019,17 +5008,17 @@ for ac_hdr in sys/param.h
+ do
+ ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
+ echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
+-echo "configure:5023: checking for $ac_hdr" >&5
++echo "configure:5012: 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 5028 "configure"
++#line 5017 "configure"
+ #include "confdefs.h"
+ #include <$ac_hdr>
+ EOF
+ ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+-{ (eval echo configure:5033: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:5022: \"$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*
+@@ -5059,17 +5048,17 @@ for ac_hdr in sys/proc.h
+ do
+ ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
+ echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
+-echo "configure:5063: checking for $ac_hdr" >&5
++echo "configure:5052: 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 5068 "configure"
++#line 5057 "configure"
+ #include "confdefs.h"
+ #include <$ac_hdr>
+ EOF
+ ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+-{ (eval echo configure:5073: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:5062: \"$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*
+@@ -5099,17 +5088,17 @@ for ac_hdr in sys/procfs.h
+ do
+ ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
+ echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
+-echo "configure:5103: checking for $ac_hdr" >&5
++echo "configure:5092: 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 5108 "configure"
++#line 5097 "configure"
+ #include "confdefs.h"
+ #include <$ac_hdr>
+ EOF
+ ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+-{ (eval echo configure:5113: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:5102: \"$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*
+@@ -5139,17 +5128,17 @@ for ac_hdr in sys/ptrace.h ptrace.h
+ do
+ ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
+ echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
+-echo "configure:5143: checking for $ac_hdr" >&5
++echo "configure:5132: 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 5148 "configure"
++#line 5137 "configure"
+ #include "confdefs.h"
+ #include <$ac_hdr>
+ EOF
+ ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+-{ (eval echo configure:5153: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:5142: \"$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*
+@@ -5179,17 +5168,17 @@ for ac_hdr in sys/reg.h sys/debugreg.h
+ do
+ ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
+ echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
+-echo "configure:5183: checking for $ac_hdr" >&5
++echo "configure:5172: 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 5188 "configure"
++#line 5177 "configure"
+ #include "confdefs.h"
+ #include <$ac_hdr>
+ EOF
+ ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+-{ (eval echo configure:5193: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:5182: \"$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*
+@@ -5219,17 +5208,17 @@ for ac_hdr in sys/select.h
+ do
+ ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
+ echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
+-echo "configure:5223: checking for $ac_hdr" >&5
++echo "configure:5212: 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 5228 "configure"
++#line 5217 "configure"
+ #include "confdefs.h"
+ #include <$ac_hdr>
+ EOF
+ ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+-{ (eval echo configure:5233: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:5222: \"$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*
+@@ -5259,17 +5248,17 @@ for ac_hdr in sys/syscall.h
+ do
+ ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
+ echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
+-echo "configure:5263: checking for $ac_hdr" >&5
++echo "configure:5252: 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 5268 "configure"
++#line 5257 "configure"
+ #include "confdefs.h"
+ #include <$ac_hdr>
+ EOF
+ ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+-{ (eval echo configure:5273: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:5262: \"$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*
+@@ -5299,17 +5288,17 @@ for ac_hdr in sys/types.h
+ do
+ ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
+ echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
+-echo "configure:5303: checking for $ac_hdr" >&5
++echo "configure:5292: 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 5308 "configure"
++#line 5297 "configure"
+ #include "confdefs.h"
+ #include <$ac_hdr>
+ EOF
+ ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+-{ (eval echo configure:5313: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:5302: \"$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*
+@@ -5339,17 +5328,17 @@ for ac_hdr in sys/user.h
+ do
+ ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
+ echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
+-echo "configure:5343: checking for $ac_hdr" >&5
++echo "configure:5332: 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 5348 "configure"
++#line 5337 "configure"
+ #include "confdefs.h"
+ #include <$ac_hdr>
+ EOF
+ ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+-{ (eval echo configure:5353: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:5342: \"$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*
+@@ -5379,17 +5368,17 @@ for ac_hdr in sys/wait.h wait.h
+ do
+ ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
+ echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
+-echo "configure:5383: checking for $ac_hdr" >&5
++echo "configure:5372: 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 5388 "configure"
++#line 5377 "configure"
+ #include "confdefs.h"
+ #include <$ac_hdr>
+ EOF
+ ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+-{ (eval echo configure:5393: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:5382: \"$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*
+@@ -5419,17 +5408,17 @@ for ac_hdr in termios.h termio.h sgtty.h
+ do
+ ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
+ echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
+-echo "configure:5423: checking for $ac_hdr" >&5
++echo "configure:5412: 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 5428 "configure"
++#line 5417 "configure"
+ #include "confdefs.h"
+ #include <$ac_hdr>
+ EOF
+ ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+-{ (eval echo configure:5433: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:5422: \"$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*
+@@ -5459,17 +5448,17 @@ for ac_hdr in unistd.h
+ do
+ ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
+ echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
+-echo "configure:5463: checking for $ac_hdr" >&5
++echo "configure:5452: 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 5468 "configure"
++#line 5457 "configure"
+ #include "confdefs.h"
+ #include <$ac_hdr>
+ EOF
+ ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+-{ (eval echo configure:5473: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:5462: \"$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*
+@@ -5512,17 +5501,17 @@ for ac_hdr in curses.h cursesX.h ncurses
+ do
+ ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
+ echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
+-echo "configure:5516: checking for $ac_hdr" >&5
++echo "configure:5505: 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 5521 "configure"
++#line 5510 "configure"
+ #include "confdefs.h"
+ #include <$ac_hdr>
+ EOF
+ ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+-{ (eval echo configure:5526: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:5515: \"$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*
+@@ -5555,17 +5544,17 @@ for ac_hdr in ctype.h time.h
+ do
+ ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
+ echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
+-echo "configure:5559: checking for $ac_hdr" >&5
++echo "configure:5548: 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 5564 "configure"
++#line 5553 "configure"
+ #include "confdefs.h"
+ #include <$ac_hdr>
+ EOF
+ ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+-{ (eval echo configure:5569: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:5558: \"$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*
+@@ -5593,12 +5582,12 @@ done
+ 
+ 
+ echo $ac_n "checking for member st_blocks in struct stat""... $ac_c" 1>&6
+-echo "configure:5597: checking for member st_blocks in struct stat" >&5
++echo "configure:5586: checking for member st_blocks in struct stat" >&5
+ if eval "test \"`echo '$''{'gdb_cv_have_struct_stat_with_st_blocks_member'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 5602 "configure"
++#line 5591 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ #include <sys/stat.h>
+@@ -5606,7 +5595,7 @@ int main() {
+ struct stat st; (void) st.st_blocks;
+ ; return 0; }
+ EOF
+-if { (eval echo configure:5610: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:5599: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+   rm -rf conftest*
+   gdb_cv_have_struct_stat_with_st_blocks_member=yes
+ else
+@@ -5634,12 +5623,12 @@ for ac_func in getopt
+ 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:5638: checking whether $ac_func is declared" >&5
++echo "configure:5627: 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 5643 "configure"
++#line 5632 "configure"
+ #include "confdefs.h"
+ #undef $ac_tr_decl
+ #define $ac_tr_decl 1
+@@ -5651,7 +5640,7 @@ char *(*pfn) = (char *(*)) $ac_func ;
+ #endif
+ ; return 0; }
+ EOF
+-if { (eval echo configure:5655: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:5644: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+   rm -rf conftest*
+   eval "gcc_cv_have_decl_$ac_func=yes"
+ else
+@@ -5688,12 +5677,12 @@ fi
+ # ------------------ #
+ 
+ echo $ac_n "checking return type of signal handlers""... $ac_c" 1>&6
+-echo "configure:5692: checking return type of signal handlers" >&5
++echo "configure:5681: checking return type of signal handlers" >&5
+ if eval "test \"`echo '$''{'ac_cv_type_signal'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 5697 "configure"
++#line 5686 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ #include <signal.h>
+@@ -5710,7 +5699,7 @@ int main() {
+ int i;
+ ; return 0; }
+ EOF
+-if { (eval echo configure:5714: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:5703: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+   rm -rf conftest*
+   ac_cv_type_signal=void
+ else
+@@ -5734,12 +5723,12 @@ EOF
+ # ------------------------------------- #
+ 
+ echo $ac_n "checking for working const""... $ac_c" 1>&6
+-echo "configure:5738: checking for working const" >&5
++echo "configure:5727: 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 5743 "configure"
++#line 5732 "configure"
+ #include "confdefs.h"
+ 
+ int main() {
+@@ -5788,7 +5777,7 @@ ccp = (char const *const *) p;
+ 
+ ; return 0; }
+ EOF
+-if { (eval echo configure:5792: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:5781: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+   rm -rf conftest*
+   ac_cv_c_const=yes
+ else
+@@ -5809,21 +5798,21 @@ EOF
+ fi
+ 
+ echo $ac_n "checking for inline""... $ac_c" 1>&6
+-echo "configure:5813: checking for inline" >&5
++echo "configure:5802: 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 5820 "configure"
++#line 5809 "configure"
+ #include "confdefs.h"
+ 
+ int main() {
+ } $ac_kw foo() {
+ ; return 0; }
+ EOF
+-if { (eval echo configure:5827: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:5816: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+   rm -rf conftest*
+   ac_cv_c_inline=$ac_kw; break
+ else
+@@ -5856,19 +5845,19 @@ esac
+ # 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:5860: checking for working alloca.h" >&5
++echo "configure:5849: 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 5865 "configure"
++#line 5854 "configure"
+ #include "confdefs.h"
+ #include <alloca.h>
+ int main() {
+ char *p = alloca(2 * sizeof(int));
+ ; return 0; }
+ EOF
+-if { (eval echo configure:5872: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:5861: \"$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
+@@ -5889,12 +5878,12 @@ EOF
+ fi
+ 
+ echo $ac_n "checking for alloca""... $ac_c" 1>&6
+-echo "configure:5893: checking for alloca" >&5
++echo "configure:5882: 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 5898 "configure"
++#line 5887 "configure"
+ #include "confdefs.h"
+ 
+ #ifdef __GNUC__
+@@ -5922,7 +5911,7 @@ int main() {
+ char *p = (char *) alloca(1);
+ ; return 0; }
+ EOF
+-if { (eval echo configure:5926: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:5915: \"$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
+@@ -5954,12 +5943,12 @@ EOF
+ 
+ 
+ echo $ac_n "checking whether alloca needs Cray hooks""... $ac_c" 1>&6
+-echo "configure:5958: checking whether alloca needs Cray hooks" >&5
++echo "configure:5947: 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 5963 "configure"
++#line 5952 "configure"
+ #include "confdefs.h"
+ #if defined(CRAY) && ! defined(CRAY2)
+ webecray
+@@ -5984,12 +5973,12 @@ echo "$ac_t""$ac_cv_os_cray" 1>&6
+ 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:5988: checking for $ac_func" >&5
++echo "configure:5977: 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 5993 "configure"
++#line 5982 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char $ac_func(); below.  */
+@@ -6012,7 +6001,7 @@ $ac_func();
+ 
+ ; return 0; }
+ EOF
+-if { (eval echo configure:6016: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:6005: \"$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
+@@ -6039,7 +6028,7 @@ done
+ fi
+ 
+ echo $ac_n "checking stack direction for C alloca""... $ac_c" 1>&6
+-echo "configure:6043: checking stack direction for C alloca" >&5
++echo "configure:6032: 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
+@@ -6047,7 +6036,7 @@ else
+   ac_cv_c_stack_direction=0
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 6051 "configure"
++#line 6040 "configure"
+ #include "confdefs.h"
+ find_stack_direction ()
+ {
+@@ -6066,7 +6055,7 @@ main ()
+   exit (find_stack_direction() < 0);
+ }
+ EOF
+-if { (eval echo configure:6070: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:6059: \"$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
+@@ -6091,17 +6080,17 @@ for ac_hdr in unistd.h
+ do
+ ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
+ echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
+-echo "configure:6095: checking for $ac_hdr" >&5
++echo "configure:6084: 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 6100 "configure"
++#line 6089 "configure"
+ #include "confdefs.h"
+ #include <$ac_hdr>
+ EOF
+ ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+-{ (eval echo configure:6105: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:6094: \"$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*
+@@ -6130,12 +6119,12 @@ done
+ for ac_func in getpagesize
+ do
+ echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
+-echo "configure:6134: checking for $ac_func" >&5
++echo "configure:6123: 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 6139 "configure"
++#line 6128 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char $ac_func(); below.  */
+@@ -6158,7 +6147,7 @@ $ac_func();
+ 
+ ; return 0; }
+ EOF
+-if { (eval echo configure:6162: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:6151: \"$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
+@@ -6183,7 +6172,7 @@ fi
+ done
+ 
+ echo $ac_n "checking for working mmap""... $ac_c" 1>&6
+-echo "configure:6187: checking for working mmap" >&5
++echo "configure:6176: checking for working mmap" >&5
+ if eval "test \"`echo '$''{'ac_cv_func_mmap_fixed_mapped'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -6191,7 +6180,7 @@ else
+   ac_cv_func_mmap_fixed_mapped=no
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 6195 "configure"
++#line 6184 "configure"
+ #include "confdefs.h"
+ 
+ /* Thanks to Mike Haertel and Jim Avera for this test.
+@@ -6331,7 +6320,7 @@ main()
+ }
+ 
+ EOF
+-if { (eval echo configure:6335: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:6324: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+ then
+   ac_cv_func_mmap_fixed_mapped=yes
+ else
+@@ -6354,12 +6343,12 @@ EOF
+ fi
+ 
+ echo $ac_n "checking for pid_t""... $ac_c" 1>&6
+-echo "configure:6358: checking for pid_t" >&5
++echo "configure:6347: 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 6363 "configure"
++#line 6352 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ #if STDC_HEADERS
+@@ -6388,17 +6377,17 @@ fi
+ 
+ ac_safe=`echo "vfork.h" | sed 'y%./+-%__p_%'`
+ echo $ac_n "checking for vfork.h""... $ac_c" 1>&6
+-echo "configure:6392: checking for vfork.h" >&5
++echo "configure:6381: 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 6397 "configure"
++#line 6386 "configure"
+ #include "confdefs.h"
+ #include <vfork.h>
+ EOF
+ ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+-{ (eval echo configure:6402: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:6391: \"$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*
+@@ -6423,18 +6412,18 @@ else
+ fi
+ 
+ echo $ac_n "checking for working vfork""... $ac_c" 1>&6
+-echo "configure:6427: checking for working vfork" >&5
++echo "configure:6416: 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:6433: checking for vfork" >&5
++echo "configure:6422: 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 6438 "configure"
++#line 6427 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char vfork(); below.  */
+@@ -6457,7 +6446,7 @@ vfork();
+ 
+ ; return 0; }
+ EOF
+-if { (eval echo configure:6461: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:6450: \"$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
+@@ -6479,7 +6468,7 @@ fi
+ ac_cv_func_vfork_works=$ac_cv_func_vfork
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 6483 "configure"
++#line 6472 "configure"
+ #include "confdefs.h"
+ /* Thanks to Paul Eggert for this test.  */
+ #include <stdio.h>
+@@ -6574,7 +6563,7 @@ main() {
+   }
+ }
+ EOF
+-if { (eval echo configure:6578: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:6567: \"$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
+@@ -6599,12 +6588,12 @@ fi
+ for ac_func in canonicalize_file_name realpath
+ do
+ echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
+-echo "configure:6603: checking for $ac_func" >&5
++echo "configure:6592: 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 6608 "configure"
++#line 6597 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char $ac_func(); below.  */
+@@ -6627,7 +6616,7 @@ $ac_func();
+ 
+ ; return 0; }
+ EOF
+-if { (eval echo configure:6631: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:6620: \"$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
+@@ -6654,12 +6643,12 @@ done
+ for ac_func in poll
+ do
+ echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
+-echo "configure:6658: checking for $ac_func" >&5
++echo "configure:6647: 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 6663 "configure"
++#line 6652 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char $ac_func(); below.  */
+@@ -6682,7 +6671,7 @@ $ac_func();
+ 
+ ; return 0; }
+ EOF
+-if { (eval echo configure:6686: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:6675: \"$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
+@@ -6709,12 +6698,12 @@ done
+ for ac_func in pread64
+ do
+ echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
+-echo "configure:6713: checking for $ac_func" >&5
++echo "configure:6702: 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 6718 "configure"
++#line 6707 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char $ac_func(); below.  */
+@@ -6737,7 +6726,7 @@ $ac_func();
+ 
+ ; return 0; }
+ EOF
+-if { (eval echo configure:6741: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:6730: \"$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
+@@ -6764,12 +6753,12 @@ done
+ for ac_func in sbrk
+ do
+ echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
+-echo "configure:6768: checking for $ac_func" >&5
++echo "configure:6757: 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 6773 "configure"
++#line 6762 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char $ac_func(); below.  */
+@@ -6792,7 +6781,7 @@ $ac_func();
+ 
+ ; return 0; }
+ EOF
+-if { (eval echo configure:6796: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:6785: \"$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
+@@ -6819,12 +6808,12 @@ done
+ for ac_func in setpgid setpgrp
+ do
+ echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
+-echo "configure:6823: checking for $ac_func" >&5
++echo "configure:6812: 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 6828 "configure"
++#line 6817 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char $ac_func(); below.  */
+@@ -6847,7 +6836,7 @@ $ac_func();
+ 
+ ; return 0; }
+ EOF
+-if { (eval echo configure:6851: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:6840: \"$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
+@@ -6874,12 +6863,12 @@ done
+ for ac_func in sigaction sigprocmask sigsetmask
+ do
+ echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
+-echo "configure:6878: checking for $ac_func" >&5
++echo "configure:6867: 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 6883 "configure"
++#line 6872 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char $ac_func(); below.  */
+@@ -6902,7 +6891,7 @@ $ac_func();
+ 
+ ; return 0; }
+ EOF
+-if { (eval echo configure:6906: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:6895: \"$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
+@@ -6929,12 +6918,12 @@ done
+ for ac_func in socketpair
+ do
+ echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
+-echo "configure:6933: checking for $ac_func" >&5
++echo "configure:6922: 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 6938 "configure"
++#line 6927 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char $ac_func(); below.  */
+@@ -6957,7 +6946,7 @@ $ac_func();
+ 
+ ; return 0; }
+ EOF
+-if { (eval echo configure:6961: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:6950: \"$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
+@@ -6984,12 +6973,12 @@ done
+ for ac_func in syscall
+ do
+ echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
+-echo "configure:6988: checking for $ac_func" >&5
++echo "configure:6977: 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 6993 "configure"
++#line 6982 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char $ac_func(); below.  */
+@@ -7012,7 +7001,7 @@ $ac_func();
+ 
+ ; return 0; }
+ EOF
+-if { (eval echo configure:7016: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:7005: \"$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
+@@ -7039,12 +7028,12 @@ done
+ for ac_func in ttrace
+ do
+ echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
+-echo "configure:7043: checking for $ac_func" >&5
++echo "configure:7032: 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 7048 "configure"
++#line 7037 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char $ac_func(); below.  */
+@@ -7067,7 +7056,7 @@ $ac_func();
+ 
+ ; return 0; }
+ EOF
+-if { (eval echo configure:7071: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:7060: \"$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
+@@ -7094,12 +7083,12 @@ done
+ for ac_func in wborder
+ do
+ echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
+-echo "configure:7098: checking for $ac_func" >&5
++echo "configure:7087: 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 7103 "configure"
++#line 7092 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char $ac_func(); below.  */
+@@ -7122,7 +7111,7 @@ $ac_func();
+ 
+ ; return 0; }
+ EOF
+-if { (eval echo configure:7126: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:7115: \"$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
+@@ -7165,12 +7154,12 @@ for ac_func in ptrace
+ 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:7169: checking whether $ac_func is declared" >&5
++echo "configure:7158: 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 7174 "configure"
++#line 7163 "configure"
+ #include "confdefs.h"
+ #undef $ac_tr_decl
+ #define $ac_tr_decl 1
+@@ -7182,7 +7171,7 @@ char *(*pfn) = (char *(*)) $ac_func ;
+ #endif
+ ; return 0; }
+ EOF
+-if { (eval echo configure:7186: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:7175: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+   rm -rf conftest*
+   eval "gcc_cv_have_decl_$ac_func=yes"
+ else
+@@ -7218,19 +7207,19 @@ fi
+ 
+ # Check return type.
+ echo $ac_n "checking return type of ptrace""... $ac_c" 1>&6
+-echo "configure:7222: checking return type of ptrace" >&5
++echo "configure:7211: checking return type of ptrace" >&5
+ if eval "test \"`echo '$''{'gdb_cv_func_ptrace_ret'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 7227 "configure"
++#line 7216 "configure"
+ #include "confdefs.h"
+ $gdb_ptrace_headers
+ int main() {
+ extern int ptrace ();
+ ; return 0; }
+ EOF
+-if { (eval echo configure:7234: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:7223: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+   rm -rf conftest*
+   gdb_cv_func_ptrace_ret='int'
+ else
+@@ -7249,7 +7238,7 @@ EOF
+ 
+ # Check argument types.
+ echo $ac_n "checking types of arguments for ptrace""... $ac_c" 1>&6
+-echo "configure:7253: checking types of arguments for ptrace" >&5
++echo "configure:7242: checking types of arguments for ptrace" >&5
+ if eval "test \"`echo '$''{'gdb_cv_func_ptrace_args'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -7259,7 +7248,7 @@ for gdb_arg1 in 'int' 'long'; do
+   for gdb_arg3 in 'int *' 'caddr_t' 'int' 'long'; do
+    for gdb_arg4 in 'int' 'long'; do
+      cat > conftest.$ac_ext <<EOF
+-#line 7263 "configure"
++#line 7252 "configure"
+ #include "confdefs.h"
+ $gdb_ptrace_headers
+ int main() {
+@@ -7269,7 +7258,7 @@ extern $gdb_cv_func_ptrace_ret
+ 
+ ; return 0; }
+ EOF
+-if { (eval echo configure:7273: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:7262: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+   rm -rf conftest*
+   gdb_cv_func_ptrace_args="$gdb_arg1,$gdb_arg2,$gdb_arg3,$gdb_arg4";
+     break 4;
+@@ -7280,7 +7269,7 @@ fi
+ rm -f conftest*
+     for gdb_arg5 in 'int *' 'int' 'long'; do
+      cat > conftest.$ac_ext <<EOF
+-#line 7284 "configure"
++#line 7273 "configure"
+ #include "confdefs.h"
+ $gdb_ptrace_headers
+ int main() {
+@@ -7290,7 +7279,7 @@ extern $gdb_cv_func_ptrace_ret
+ 
+ ; return 0; }
+ EOF
+-if { (eval echo configure:7294: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:7283: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+   rm -rf conftest*
+   
+ gdb_cv_func_ptrace_args="$gdb_arg1,$gdb_arg2,$gdb_arg3,$gdb_arg4,$gdb_arg5";
+@@ -7328,7 +7317,7 @@ fi
+ 
+ if test "$cross_compiling" = no; then
+   echo $ac_n "checking whether setpgrp takes no argument""... $ac_c" 1>&6
+-echo "configure:7332: checking whether setpgrp takes no argument" >&5
++echo "configure:7321: checking whether setpgrp takes no argument" >&5
+ if eval "test \"`echo '$''{'ac_cv_func_setpgrp_void'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -7336,7 +7325,7 @@ else
+   { echo "configure: error: cannot check setpgrp if cross compiling" 1>&2; exit 1; }
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 7340 "configure"
++#line 7329 "configure"
+ #include "confdefs.h"
+ 
+ #ifdef HAVE_UNISTD_H
+@@ -7356,7 +7345,7 @@ main()
+ }
+ 
+ EOF
+-if { (eval echo configure:7360: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:7349: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+ then
+   ac_cv_func_setpgrp_void=no
+ else
+@@ -7381,12 +7370,12 @@ fi
+ 
+ else
+   echo $ac_n "checking whether setpgrp takes no argument""... $ac_c" 1>&6
+-echo "configure:7385: checking whether setpgrp takes no argument" >&5
++echo "configure:7374: checking whether setpgrp takes no argument" >&5
+ if eval "test \"`echo '$''{'ac_cv_func_setpgrp_void'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 7390 "configure"
++#line 7379 "configure"
+ #include "confdefs.h"
+ 
+ #include <unistd.h>
+@@ -7400,7 +7389,7 @@ int main() {
+ 
+ ; return 0; }
+ EOF
+-if { (eval echo configure:7404: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:7393: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+   rm -rf conftest*
+   ac_cv_func_setpgrp_void=no
+ else
+@@ -7424,12 +7413,12 @@ fi
+ # Check if sigsetjmp is available.  Using AC_CHECK_FUNCS won't do
+ # since sigsetjmp might only be defined as a macro.
+ echo $ac_n "checking for sigsetjmp""... $ac_c" 1>&6
+-echo "configure:7428: checking for sigsetjmp" >&5
++echo "configure:7417: checking for sigsetjmp" >&5
+ if eval "test \"`echo '$''{'gdb_cv_func_sigsetjmp'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 7433 "configure"
++#line 7422 "configure"
+ #include "confdefs.h"
+ 
+ #include <setjmp.h>
+@@ -7438,7 +7427,7 @@ int main() {
+ sigjmp_buf env; while (! sigsetjmp (env, 1)) siglongjmp (env, 1);
+ ; return 0; }
+ EOF
+-if { (eval echo configure:7442: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:7431: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+   rm -rf conftest*
+   gdb_cv_func_sigsetjmp=yes
+ else
+@@ -7464,12 +7453,12 @@ gdb_use_included_regex=yes
+ # However, if the system regex is GNU regex, then default to *not*
+ # using the included regex.
+ echo $ac_n "checking for GNU regex""... $ac_c" 1>&6
+-echo "configure:7468: checking for GNU regex" >&5
++echo "configure:7457: checking for GNU regex" >&5
+ if eval "test \"`echo '$''{'gdb_cv_have_gnu_regex'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 7473 "configure"
++#line 7462 "configure"
+ #include "confdefs.h"
+ #include <gnu-versions.h>
+ int main() {
+@@ -7479,7 +7468,7 @@ int main() {
+ #endif
+ ; return 0; }
+ EOF
+-if { (eval echo configure:7483: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:7472: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+   rm -rf conftest*
+   gdb_cv_have_gnu_regex=yes
+ else
+@@ -7513,12 +7502,12 @@ fi
+ 
+ # See if <sys/proc.h> defines `struct thread' with a td_pcb member.
+ echo $ac_n "checking for td_pcb in struct thread""... $ac_c" 1>&6
+-echo "configure:7517: checking for td_pcb in struct thread" >&5
++echo "configure:7506: checking for td_pcb in struct thread" >&5
+ if eval "test \"`echo '$''{'gdb_cv_struct_thread_td_pcb'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 7522 "configure"
++#line 7511 "configure"
+ #include "confdefs.h"
+ #include <sys/param.h>
+ #include <sys/proc.h>
+@@ -7526,7 +7515,7 @@ int main() {
+ struct thread td; td.td_pcb;
+ ; return 0; }
+ EOF
+-if { (eval echo configure:7530: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:7519: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+   rm -rf conftest*
+   gdb_cv_struct_thread_td_pcb=yes
+ else
+@@ -7548,12 +7537,12 @@ fi
+ 
+ # See if <sys/lwp.h> defines `struct lwp`.
+ echo $ac_n "checking for struct lwp""... $ac_c" 1>&6
+-echo "configure:7552: checking for struct lwp" >&5
++echo "configure:7541: checking for struct lwp" >&5
+ if eval "test \"`echo '$''{'gdb_cv_struct_lwp'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 7557 "configure"
++#line 7546 "configure"
+ #include "confdefs.h"
+ #include <sys/param.h>
+ #include <sys/lwp.h>
+@@ -7561,7 +7550,7 @@ int main() {
+ struct lwp l;
+ ; return 0; }
+ EOF
+-if { (eval echo configure:7565: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:7554: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+   rm -rf conftest*
+   gdb_cv_struct_lwp=yes
+ else
+@@ -7583,12 +7572,12 @@ fi
+ 
+ # See if <machine/reg.h> degines `struct reg'.
+ echo $ac_n "checking for struct reg in machine/reg.h""... $ac_c" 1>&6
+-echo "configure:7587: checking for struct reg in machine/reg.h" >&5
++echo "configure:7576: checking for struct reg in machine/reg.h" >&5
+ if eval "test \"`echo '$''{'gdb_cv_struct_reg'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 7592 "configure"
++#line 7581 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ #include <machine/reg.h>
+@@ -7596,7 +7585,7 @@ int main() {
+ struct reg r;
+ ; return 0; }
+ EOF
+-if { (eval echo configure:7600: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:7589: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+   rm -rf conftest*
+   gdb_cv_struct_reg=yes
+ else
+@@ -7619,19 +7608,19 @@ fi
+ # See if <machine/reg.h> supports the %fs and %gs i386 segment registers.
+ # Older i386 BSD's don't have the r_fs and r_gs members of `struct reg'.
+ echo $ac_n "checking for r_fs in struct reg""... $ac_c" 1>&6
+-echo "configure:7623: checking for r_fs in struct reg" >&5
++echo "configure:7612: checking for r_fs in struct reg" >&5
+ if eval "test \"`echo '$''{'gdb_cv_struct_reg_r_fs'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 7628 "configure"
++#line 7617 "configure"
+ #include "confdefs.h"
+ #include <machine/reg.h>
+ int main() {
+ struct reg r; r.r_fs;
+ ; return 0; }
+ EOF
+-if { (eval echo configure:7635: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:7624: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+   rm -rf conftest*
+   gdb_cv_struct_reg_r_fs=yes
+ else
+@@ -7651,19 +7640,19 @@ EOF
+ 
+ fi
+ echo $ac_n "checking for r_gs in struct reg""... $ac_c" 1>&6
+-echo "configure:7655: checking for r_gs in struct reg" >&5
++echo "configure:7644: checking for r_gs in struct reg" >&5
+ if eval "test \"`echo '$''{'gdb_cv_struct_reg_r_gs'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 7660 "configure"
++#line 7649 "configure"
+ #include "confdefs.h"
+ #include <machine/reg.h>
+ int main() {
+ struct reg r; r.r_gs;
+ ; return 0; }
+ EOF
+-if { (eval echo configure:7667: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:7656: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+   rm -rf conftest*
+   gdb_cv_struct_reg_r_gs=yes
+ else
+@@ -7685,19 +7674,19 @@ fi
+ 
+ # See if <sys/ptrace.h> provides the PTRACE_GETREGS request.
+ echo $ac_n "checking for PTRACE_GETREGS""... $ac_c" 1>&6
+-echo "configure:7689: checking for PTRACE_GETREGS" >&5
++echo "configure:7678: checking for PTRACE_GETREGS" >&5
+ if eval "test \"`echo '$''{'gdb_cv_have_ptrace_getregs'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 7694 "configure"
++#line 7683 "configure"
+ #include "confdefs.h"
+ #include <sys/ptrace.h>
+ int main() {
+ PTRACE_GETREGS;
+ ; return 0; }
+ EOF
+-if { (eval echo configure:7701: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:7690: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+   rm -rf conftest*
+   gdb_cv_have_ptrace_getregs=yes
+ else
+@@ -7719,19 +7708,19 @@ fi
+ 
+ # See if <sys/ptrace.h> provides the PTRACE_GETFPXREGS request.
+ echo $ac_n "checking for PTRACE_GETFPXREGS""... $ac_c" 1>&6
+-echo "configure:7723: checking for PTRACE_GETFPXREGS" >&5
++echo "configure:7712: checking for PTRACE_GETFPXREGS" >&5
+ if eval "test \"`echo '$''{'gdb_cv_have_ptrace_getfpxregs'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 7728 "configure"
++#line 7717 "configure"
+ #include "confdefs.h"
+ #include <sys/ptrace.h>
+ int main() {
+ PTRACE_GETFPXREGS;
+ ; return 0; }
+ EOF
+-if { (eval echo configure:7735: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:7724: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+   rm -rf conftest*
+   gdb_cv_have_ptrace_getfpxregs=yes
+ else
+@@ -7753,12 +7742,12 @@ fi
+ 
+ # See if <sys/ptrace.h> provides the PT_GETDBREGS request.
+ echo $ac_n "checking for PT_GETDBREGS""... $ac_c" 1>&6
+-echo "configure:7757: checking for PT_GETDBREGS" >&5
++echo "configure:7746: checking for PT_GETDBREGS" >&5
+ if eval "test \"`echo '$''{'gdb_cv_have_pt_getdbregs'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 7762 "configure"
++#line 7751 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ #include <sys/ptrace.h>
+@@ -7766,7 +7755,7 @@ int main() {
+ PT_GETDBREGS;
+ ; return 0; }
+ EOF
+-if { (eval echo configure:7770: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:7759: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+   rm -rf conftest*
+   gdb_cv_have_pt_getdbregs=yes
+ else
+@@ -7788,12 +7777,12 @@ fi
+ 
+ # See if <sys/ptrace.h> provides the PT_GETXMMREGS request.
+ echo $ac_n "checking for PT_GETXMMREGS""... $ac_c" 1>&6
+-echo "configure:7792: checking for PT_GETXMMREGS" >&5
++echo "configure:7781: checking for PT_GETXMMREGS" >&5
+ if eval "test \"`echo '$''{'gdb_cv_have_pt_getxmmregs'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 7797 "configure"
++#line 7786 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ #include <sys/ptrace.h>
+@@ -7801,7 +7790,7 @@ int main() {
+ PT_GETXMMREGS;
+ ; return 0; }
+ EOF
+-if { (eval echo configure:7805: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:7794: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+   rm -rf conftest*
+   gdb_cv_have_pt_getxmmregs=yes
+ else
+@@ -7824,19 +7813,19 @@ fi
+ # See if stdint.h provides the uintptr_t type.
+ # Autoconf 2.5X has an improved AC_CHECK_TYPE which will simplify this.
+ echo $ac_n "checking for uintptr_t in stdint.h""... $ac_c" 1>&6
+-echo "configure:7828: checking for uintptr_t in stdint.h" >&5
++echo "configure:7817: checking for uintptr_t in stdint.h" >&5
+ if eval "test \"`echo '$''{'gdb_cv_have_uintptr_t'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 7833 "configure"
++#line 7822 "configure"
+ #include "confdefs.h"
+ #include <stdint.h>
+ int main() {
+ uintptr_t foo = 0;
+ ; return 0; }
+ EOF
+-if { (eval echo configure:7840: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:7829: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+   rm -rf conftest*
+   gdb_cv_have_uintptr_t=yes
+ else
+@@ -7857,12 +7846,12 @@ EOF
+ fi
+ 
+ echo $ac_n "checking whether malloc must be declared""... $ac_c" 1>&6
+-echo "configure:7861: checking whether malloc must be declared" >&5
++echo "configure:7850: checking whether malloc must be declared" >&5
+ if eval "test \"`echo '$''{'bfd_cv_decl_needed_malloc'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 7866 "configure"
++#line 7855 "configure"
+ #include "confdefs.h"
+ 
+ #include <stdio.h>
+@@ -7883,7 +7872,7 @@ int main() {
+ char *(*pfn) = (char *(*)) malloc
+ ; return 0; }
+ EOF
+-if { (eval echo configure:7887: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:7876: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+   rm -rf conftest*
+   bfd_cv_decl_needed_malloc=no
+ else
+@@ -7904,12 +7893,12 @@ EOF
+ fi
+ 
+ echo $ac_n "checking whether realloc must be declared""... $ac_c" 1>&6
+-echo "configure:7908: checking whether realloc must be declared" >&5
++echo "configure:7897: checking whether realloc must be declared" >&5
+ if eval "test \"`echo '$''{'bfd_cv_decl_needed_realloc'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 7913 "configure"
++#line 7902 "configure"
+ #include "confdefs.h"
+ 
+ #include <stdio.h>
+@@ -7930,7 +7919,7 @@ int main() {
+ char *(*pfn) = (char *(*)) realloc
+ ; return 0; }
+ EOF
+-if { (eval echo configure:7934: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:7923: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+   rm -rf conftest*
+   bfd_cv_decl_needed_realloc=no
+ else
+@@ -7951,12 +7940,12 @@ EOF
+ fi
+ 
+ echo $ac_n "checking whether free must be declared""... $ac_c" 1>&6
+-echo "configure:7955: checking whether free must be declared" >&5
++echo "configure:7944: checking whether free must be declared" >&5
+ if eval "test \"`echo '$''{'bfd_cv_decl_needed_free'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 7960 "configure"
++#line 7949 "configure"
+ #include "confdefs.h"
+ 
+ #include <stdio.h>
+@@ -7977,7 +7966,7 @@ int main() {
+ char *(*pfn) = (char *(*)) free
+ ; return 0; }
+ EOF
+-if { (eval echo configure:7981: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:7970: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+   rm -rf conftest*
+   bfd_cv_decl_needed_free=no
+ else
+@@ -7998,12 +7987,12 @@ EOF
+ fi
+ 
+ echo $ac_n "checking whether strerror must be declared""... $ac_c" 1>&6
+-echo "configure:8002: checking whether strerror must be declared" >&5
++echo "configure:7991: checking whether strerror must be declared" >&5
+ if eval "test \"`echo '$''{'bfd_cv_decl_needed_strerror'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 8007 "configure"
++#line 7996 "configure"
+ #include "confdefs.h"
+ 
+ #include <stdio.h>
+@@ -8024,7 +8013,7 @@ int main() {
+ char *(*pfn) = (char *(*)) strerror
+ ; return 0; }
+ EOF
+-if { (eval echo configure:8028: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:8017: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+   rm -rf conftest*
+   bfd_cv_decl_needed_strerror=no
+ else
+@@ -8045,12 +8034,12 @@ EOF
+ fi
+ 
+ echo $ac_n "checking whether strdup must be declared""... $ac_c" 1>&6
+-echo "configure:8049: checking whether strdup must be declared" >&5
++echo "configure:8038: checking whether strdup must be declared" >&5
+ if eval "test \"`echo '$''{'bfd_cv_decl_needed_strdup'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 8054 "configure"
++#line 8043 "configure"
+ #include "confdefs.h"
+ 
+ #include <stdio.h>
+@@ -8071,7 +8060,7 @@ int main() {
+ char *(*pfn) = (char *(*)) strdup
+ ; return 0; }
+ EOF
+-if { (eval echo configure:8075: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:8064: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+   rm -rf conftest*
+   bfd_cv_decl_needed_strdup=no
+ else
+@@ -8092,12 +8081,12 @@ EOF
+ fi
+ 
+ echo $ac_n "checking whether strstr must be declared""... $ac_c" 1>&6
+-echo "configure:8096: checking whether strstr must be declared" >&5
++echo "configure:8085: checking whether strstr must be declared" >&5
+ if eval "test \"`echo '$''{'bfd_cv_decl_needed_strstr'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 8101 "configure"
++#line 8090 "configure"
+ #include "confdefs.h"
+ 
+ #include <stdio.h>
+@@ -8118,7 +8107,7 @@ int main() {
+ char *(*pfn) = (char *(*)) strstr
+ ; return 0; }
+ EOF
+-if { (eval echo configure:8122: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:8111: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+   rm -rf conftest*
+   bfd_cv_decl_needed_strstr=no
+ else
+@@ -8139,12 +8128,12 @@ EOF
+ fi
+ 
+ echo $ac_n "checking whether canonicalize_file_name must be declared""... $ac_c" 1>&6
+-echo "configure:8143: checking whether canonicalize_file_name must be declared" >&5
++echo "configure:8132: checking whether canonicalize_file_name must be declared" >&5
+ if eval "test \"`echo '$''{'bfd_cv_decl_needed_canonicalize_file_name'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 8148 "configure"
++#line 8137 "configure"
+ #include "confdefs.h"
+ 
+ #include <stdio.h>
+@@ -8165,7 +8154,7 @@ int main() {
+ char *(*pfn) = (char *(*)) canonicalize_file_name
+ ; return 0; }
+ EOF
+-if { (eval echo configure:8169: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:8158: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+   rm -rf conftest*
+   bfd_cv_decl_needed_canonicalize_file_name=no
+ else
+@@ -8191,9 +8180,9 @@ fi
+ # could be expunged. --jsm 1999-03-22
+ 
+ echo $ac_n "checking for HPUX save_state structure""... $ac_c" 1>&6
+-echo "configure:8195: checking for HPUX save_state structure" >&5
++echo "configure:8184: checking for HPUX save_state structure" >&5
+ cat > conftest.$ac_ext <<EOF
+-#line 8197 "configure"
++#line 8186 "configure"
+ #include "confdefs.h"
+ #include <machine/save_state.h>
+ EOF
+@@ -8208,7 +8197,7 @@ fi
+ rm -f conftest*
+ 
+ cat > conftest.$ac_ext <<EOF
+-#line 8212 "configure"
++#line 8201 "configure"
+ #include "confdefs.h"
+ #include <machine/save_state.h>
+ EOF
+@@ -8285,12 +8274,12 @@ fi
+ 
+ if test "$ac_cv_header_sys_procfs_h" = yes; then
+   echo $ac_n "checking for pstatus_t in sys/procfs.h""... $ac_c" 1>&6
+-echo "configure:8289: checking for pstatus_t in sys/procfs.h" >&5
++echo "configure:8278: checking for pstatus_t in sys/procfs.h" >&5
+  if eval "test \"`echo '$''{'bfd_cv_have_sys_procfs_type_pstatus_t'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 8294 "configure"
++#line 8283 "configure"
+ #include "confdefs.h"
+ 
+ #define _SYSCALL32
+@@ -8299,7 +8288,7 @@ int main() {
+ pstatus_t avar
+ ; return 0; }
+ EOF
+-if { (eval echo configure:8303: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:8292: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+   rm -rf conftest*
+   bfd_cv_have_sys_procfs_type_pstatus_t=yes
+ else
+@@ -8321,12 +8310,12 @@ EOF
+  echo "$ac_t""$bfd_cv_have_sys_procfs_type_pstatus_t" 1>&6
+ 
+   echo $ac_n "checking for prrun_t in sys/procfs.h""... $ac_c" 1>&6
+-echo "configure:8325: checking for prrun_t in sys/procfs.h" >&5
++echo "configure:8314: checking for prrun_t in sys/procfs.h" >&5
+  if eval "test \"`echo '$''{'bfd_cv_have_sys_procfs_type_prrun_t'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 8330 "configure"
++#line 8319 "configure"
+ #include "confdefs.h"
+ 
+ #define _SYSCALL32
+@@ -8335,7 +8324,7 @@ int main() {
+ prrun_t avar
+ ; return 0; }
+ EOF
+-if { (eval echo configure:8339: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:8328: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+   rm -rf conftest*
+   bfd_cv_have_sys_procfs_type_prrun_t=yes
+ else
+@@ -8357,12 +8346,12 @@ EOF
+  echo "$ac_t""$bfd_cv_have_sys_procfs_type_prrun_t" 1>&6
+ 
+   echo $ac_n "checking for gregset_t in sys/procfs.h""... $ac_c" 1>&6
+-echo "configure:8361: checking for gregset_t in sys/procfs.h" >&5
++echo "configure:8350: checking for gregset_t in sys/procfs.h" >&5
+  if eval "test \"`echo '$''{'bfd_cv_have_sys_procfs_type_gregset_t'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 8366 "configure"
++#line 8355 "configure"
+ #include "confdefs.h"
+ 
+ #define _SYSCALL32
+@@ -8371,7 +8360,7 @@ int main() {
+ gregset_t avar
+ ; return 0; }
+ EOF
+-if { (eval echo configure:8375: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:8364: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+   rm -rf conftest*
+   bfd_cv_have_sys_procfs_type_gregset_t=yes
+ else
+@@ -8393,12 +8382,12 @@ EOF
+  echo "$ac_t""$bfd_cv_have_sys_procfs_type_gregset_t" 1>&6
+ 
+   echo $ac_n "checking for fpregset_t in sys/procfs.h""... $ac_c" 1>&6
+-echo "configure:8397: checking for fpregset_t in sys/procfs.h" >&5
++echo "configure:8386: checking for fpregset_t in sys/procfs.h" >&5
+  if eval "test \"`echo '$''{'bfd_cv_have_sys_procfs_type_fpregset_t'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 8402 "configure"
++#line 8391 "configure"
+ #include "confdefs.h"
+ 
+ #define _SYSCALL32
+@@ -8407,7 +8396,7 @@ int main() {
+ fpregset_t avar
+ ; return 0; }
+ EOF
+-if { (eval echo configure:8411: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:8400: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+   rm -rf conftest*
+   bfd_cv_have_sys_procfs_type_fpregset_t=yes
+ else
+@@ -8429,12 +8418,12 @@ EOF
+  echo "$ac_t""$bfd_cv_have_sys_procfs_type_fpregset_t" 1>&6
+ 
+   echo $ac_n "checking for prgregset_t in sys/procfs.h""... $ac_c" 1>&6
+-echo "configure:8433: checking for prgregset_t in sys/procfs.h" >&5
++echo "configure:8422: checking for prgregset_t in sys/procfs.h" >&5
+  if eval "test \"`echo '$''{'bfd_cv_have_sys_procfs_type_prgregset_t'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 8438 "configure"
++#line 8427 "configure"
+ #include "confdefs.h"
+ 
+ #define _SYSCALL32
+@@ -8443,7 +8432,7 @@ int main() {
+ prgregset_t avar
+ ; return 0; }
+ EOF
+-if { (eval echo configure:8447: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:8436: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+   rm -rf conftest*
+   bfd_cv_have_sys_procfs_type_prgregset_t=yes
+ else
+@@ -8465,12 +8454,12 @@ EOF
+  echo "$ac_t""$bfd_cv_have_sys_procfs_type_prgregset_t" 1>&6
+ 
+   echo $ac_n "checking for prfpregset_t in sys/procfs.h""... $ac_c" 1>&6
+-echo "configure:8469: checking for prfpregset_t in sys/procfs.h" >&5
++echo "configure:8458: checking for prfpregset_t in sys/procfs.h" >&5
+  if eval "test \"`echo '$''{'bfd_cv_have_sys_procfs_type_prfpregset_t'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 8474 "configure"
++#line 8463 "configure"
+ #include "confdefs.h"
+ 
+ #define _SYSCALL32
+@@ -8479,7 +8468,7 @@ int main() {
+ prfpregset_t avar
+ ; return 0; }
+ EOF
+-if { (eval echo configure:8483: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:8472: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+   rm -rf conftest*
+   bfd_cv_have_sys_procfs_type_prfpregset_t=yes
+ else
+@@ -8501,12 +8490,12 @@ EOF
+  echo "$ac_t""$bfd_cv_have_sys_procfs_type_prfpregset_t" 1>&6
+ 
+   echo $ac_n "checking for prgregset32_t in sys/procfs.h""... $ac_c" 1>&6
+-echo "configure:8505: checking for prgregset32_t in sys/procfs.h" >&5
++echo "configure:8494: checking for prgregset32_t in sys/procfs.h" >&5
+  if eval "test \"`echo '$''{'bfd_cv_have_sys_procfs_type_prgregset32_t'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 8510 "configure"
++#line 8499 "configure"
+ #include "confdefs.h"
+ 
+ #define _SYSCALL32
+@@ -8515,7 +8504,7 @@ int main() {
+ prgregset32_t avar
+ ; return 0; }
+ EOF
+-if { (eval echo configure:8519: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:8508: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+   rm -rf conftest*
+   bfd_cv_have_sys_procfs_type_prgregset32_t=yes
+ else
+@@ -8537,12 +8526,12 @@ EOF
+  echo "$ac_t""$bfd_cv_have_sys_procfs_type_prgregset32_t" 1>&6
+ 
+   echo $ac_n "checking for prfpregset32_t in sys/procfs.h""... $ac_c" 1>&6
+-echo "configure:8541: checking for prfpregset32_t in sys/procfs.h" >&5
++echo "configure:8530: checking for prfpregset32_t in sys/procfs.h" >&5
+  if eval "test \"`echo '$''{'bfd_cv_have_sys_procfs_type_prfpregset32_t'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 8546 "configure"
++#line 8535 "configure"
+ #include "confdefs.h"
+ 
+ #define _SYSCALL32
+@@ -8551,7 +8540,7 @@ int main() {
+ prfpregset32_t avar
+ ; return 0; }
+ EOF
+-if { (eval echo configure:8555: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:8544: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+   rm -rf conftest*
+   bfd_cv_have_sys_procfs_type_prfpregset32_t=yes
+ else
+@@ -8573,12 +8562,12 @@ EOF
+  echo "$ac_t""$bfd_cv_have_sys_procfs_type_prfpregset32_t" 1>&6
+ 
+   echo $ac_n "checking for lwpid_t in sys/procfs.h""... $ac_c" 1>&6
+-echo "configure:8577: checking for lwpid_t in sys/procfs.h" >&5
++echo "configure:8566: checking for lwpid_t in sys/procfs.h" >&5
+  if eval "test \"`echo '$''{'bfd_cv_have_sys_procfs_type_lwpid_t'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 8582 "configure"
++#line 8571 "configure"
+ #include "confdefs.h"
+ 
+ #define _SYSCALL32
+@@ -8587,7 +8576,7 @@ int main() {
+ lwpid_t avar
+ ; return 0; }
+ EOF
+-if { (eval echo configure:8591: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:8580: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+   rm -rf conftest*
+   bfd_cv_have_sys_procfs_type_lwpid_t=yes
+ else
+@@ -8609,12 +8598,12 @@ EOF
+  echo "$ac_t""$bfd_cv_have_sys_procfs_type_lwpid_t" 1>&6
+ 
+   echo $ac_n "checking for psaddr_t in sys/procfs.h""... $ac_c" 1>&6
+-echo "configure:8613: checking for psaddr_t in sys/procfs.h" >&5
++echo "configure:8602: checking for psaddr_t in sys/procfs.h" >&5
+  if eval "test \"`echo '$''{'bfd_cv_have_sys_procfs_type_psaddr_t'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 8618 "configure"
++#line 8607 "configure"
+ #include "confdefs.h"
+ 
+ #define _SYSCALL32
+@@ -8623,7 +8612,7 @@ int main() {
+ psaddr_t avar
+ ; return 0; }
+ EOF
+-if { (eval echo configure:8627: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:8616: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+   rm -rf conftest*
+   bfd_cv_have_sys_procfs_type_psaddr_t=yes
+ else
+@@ -8645,12 +8634,12 @@ EOF
+  echo "$ac_t""$bfd_cv_have_sys_procfs_type_psaddr_t" 1>&6
+ 
+   echo $ac_n "checking for prsysent_t in sys/procfs.h""... $ac_c" 1>&6
+-echo "configure:8649: checking for prsysent_t in sys/procfs.h" >&5
++echo "configure:8638: checking for prsysent_t in sys/procfs.h" >&5
+  if eval "test \"`echo '$''{'bfd_cv_have_sys_procfs_type_prsysent_t'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 8654 "configure"
++#line 8643 "configure"
+ #include "confdefs.h"
+ 
+ #define _SYSCALL32
+@@ -8659,7 +8648,7 @@ int main() {
+ prsysent_t avar
+ ; return 0; }
+ EOF
+-if { (eval echo configure:8663: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:8652: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+   rm -rf conftest*
+   bfd_cv_have_sys_procfs_type_prsysent_t=yes
+ else
+@@ -8681,12 +8670,12 @@ EOF
+  echo "$ac_t""$bfd_cv_have_sys_procfs_type_prsysent_t" 1>&6
+ 
+   echo $ac_n "checking for pr_sigset_t in sys/procfs.h""... $ac_c" 1>&6
+-echo "configure:8685: checking for pr_sigset_t in sys/procfs.h" >&5
++echo "configure:8674: checking for pr_sigset_t in sys/procfs.h" >&5
+  if eval "test \"`echo '$''{'bfd_cv_have_sys_procfs_type_pr_sigset_t'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 8690 "configure"
++#line 8679 "configure"
+ #include "confdefs.h"
+ 
+ #define _SYSCALL32
+@@ -8695,7 +8684,7 @@ int main() {
+ pr_sigset_t avar
+ ; return 0; }
+ EOF
+-if { (eval echo configure:8699: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:8688: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+   rm -rf conftest*
+   bfd_cv_have_sys_procfs_type_pr_sigset_t=yes
+ else
+@@ -8717,12 +8706,12 @@ EOF
+  echo "$ac_t""$bfd_cv_have_sys_procfs_type_pr_sigset_t" 1>&6
+ 
+   echo $ac_n "checking for pr_sigaction64_t in sys/procfs.h""... $ac_c" 1>&6
+-echo "configure:8721: checking for pr_sigaction64_t in sys/procfs.h" >&5
++echo "configure:8710: checking for pr_sigaction64_t in sys/procfs.h" >&5
+  if eval "test \"`echo '$''{'bfd_cv_have_sys_procfs_type_pr_sigaction64_t'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 8726 "configure"
++#line 8715 "configure"
+ #include "confdefs.h"
+ 
+ #define _SYSCALL32
+@@ -8731,7 +8720,7 @@ int main() {
+ pr_sigaction64_t avar
+ ; return 0; }
+ EOF
+-if { (eval echo configure:8735: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:8724: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+   rm -rf conftest*
+   bfd_cv_have_sys_procfs_type_pr_sigaction64_t=yes
+ else
+@@ -8753,12 +8742,12 @@ EOF
+  echo "$ac_t""$bfd_cv_have_sys_procfs_type_pr_sigaction64_t" 1>&6
+ 
+   echo $ac_n "checking for pr_siginfo64_t in sys/procfs.h""... $ac_c" 1>&6
+-echo "configure:8757: checking for pr_siginfo64_t in sys/procfs.h" >&5
++echo "configure:8746: checking for pr_siginfo64_t in sys/procfs.h" >&5
+  if eval "test \"`echo '$''{'bfd_cv_have_sys_procfs_type_pr_siginfo64_t'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 8762 "configure"
++#line 8751 "configure"
+ #include "confdefs.h"
+ 
+ #define _SYSCALL32
+@@ -8767,7 +8756,7 @@ int main() {
+ pr_siginfo64_t avar
+ ; return 0; }
+ EOF
+-if { (eval echo configure:8771: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:8760: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+   rm -rf conftest*
+   bfd_cv_have_sys_procfs_type_pr_siginfo64_t=yes
+ else
+@@ -8794,7 +8783,7 @@ EOF
+         
+   if test $bfd_cv_have_sys_procfs_type_prfpregset_t = yes; then
+     echo $ac_n "checking whether prfpregset_t type is broken""... $ac_c" 1>&6
+-echo "configure:8798: checking whether prfpregset_t type is broken" >&5
++echo "configure:8787: checking whether prfpregset_t type is broken" >&5
+     if eval "test \"`echo '$''{'gdb_cv_prfpregset_t_broken'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -8802,7 +8791,7 @@ else
+   gdb_cv_prfpregset_t_broken=yes
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 8806 "configure"
++#line 8795 "configure"
+ #include "confdefs.h"
+ #include <sys/procfs.h>
+        int main ()
+@@ -8812,7 +8801,7 @@ else
+          return 0;
+        }
+ EOF
+-if { (eval echo configure:8816: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:8805: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+ then
+   gdb_cv_prfpregset_t_broken=no
+ else
+@@ -8837,12 +8826,12 @@ EOF
+ 
+   
+   echo $ac_n "checking for PIOCSET ioctl entry in sys/procfs.h""... $ac_c" 1>&6
+-echo "configure:8841: checking for PIOCSET ioctl entry in sys/procfs.h" >&5
++echo "configure:8830: checking for PIOCSET ioctl entry in sys/procfs.h" >&5
+   if eval "test \"`echo '$''{'gdb_cv_have_procfs_piocset'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 8846 "configure"
++#line 8835 "configure"
+ #include "confdefs.h"
+ #include <unistd.h>
+ #include <sys/types.h>
+@@ -8855,7 +8844,7 @@ int main() {
+   
+ ; return 0; }
+ EOF
+-if { (eval echo configure:8859: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:8848: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+   rm -rf conftest*
+   gdb_cv_have_procfs_piocset=yes
+ else
+@@ -8879,19 +8868,19 @@ fi
+ if test ${host} = ${target} ; then
+     
+   echo $ac_n "checking for member l_addr in struct link_map""... $ac_c" 1>&6
+-echo "configure:8883: checking for member l_addr in struct link_map" >&5
++echo "configure:8872: checking for member l_addr in struct link_map" >&5
+   if eval "test \"`echo '$''{'gdb_cv_have_struct_link_map_with_l_members'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 8888 "configure"
++#line 8877 "configure"
+ #include "confdefs.h"
+ #include <link.h>
+ int main() {
+ struct link_map lm; (void) lm.l_addr;
+ ; return 0; }
+ EOF
+-if { (eval echo configure:8895: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:8884: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+   rm -rf conftest*
+   gdb_cv_have_struct_link_map_with_l_members=yes
+ else
+@@ -8913,12 +8902,12 @@ EOF
+ 
+     
+   echo $ac_n "checking for member lm_addr in struct link_map""... $ac_c" 1>&6
+-echo "configure:8917: checking for member lm_addr in struct link_map" >&5
++echo "configure:8906: checking for member lm_addr in struct link_map" >&5
+   if eval "test \"`echo '$''{'gdb_cv_have_struct_link_map_with_lm_members'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 8922 "configure"
++#line 8911 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ #include <link.h>
+@@ -8926,7 +8915,7 @@ int main() {
+ struct link_map lm; (void) lm.lm_addr;
+ ; return 0; }
+ EOF
+-if { (eval echo configure:8930: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:8919: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+   rm -rf conftest*
+   gdb_cv_have_struct_link_map_with_lm_members=yes
+ else
+@@ -8948,12 +8937,12 @@ EOF
+ 
+     
+   echo $ac_n "checking for member som_addr in struct so_map""... $ac_c" 1>&6
+-echo "configure:8952: checking for member som_addr in struct so_map" >&5
++echo "configure:8941: checking for member som_addr in struct so_map" >&5
+   if eval "test \"`echo '$''{'gdb_cv_have_struct_so_map_with_som_members'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 8957 "configure"
++#line 8946 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ #ifdef HAVE_NLIST_H
+@@ -8964,7 +8953,7 @@ int main() {
+ struct so_map lm; (void) lm.som_addr;
+ ; return 0; }
+ EOF
+-if { (eval echo configure:8968: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:8957: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+   rm -rf conftest*
+   gdb_cv_have_struct_so_map_with_som_members=yes
+ else
+@@ -8986,12 +8975,12 @@ EOF
+ 
+     
+   echo $ac_n "checking for struct link_map32 in sys/link.h""... $ac_c" 1>&6
+-echo "configure:8990: checking for struct link_map32 in sys/link.h" >&5
++echo "configure:8979: checking for struct link_map32 in sys/link.h" >&5
+   if eval "test \"`echo '$''{'gdb_cv_have_struct_link_map32'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 8995 "configure"
++#line 8984 "configure"
+ #include "confdefs.h"
+ #define _SYSCALL32
+ #include <sys/link.h>
+@@ -8999,7 +8988,7 @@ int main() {
+ struct link_map32 l;
+ ; return 0; }
+ EOF
+-if { (eval echo configure:9003: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:8992: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+   rm -rf conftest*
+   gdb_cv_have_struct_link_map32=yes
+ else
+@@ -9026,12 +9015,12 @@ fi
+ 
+ 
+ echo $ac_n "checking for long long support in compiler""... $ac_c" 1>&6
+-echo "configure:9030: checking for long long support in compiler" >&5
++echo "configure:9019: checking for long long support in compiler" >&5
+ if eval "test \"`echo '$''{'gdb_cv_c_long_long'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 9035 "configure"
++#line 9024 "configure"
+ #include "confdefs.h"
+ 
+ int main() {
+@@ -9041,7 +9030,7 @@ int main() {
+ 
+ ; return 0; }
+ EOF
+-if { (eval echo configure:9045: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:9034: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+   rm -rf conftest*
+   gdb_cv_c_long_long=yes
+ else
+@@ -9063,7 +9052,7 @@ fi
+ 
+ 
+ echo $ac_n "checking for long long support in printf""... $ac_c" 1>&6
+-echo "configure:9067: checking for long long support in printf" >&5
++echo "configure:9056: checking for long long support in printf" >&5
+ if eval "test \"`echo '$''{'gdb_cv_printf_has_long_long'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -9071,7 +9060,7 @@ else
+   gdb_cv_printf_has_long_long=no
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 9075 "configure"
++#line 9064 "configure"
+ #include "confdefs.h"
+ 
+ int main () {
+@@ -9085,7 +9074,7 @@ int main () {
+   return (strcmp ("0x0123456789abcdef", buf));
+ }
+ EOF
+-if { (eval echo configure:9089: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:9078: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+ then
+   gdb_cv_printf_has_long_long=yes
+ else
+@@ -9109,19 +9098,19 @@ echo "$ac_t""$gdb_cv_printf_has_long_lon
+ 
+ 
+ echo $ac_n "checking for long double support in compiler""... $ac_c" 1>&6
+-echo "configure:9113: checking for long double support in compiler" >&5
++echo "configure:9102: checking for long double support in compiler" >&5
+ if eval "test \"`echo '$''{'ac_cv_c_long_double'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 9118 "configure"
++#line 9107 "configure"
+ #include "confdefs.h"
+ 
+ int main() {
+ long double foo;
+ ; return 0; }
+ EOF
+-if { (eval echo configure:9125: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:9114: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+   rm -rf conftest*
+   ac_cv_c_long_double=yes
+ else
+@@ -9143,7 +9132,7 @@ fi
+ 
+ 
+ echo $ac_n "checking for long double support in printf""... $ac_c" 1>&6
+-echo "configure:9147: checking for long double support in printf" >&5
++echo "configure:9136: checking for long double support in printf" >&5
+ if eval "test \"`echo '$''{'gdb_cv_printf_has_long_double'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -9151,7 +9140,7 @@ else
+   gdb_cv_printf_has_long_double=no
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 9155 "configure"
++#line 9144 "configure"
+ #include "confdefs.h"
+ 
+ int main () {
+@@ -9161,7 +9150,7 @@ int main () {
+   return (strncmp ("3.14159", buf, 7));
+ }
+ EOF
+-if { (eval echo configure:9165: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:9154: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+ then
+   gdb_cv_printf_has_long_double=yes
+ else
+@@ -9185,7 +9174,7 @@ echo "$ac_t""$gdb_cv_printf_has_long_dou
+ 
+ 
+ echo $ac_n "checking for long double support in scanf""... $ac_c" 1>&6
+-echo "configure:9189: checking for long double support in scanf" >&5
++echo "configure:9178: checking for long double support in scanf" >&5
+ if eval "test \"`echo '$''{'gdb_cv_scanf_has_long_double'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -9193,7 +9182,7 @@ else
+   gdb_cv_scanf_has_long_double=no
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 9197 "configure"
++#line 9186 "configure"
+ #include "confdefs.h"
+ 
+ int main () {
+@@ -9203,7 +9192,7 @@ int main () {
+   return !(f > 3.14159 && f < 3.14160);
+ }
+ EOF
+-if { (eval echo configure:9207: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:9196: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+ then
+   gdb_cv_scanf_has_long_double=yes
+ else
+@@ -9228,7 +9217,7 @@ echo "$ac_t""$gdb_cv_scanf_has_long_doub
+ case ${host_os} in
+ aix*)
+   echo $ac_n "checking for -bbigtoc option""... $ac_c" 1>&6
+-echo "configure:9232: checking for -bbigtoc option" >&5
++echo "configure:9221: checking for -bbigtoc option" >&5
+ if eval "test \"`echo '$''{'gdb_cv_bigtoc'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -9242,14 +9231,14 @@ else
+ 
+     LDFLAGS=$LDFLAGS\ $gdb_cv_bigtoc
+     cat > conftest.$ac_ext <<EOF
+-#line 9246 "configure"
++#line 9235 "configure"
+ #include "confdefs.h"
+ 
+ int main() {
+ int i;
+ ; return 0; }
+ EOF
+-if { (eval echo configure:9253: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:9242: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   :
+ else
+   echo "configure: failed program was:" >&5
+@@ -9273,7 +9262,7 @@ if test ${build} = ${host} -a ${host} = 
+    case ${host_os} in
+    hpux*)
+       echo $ac_n "checking for HPUX/OSF thread support""... $ac_c" 1>&6
+-echo "configure:9277: checking for HPUX/OSF thread support" >&5
++echo "configure:9266: checking for HPUX/OSF thread support" >&5
+       if test -f /usr/include/dce/cma_config.h ; then
+          if test "$GCC" = "yes" ; then
+             echo "$ac_t""yes" 1>&6
+@@ -9296,7 +9285,7 @@ EOF
+       # because version 0 (present on Solaris 2.4 or earlier) doesn't have
+       # the same API.
+       echo $ac_n "checking for Solaris thread debugging library""... $ac_c" 1>&6
+-echo "configure:9300: checking for Solaris thread debugging library" >&5
++echo "configure:9289: checking for Solaris thread debugging library" >&5
+       if test -f /usr/lib/libthread_db.so.1 ; then
+          echo "$ac_t""yes" 1>&6
+          cat >> confdefs.h <<\EOF
+@@ -9306,7 +9295,7 @@ EOF
+          CONFIG_OBS="${CONFIG_OBS} sol-thread.o"
+          CONFIG_SRCS="${CONFIG_SRCS} sol-thread.c"
+          echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6
+-echo "configure:9310: checking for dlopen in -ldl" >&5
++echo "configure:9299: checking for dlopen in -ldl" >&5
+ ac_lib_var=`echo dl'_'dlopen | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+@@ -9314,7 +9303,7 @@ else
+   ac_save_LIBS="$LIBS"
+ LIBS="-ldl  $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 9318 "configure"
++#line 9307 "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
+@@ -9325,7 +9314,7 @@ int main() {
+ dlopen()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:9329: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:9318: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_lib_$ac_lib_var=yes"
+ else
+@@ -9357,17 +9346,17 @@ fi
+             # all symbols visible in the dynamic symbol table.
+             hold_ldflags=$LDFLAGS
+             echo $ac_n "checking for the ld -export-dynamic flag""... $ac_c" 1>&6
+-echo "configure:9361: checking for the ld -export-dynamic flag" >&5
++echo "configure:9350: checking for the ld -export-dynamic flag" >&5
+             LDFLAGS="${LDFLAGS} -Wl,-export-dynamic"
+             cat > conftest.$ac_ext <<EOF
+-#line 9364 "configure"
++#line 9353 "configure"
+ #include "confdefs.h"
+ 
+ int main() {
+ int i;
+ ; return 0; }
+ EOF
+-if { (eval echo configure:9371: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:9360: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   found=yes
+ else
+@@ -9386,13 +9375,13 @@ rm -f conftest*
+ 	 # Sun randomly tweaked the prototypes in <proc_service.h>
+ 	 # at one point.
+ 	 echo $ac_n "checking if <proc_service.h> is old""... $ac_c" 1>&6
+-echo "configure:9390: checking if <proc_service.h> is old" >&5
++echo "configure:9379: checking if <proc_service.h> is old" >&5
+ 	 if eval "test \"`echo '$''{'gdb_cv_proc_service_is_old'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   
+ 	    cat > conftest.$ac_ext <<EOF
+-#line 9396 "configure"
++#line 9385 "configure"
+ #include "confdefs.h"
+ 
+ 		#include <proc_service.h>
+@@ -9403,7 +9392,7 @@ int main() {
+ 
+ ; return 0; }
+ EOF
+-if { (eval echo configure:9407: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:9396: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+   rm -rf conftest*
+   gdb_cv_proc_service_is_old=no
+ else
+@@ -9429,12 +9418,12 @@ EOF
+       ;;
+    aix*)
+       echo $ac_n "checking for AiX thread debugging library""... $ac_c" 1>&6
+-echo "configure:9433: checking for AiX thread debugging library" >&5
++echo "configure:9422: checking for AiX thread debugging library" >&5
+       if eval "test \"`echo '$''{'gdb_cv_have_aix_thread_debug'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 9438 "configure"
++#line 9427 "configure"
+ #include "confdefs.h"
+ #include <sys/pthdebug.h>
+ int main() {
+@@ -9443,7 +9432,7 @@ int main() {
+                                     #endif
+ ; return 0; }
+ EOF
+-if { (eval echo configure:9447: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:9436: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+   rm -rf conftest*
+   gdb_cv_have_aix_thread_debug=yes
+ else
+@@ -9468,19 +9457,19 @@ fi
+ 
+ if test "x$ac_cv_header_thread_db_h" = "xyes"; then
+    echo $ac_n "checking whether <thread_db.h> has TD_NOTALLOC""... $ac_c" 1>&6
+-echo "configure:9472: checking whether <thread_db.h> has TD_NOTALLOC" >&5
++echo "configure:9461: checking whether <thread_db.h> has TD_NOTALLOC" >&5
+ if eval "test \"`echo '$''{'gdb_cv_thread_db_h_has_td_notalloc'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 9477 "configure"
++#line 9466 "configure"
+ #include "confdefs.h"
+ #include <thread_db.h>
+ int main() {
+ int i = TD_NOTALLOC;
+ ; return 0; }
+ EOF
+-if { (eval echo configure:9484: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:9473: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+   rm -rf conftest*
+   gdb_cv_thread_db_h_has_td_notalloc=yes
+ else
+@@ -9505,19 +9494,19 @@ fi
+ 
+ if test "x$ac_cv_header_sys_syscall_h" = "xyes"; then
+    echo $ac_n "checking whether <sys/syscall.h> has __NR_tkill""... $ac_c" 1>&6
+-echo "configure:9509: checking whether <sys/syscall.h> has __NR_tkill" >&5
++echo "configure:9498: checking whether <sys/syscall.h> has __NR_tkill" >&5
+ if eval "test \"`echo '$''{'gdb_cv_sys_syscall_h_has_tkill'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 9514 "configure"
++#line 9503 "configure"
+ #include "confdefs.h"
+ #include <sys/syscall.h>
+ int main() {
+ int i = __NR_tkill;
+ ; return 0; }
+ EOF
+-if { (eval echo configure:9521: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:9510: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+   rm -rf conftest*
+   gdb_cv_sys_syscall_h_has_tkill=yes
+ else
+@@ -9585,7 +9574,8 @@ fi
+ # gdb/doc/gdbint.texinfo.
+ build_warnings="-Wimplicit -Wreturn-type -Wcomment -Wtrigraphs \
+ -Wformat -Wparentheses -Wpointer-arith -Wuninitialized -Wformat-nonliteral \
+--Wunused-label -Wunused-function"
++-Wunused-label -Wunused-function -Wno-pointer-sign -Wno-unused \
++-Wp,-U_FORTIFY_SOURCE"
+ # Up for debate: -Wswitch -Wcomment -trigraphs -Wtrigraphs
+ # -Wunused-function -Wunused-variable -Wunused-value
+ # -Wchar-subscripts -Wtraditional -Wshadow -Wcast-qual
+@@ -9629,7 +9619,7 @@ WERROR_CFLAGS=""
+ if test "x${build_warnings}" != x -a "x$GCC" = xyes
+ then
+     echo $ac_n "checking compiler warning flags""... $ac_c" 1>&6
+-echo "configure:9633: checking compiler warning flags" >&5
++echo "configure:9623: checking compiler warning flags" >&5
+     # Separate out the -Werror flag as some files just cannot be
+     # compiled with it enabled.
+     for w in ${build_warnings}; do
+@@ -9639,14 +9629,14 @@ echo "configure:9633: checking compiler 
+ 	    saved_CFLAGS="$CFLAGS"
+ 	    CFLAGS="$CFLAGS $w"
+ 	    cat > conftest.$ac_ext <<EOF
+-#line 9643 "configure"
++#line 9633 "configure"
+ #include "confdefs.h"
+ 
+ int main() {
+ 
+ ; return 0; }
+ EOF
+-if { (eval echo configure:9650: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:9640: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+   rm -rf conftest*
+   WARN_CFLAGS="${WARN_CFLAGS} $w"
+ else
+@@ -9664,12 +9654,12 @@ fi
+ 
+ # In the Cygwin environment, we need some additional flags.
+ echo $ac_n "checking for cygwin""... $ac_c" 1>&6
+-echo "configure:9668: checking for cygwin" >&5
++echo "configure:9658: checking for cygwin" >&5
+ if eval "test \"`echo '$''{'gdb_cv_os_cygwin'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 9673 "configure"
++#line 9663 "configure"
+ #include "confdefs.h"
+ 
+ #if defined (__CYGWIN__) || defined (__CYGWIN32__)
+@@ -9754,7 +9744,7 @@ if test "${with_tclconfig+set}" = set; t
+ fi
+ 
+   echo $ac_n "checking for Tcl configuration""... $ac_c" 1>&6
+-echo "configure:9758: checking for Tcl configuration" >&5
++echo "configure:9748: checking for Tcl configuration" >&5
+   if eval "test \"`echo '$''{'ac_cv_c_tclconfig'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -9863,7 +9853,7 @@ if test "${with_tkconfig+set}" = set; th
+ fi
+ 
+   echo $ac_n "checking for Tk configuration""... $ac_c" 1>&6
+-echo "configure:9867: checking for Tk configuration" >&5
++echo "configure:9857: checking for Tk configuration" >&5
+   if eval "test \"`echo '$''{'ac_cv_c_tkconfig'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -9965,7 +9955,7 @@ fi
+ 
+ no_tcl=true
+ echo $ac_n "checking for Tcl private headers. dir=${configdir}""... $ac_c" 1>&6
+-echo "configure:9969: checking for Tcl private headers. dir=${configdir}" >&5
++echo "configure:9959: checking for Tcl private headers. dir=${configdir}" >&5
+ # Check whether --with-tclinclude or --without-tclinclude was given.
+ if test "${with_tclinclude+set}" = set; then
+   withval="$with_tclinclude"
+@@ -10031,17 +10021,17 @@ fi
+ if test x"${ac_cv_c_tclh}" = x ; then
+    ac_safe=`echo "tclInt.h" | sed 'y%./+-%__p_%'`
+ echo $ac_n "checking for tclInt.h""... $ac_c" 1>&6
+-echo "configure:10035: checking for tclInt.h" >&5
++echo "configure:10025: checking for tclInt.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 10040 "configure"
++#line 10030 "configure"
+ #include "confdefs.h"
+ #include <tclInt.h>
+ EOF
+ ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+-{ (eval echo configure:10045: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:10035: \"$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*
+@@ -10101,7 +10091,7 @@ fi
+ #
+ no_tk=true
+ echo $ac_n "checking for Tk private headers""... $ac_c" 1>&6
+-echo "configure:10105: checking for Tk private headers" >&5
++echo "configure:10095: checking for Tk private headers" >&5
+ # Check whether --with-tkinclude or --without-tkinclude was given.
+ if test "${with_tkinclude+set}" = set; then
+   withval="$with_tkinclude"
+@@ -10167,17 +10157,17 @@ fi
+ if test x"${ac_cv_c_tkh}" = x ; then
+    ac_safe=`echo "tk.h" | sed 'y%./+-%__p_%'`
+ echo $ac_n "checking for tk.h""... $ac_c" 1>&6
+-echo "configure:10171: checking for tk.h" >&5
++echo "configure:10161: checking for tk.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 10176 "configure"
++#line 10166 "configure"
+ #include "confdefs.h"
+ #include <tk.h>
+ EOF
+ ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+-{ (eval echo configure:10181: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:10171: \"$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*
+@@ -10223,7 +10213,7 @@ fi
+ 
+ 	   
+ echo $ac_n "checking for Itcl private headers. srcdir=${srcdir}""... $ac_c" 1>&6
+-echo "configure:10227: checking for Itcl private headers. srcdir=${srcdir}" >&5
++echo "configure:10217: checking for Itcl private headers. srcdir=${srcdir}" >&5
+ if test x"${ac_cv_c_itclh}" = x ; then
+   for i in ${srcdir}/../itcl ${srcdir}/../../itcl ${srcdir}/../../../itcl ${srcdir}/../itcl/itcl; do
+     if test -f $i/generic/itcl.h ; then
+@@ -10246,7 +10236,7 @@ fi
+ 
+ 	   
+ echo $ac_n "checking for Itk private headers. srcdir=${srcdir}""... $ac_c" 1>&6
+-echo "configure:10250: checking for Itk private headers. srcdir=${srcdir}" >&5
++echo "configure:10240: checking for Itk private headers. srcdir=${srcdir}" >&5
+ if test x"${ac_cv_c_itkh}" = x ; then
+   for i in ${srcdir}/../itcl ${srcdir}/../../itcl ${srcdir}/../../../itcl ${srcdir}/../itcl/itk; do
+     if test -f $i/generic/itk.h ; then
+@@ -10294,7 +10284,7 @@ if test "${with_itclconfig+set}" = set; 
+ fi
+ 
+   echo $ac_n "checking for Itcl configuration""... $ac_c" 1>&6
+-echo "configure:10298: checking for Itcl configuration" >&5
++echo "configure:10288: checking for Itcl configuration" >&5
+   if eval "test \"`echo '$''{'ac_cv_c_itclconfig'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -10397,7 +10387,7 @@ if test "${with_itkconfig+set}" = set; t
+ fi
+ 
+   echo $ac_n "checking for Itk configuration""... $ac_c" 1>&6
+-echo "configure:10401: checking for Itk configuration" >&5
++echo "configure:10391: checking for Itk configuration" >&5
+   if eval "test \"`echo '$''{'ac_cv_c_itkconfig'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -10539,7 +10529,7 @@ fi
+ # Uses ac_ vars as temps to allow command line to override cache and checks.
+ # --without-x overrides everything else, but does not touch the cache.
+ echo $ac_n "checking for X""... $ac_c" 1>&6
+-echo "configure:10543: checking for X" >&5
++echo "configure:10533: checking for X" >&5
+ 
+ # Check whether --with-x or --without-x was given.
+ if test "${with_x+set}" = set; then
+@@ -10601,12 +10591,12 @@ if test "$ac_x_includes" = NO; then
+ 
+   # First, try using that file with no special directory specified.
+ cat > conftest.$ac_ext <<EOF
+-#line 10605 "configure"
++#line 10595 "configure"
+ #include "confdefs.h"
+ #include <$x_direct_test_include>
+ EOF
+ ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+-{ (eval echo configure:10610: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:10600: \"$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*
+@@ -10675,14 +10665,14 @@ if test "$ac_x_libraries" = NO; then
+   ac_save_LIBS="$LIBS"
+   LIBS="-l$x_direct_test_library $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 10679 "configure"
++#line 10669 "configure"
+ #include "confdefs.h"
+ 
+ int main() {
+ ${x_direct_test_function}()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:10686: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:10676: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   LIBS="$ac_save_LIBS"
+ # We can link X programs with no special library path.
+@@ -10924,7 +10914,7 @@ fi
+ # We only build gdbserver automatically if host and target are the same.
+ if test "x$target" = "x$host"; then
+   echo $ac_n "checking whether gdbserver is supported on this host""... $ac_c" 1>&6
+-echo "configure:10928: checking whether gdbserver is supported on this host" >&5
++echo "configure:10918: checking whether gdbserver is supported on this host" >&5
+   if test "x$build_gdbserver" = xyes; then
+     configdirs="$configdirs gdbserver"
+     echo "$ac_t""yes" 1>&6
+@@ -10997,12 +10987,12 @@ fi
+ 
+ 
+ echo $ac_n "checking for Cygwin environment""... $ac_c" 1>&6
+-echo "configure:11001: checking for Cygwin environment" >&5
++echo "configure:10991: checking for Cygwin environment" >&5
+ if eval "test \"`echo '$''{'ac_cv_cygwin'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 11006 "configure"
++#line 10996 "configure"
+ #include "confdefs.h"
+ 
+ int main() {
+@@ -11013,7 +11003,7 @@ int main() {
+ return __CYGWIN__;
+ ; return 0; }
+ EOF
+-if { (eval echo configure:11017: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:11007: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+   rm -rf conftest*
+   ac_cv_cygwin=yes
+ else
+@@ -11030,19 +11020,19 @@ echo "$ac_t""$ac_cv_cygwin" 1>&6
+ CYGWIN=
+ test "$ac_cv_cygwin" = yes && CYGWIN=yes
+ echo $ac_n "checking for mingw32 environment""... $ac_c" 1>&6
+-echo "configure:11034: checking for mingw32 environment" >&5
++echo "configure:11024: checking for mingw32 environment" >&5
+ if eval "test \"`echo '$''{'ac_cv_mingw32'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 11039 "configure"
++#line 11029 "configure"
+ #include "confdefs.h"
+ 
+ int main() {
+ return __MINGW32__;
+ ; return 0; }
+ EOF
+-if { (eval echo configure:11046: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:11036: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+   rm -rf conftest*
+   ac_cv_mingw32=yes
+ else
+@@ -11061,7 +11051,7 @@ test "$ac_cv_mingw32" = yes && MINGW32=y
+ 
+ 
+ echo $ac_n "checking for executable suffix""... $ac_c" 1>&6
+-echo "configure:11065: checking for executable suffix" >&5
++echo "configure:11055: checking for executable suffix" >&5
+ if eval "test \"`echo '$''{'ac_cv_exeext'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -11071,10 +11061,10 @@ else
+   rm -f conftest*
+   echo 'int main () { return 0; }' > conftest.$ac_ext
+   ac_cv_exeext=
+-  if { (eval echo configure:11075: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
++  if { (eval echo configure:11065: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
+     for file in conftest.*; do
+       case $file in
+-      *.c | *.C | *.o | *.obj | *.ilk | *.pdb) ;;
++      *.c | *.o | *.obj) ;;
+       *) ac_cv_exeext=`echo $file | sed -e s/conftest//` ;;
+       esac
+     done
+@@ -11113,7 +11103,7 @@ fi
+ 
+ 
+   echo $ac_n "checking for iconv""... $ac_c" 1>&6
+-echo "configure:11117: checking for iconv" >&5
++echo "configure:11107: checking for iconv" >&5
+ if eval "test \"`echo '$''{'am_cv_func_iconv'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -11121,7 +11111,7 @@ else
+     am_cv_func_iconv="no, consider installing GNU libiconv"
+     am_cv_lib_iconv=no
+     cat > conftest.$ac_ext <<EOF
+-#line 11125 "configure"
++#line 11115 "configure"
+ #include "confdefs.h"
+ #include <stdlib.h>
+ #include <iconv.h>
+@@ -11131,7 +11121,7 @@ iconv_t cd = iconv_open("","");
+        iconv_close(cd);
+ ; return 0; }
+ EOF
+-if { (eval echo configure:11135: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:11125: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   am_cv_func_iconv=yes
+ else
+@@ -11143,7 +11133,7 @@ rm -f conftest*
+       am_save_LIBS="$LIBS"
+       LIBS="$LIBS -liconv"
+       cat > conftest.$ac_ext <<EOF
+-#line 11147 "configure"
++#line 11137 "configure"
+ #include "confdefs.h"
+ #include <stdlib.h>
+ #include <iconv.h>
+@@ -11153,7 +11143,7 @@ iconv_t cd = iconv_open("","");
+          iconv_close(cd);
+ ; return 0; }
+ EOF
+-if { (eval echo configure:11157: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:11147: \"$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
+@@ -11174,13 +11164,13 @@ echo "$ac_t""$am_cv_func_iconv" 1>&6
+ EOF
+ 
+     echo $ac_n "checking for iconv declaration""... $ac_c" 1>&6
+-echo "configure:11178: checking for iconv declaration" >&5
++echo "configure:11168: 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 11184 "configure"
++#line 11174 "configure"
+ #include "confdefs.h"
+ 
+ #include <stdlib.h>
+@@ -11199,7 +11189,7 @@ int main() {
+ 
+ ; return 0; }
+ EOF
+-if { (eval echo configure:11203: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:11193: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+   rm -rf conftest*
+   am_cv_proto_iconv_arg1=""
+ else
+--- gdb-6.3/gdb/mi/mi-cmd-env.c.fix	2005-03-17 17:23:35.000000000 -0500
++++ gdb-6.3/gdb/mi/mi-cmd-env.c	2005-03-21 11:54:50.000000000 -0500
+@@ -1,6 +1,6 @@
+ /* MI Command Set - environment commands.
+ 
+-   Copyright 2002, 2003, 2004 Free Software Foundation, Inc.
++   Copyright 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+ 
+    Contributed by Red Hat Inc.
+ 
+@@ -126,7 +126,7 @@ mi_cmd_env_path (char *command, char **a
+   static struct mi_opt opts[] =
+   {
+     {"r", RESET_OPT, 0},
+-    0
++    {0}
+   };
+ 
+   dont_repeat ();
+@@ -198,7 +198,7 @@ mi_cmd_env_dir (char *command, char **ar
+   static struct mi_opt opts[] =
+   {
+     {"r", RESET_OPT, 0},
+-    0
++    {0}
+   };
+ 
+   dont_repeat ();
+--- gdb-6.3/gdb/mi/mi-getopt.c.fix	2005-03-17 17:39:02.000000000 -0500
++++ gdb-6.3/gdb/mi/mi-getopt.c	2005-03-21 11:55:03.000000000 -0500
+@@ -1,5 +1,5 @@
+ /* MI Command Set - MI Option Parser.
+-   Copyright 2000, 2001 Free Software Foundation, Inc.
++   Copyright 2000, 2001, 2005 Free Software Foundation, Inc.
+    Contributed by Cygnus Solutions (a Red Hat company).
+ 
+    This file is part of GDB.
+@@ -82,7 +82,7 @@ mi_valid_noargs (const char *prefix, int
+   char *optarg;
+   static struct mi_opt opts[] =
+   {
+-    0
++    {0}
+   };
+ 
+   if (mi_getopt (prefix, argc, argv, opts, &optind, &optarg) == -1)
+--- gdb-6.3/gdb/mi/mi-cmd-break.c.fix	2005-03-17 17:36:31.000000000 -0500
++++ gdb-6.3/gdb/mi/mi-cmd-break.c	2005-03-21 11:54:31.000000000 -0500
+@@ -1,5 +1,5 @@
+ /* MI Command Set - breakpoint and watchpoint commands.
+-   Copyright 2000, 2001, 2002 Free Software Foundation, Inc.
++   Copyright 2000, 2001, 2002, 2005 Free Software Foundation, Inc.
+    Contributed by Cygnus Solutions (a Red Hat company).
+ 
+    This file is part of GDB.
+@@ -90,7 +90,7 @@ mi_cmd_break_insert (char *command, char
+     {"c", CONDITION_OPT, 1},
+     {"i", IGNORE_COUNT_OPT, 1},
+     {"p", THREAD_OPT, 1},
+-    0
++    {0}
+   };
+ 
+   /* Parse arguments. It could be -r or -h or -t, <location> or ``--''
+@@ -194,7 +194,7 @@ mi_cmd_break_watch (char *command, char 
+   {
+     {"r", READ_OPT, 0},
+     {"a", ACCESS_OPT, 0},
+-    0
++    {0}
+   };
+ 
+   /* Parse arguments. */
+--- gdb-6.3/gdb/mi/mi-cmd-disas.c.fix	2005-03-17 17:38:40.000000000 -0500
++++ gdb-6.3/gdb/mi/mi-cmd-disas.c	2005-03-17 17:38:51.000000000 -0500
+@@ -84,7 +84,7 @@ mi_cmd_disassemble (char *command, char 
+     {"n", NUM_OPT, 1},
+     {"s", START_OPT, 1},
+     {"e", END_OPT, 1},
+-    0
++    {0}
+   };
+ 
+   /* Get the options with their arguments. Keep track of what we
+--- gdb-6.3/gdb/mi/mi-main.c.fix	2005-03-17 17:39:43.000000000 -0500
++++ gdb-6.3/gdb/mi/mi-main.c	2005-03-21 11:55:18.000000000 -0500
+@@ -1,6 +1,6 @@
+ /* MI Command Set.
+ 
+-   Copyright 2000, 2001, 2002, 2003, 2004 Free Software Foundation,
++   Copyright 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation,
+    Inc.
+ 
+    Contributed by Cygnus Solutions (a Red Hat company).
+@@ -779,7 +779,7 @@ mi_cmd_data_read_memory (char *command, 
+   static struct mi_opt opts[] =
+   {
+     {"o", OFFSET_OPT, 1},
+-    0
++    {0}
+   };
+ 
+   while (1)
+@@ -981,7 +981,7 @@ mi_cmd_data_write_memory (char *command,
+   static struct mi_opt opts[] =
+   {
+     {"o", OFFSET_OPT, 1},
+-    0
++    {0}
+   };
+ 
+   while (1)
+--- gdb-6.3/gdb/p-valprint.c.fix	2005-03-18 14:00:28.000000000 -0500
++++ gdb-6.3/gdb/p-valprint.c	2005-03-21 11:52:54.000000000 -0500
+@@ -1,5 +1,5 @@
+ /* Support for printing Pascal values for GDB, the GNU debugger.
+-   Copyright 2000, 2001, 2003
++   Copyright 2000, 2001, 2003, 2005
+    Free Software Foundation, Inc.
+ 
+    This file is part of GDB.
+@@ -739,7 +739,7 @@ pascal_object_print_value_fields (struct
+ 				  int dont_print_statmem)
+ {
+   int i, len, n_baseclasses;
+-  struct obstack tmp_obstack;
++  struct obstack tmp_obstack = {0};
+   char *last_dont_print = obstack_next_free (&dont_print_statmem_obstack);
+ 
+   CHECK_TYPEDEF (type);
+@@ -909,7 +909,7 @@ pascal_object_print_value (struct type *
+ 			   enum val_prettyprint pretty,
+ 			   struct type **dont_print_vb)
+ {
+-  struct obstack tmp_obstack;
++  struct obstack tmp_obstack = {0};
+   struct type **last_dont_print
+   = (struct type **) obstack_next_free (&dont_print_vb_obstack);
+   int i, n_baseclasses = TYPE_N_BASECLASSES (type);
+--- gdb-6.3/gdb/cli/cli-cmds.c.fix	2005-03-17 17:08:30.000000000 -0500
++++ gdb-6.3/gdb/cli/cli-cmds.c	2005-03-21 11:55:51.000000000 -0500
+@@ -1,6 +1,7 @@
+ /* GDB CLI commands.
+ 
+-   Copyright 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
++   Copyright 2000, 2001, 2002, 2003, 2004, 2005 
++   Free Software Foundation, Inc.
+ 
+    This file is part of GDB.
+ 
+@@ -652,7 +653,9 @@ static void
+ list_command (char *arg, int from_tty)
+ {
+   struct symtabs_and_lines sals, sals_end;
+-  struct symtab_and_line sal, sal_end, cursal;
++  struct symtab_and_line sal = {0};
++  struct symtab_and_line cursal = {0};
++  struct symtab_and_line sal_end = {0};
+   struct symbol *sym;
+   char *arg1;
+   int no_end = 1;
+--- gdb-6.3/gdb/cp-valprint.c.fix	2005-03-18 18:29:34.000000000 -0500
++++ gdb-6.3/gdb/cp-valprint.c	2005-03-21 11:51:28.000000000 -0500
+@@ -1,6 +1,6 @@
+ /* Support for printing C++ values for GDB, the GNU debugger.
+    Copyright 1986, 1988, 1989, 1991, 1992, 1993, 1994, 1995, 1996, 1997,
+-   2000, 2001, 2002, 2003
++   2000, 2001, 2002, 2003, 2005
+    Free Software Foundation, Inc.
+ 
+    This file is part of GDB.
+@@ -233,7 +233,7 @@ cp_print_value_fields (struct type *type
+ 		       struct type **dont_print_vb, int dont_print_statmem)
+ {
+   int i, len, n_baseclasses;
+-  struct obstack tmp_obstack;
++  struct obstack tmp_obstack = {0};
+   char *last_dont_print = obstack_next_free (&dont_print_statmem_obstack);
+   int fields_seen = 0;
+ 
+@@ -494,7 +494,7 @@ cp_print_value (struct type *type, struc
+ 		int format, int recurse, enum val_prettyprint pretty,
+ 		struct type **dont_print_vb)
+ {
+-  struct obstack tmp_obstack;
++  struct obstack tmp_obstack = {0};
+   struct type **last_dont_print
+     = (struct type **) obstack_next_free (&dont_print_vb_obstack);
+   int i, n_baseclasses = TYPE_N_BASECLASSES (type);
+--- gdb-6.3/gdb/tui/tui-layout.c.fix	2005-03-17 17:52:36.000000000 -0500
++++ gdb-6.3/gdb/tui/tui-layout.c	2005-03-21 11:49:18.000000000 -0500
+@@ -755,7 +755,7 @@ show_source_disasm_command (void)
+ 	  if (TUI_DISASM_WIN == NULL)
+ 	    {
+ 	      make_disasm_window (&TUI_DISASM_WIN, asm_height, src_height - 1);
+-	      init_and_make_win ((void **) & locator,
++	      init_and_make_win ((void **)(char *) & locator,
+ 			       LOCATOR_WIN,
+ 			       2 /* 1 */ ,
+ 			       tui_term_width (),
+@@ -848,7 +848,7 @@ show_data (enum tui_layout_type new_layo
+ 	make_source_window (&tui_win_list[win_type], src_height, data_height - 1);
+       else
+ 	make_disasm_window (&tui_win_list[win_type], src_height, data_height - 1);
+-      init_and_make_win ((void **) & locator,
++      init_and_make_win ((void **)(char *) & locator,
+ 		       LOCATOR_WIN,
+ 		       2 /* 1 */ ,
+ 		       tui_term_width (),
+@@ -963,7 +963,7 @@ make_source_or_disasm_window (struct tui
+     execution_info = tui_source_exec_info_win_ptr ();
+   else
+     execution_info = tui_disassem_exec_info_win_ptr ();
+-  init_and_make_win ((void **) & execution_info,
++  init_and_make_win ((void **)(char *) & execution_info,
+ 		   EXEC_INFO_WIN,
+ 		   height,
+ 		   3,
+@@ -1013,7 +1013,7 @@ show_source_or_disasm_and_command (enum 
+ 	    make_source_window (win_info_ptr, src_height - 1, 0);
+ 	  else
+ 	    make_disasm_window (win_info_ptr, src_height - 1, 0);
+-	  init_and_make_win ((void **) & locator,
++	  init_and_make_win ((void **)(char *) & locator,
+ 			   LOCATOR_WIN,
+ 			   2 /* 1 */ ,
+ 			   tui_term_width (),
+--- gdb-6.3/gdb/testsuite/gdb.base/move-dir.h.fix	2005-03-21 21:25:55.000000000 -0500
++++ gdb-6.3/gdb/testsuite/gdb.base/move-dir.h	2005-03-21 21:26:01.000000000 -0500
+@@ -1,4 +1,4 @@
+-#include <stdlib.h>
++#include <stdio.h>
+ 
+ void other() {
+   const char* ostring = "other";
+--- gdb-6.3/gdb/testsuite/gdb.base/sigrepeat.c.fix	2005-03-21 21:26:58.000000000 -0500
++++ gdb-6.3/gdb/testsuite/gdb.base/sigrepeat.c	2005-03-21 21:27:33.000000000 -0500
+@@ -21,6 +21,7 @@
+ #include <stdio.h>
+ #include <string.h>
+ #include <signal.h>
++#include <stdlib.h>
+ #include <sys/time.h>
+ 
+ 
+--- gdb-6.3/gdb/s390-tdep.c.fix	2005-03-17 16:23:12.000000000 -0500
++++ gdb-6.3/gdb/s390-tdep.c	2005-03-17 17:31:52.000000000 -0500
+@@ -1,6 +1,6 @@
+ /* Target-dependent code for GDB, the GNU debugger.
+ 
+-   Copyright 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
++   Copyright 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+ 
+    Contributed by D.J. Barrow (djbarrow@de.ibm.com,barrow_dj@yahoo.com)
+    for IBM Deutschland Entwicklung GmbH, IBM Corporation.
+@@ -2734,6 +2734,9 @@ s390_return_value (struct gdbarch *gdbar
+ 	case RETURN_VALUE_STRUCT_CONVENTION:
+ 	  error ("Cannot set function return value.");
+ 	  break;
++
++        default:
++      	  break;
+ 	}
+     }
+   else if (out)
+@@ -2767,6 +2770,9 @@ s390_return_value (struct gdbarch *gdbar
+ 	case RETURN_VALUE_STRUCT_CONVENTION:
+ 	  error ("Function return value unknown.");
+ 	  break;
++
++        default:
++      	  break;
+ 	}
+     }
+ 
+--- gdb-6.3/gdb/remote.c.fix	2005-03-17 16:52:24.000000000 -0500
++++ gdb-6.3/gdb/remote.c	2005-03-21 11:53:02.000000000 -0500
+@@ -1,7 +1,7 @@
+ /* Remote target communications for serial-line targets in custom GDB protocol
+ 
+    Copyright 1988, 1989, 1990, 1991, 1992, 1993, 1994, 1995, 1996,
+-   1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004
++   1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
+    Free Software Foundation, Inc.
+ 
+    This file is part of GDB.
+@@ -2648,9 +2648,9 @@ cleanup_sigint_signal_handler (void *dum
+ {
+   signal (SIGINT, handle_sigint);
+   if (sigint_remote_twice_token)
+-    delete_async_signal_handler ((struct async_signal_handler **) & sigint_remote_twice_token);
++    delete_async_signal_handler ((struct async_signal_handler **)(char *) & sigint_remote_twice_token);
+   if (sigint_remote_token)
+-    delete_async_signal_handler ((struct async_signal_handler **) & sigint_remote_token);
++    delete_async_signal_handler ((struct async_signal_handler **)(char *) & sigint_remote_token);
+ }
+ 
+ /* Send ^C to target to halt it.  Target will respond, and send us a
+--- gdb-6.3/gdb/f-exp.y.fix	2005-03-17 18:06:56.000000000 -0500
++++ gdb-6.3/gdb/f-exp.y	2005-03-21 11:52:07.000000000 -0500
+@@ -1,5 +1,5 @@
+ /* YACC parser for Fortran expressions, for GDB.
+-   Copyright 1986, 1989, 1990, 1991, 1993, 1994, 1995, 1996, 2000, 2001
++   Copyright 1986, 1989, 1990, 1991, 1993, 1994, 1995, 1996, 2000, 2001, 2005
+    Free Software Foundation, Inc.
+ 
+    Contributed by Motorola.  Adapted from the C parser by Farooq Butt
+@@ -538,6 +538,8 @@ ptype	:	typebase
+ 		      case tp_function:
+ 			follow_type = lookup_function_type (follow_type);
+ 			break;
++		      default:
++			break;
+ 		      }
+ 		  $$ = follow_type;
+ 		}
+--- gdb-6.3/gdb/remote-fileio.c.fix	2005-03-17 16:59:07.000000000 -0500
++++ gdb-6.3/gdb/remote-fileio.c	2005-03-21 11:53:10.000000000 -0500
+@@ -1,6 +1,6 @@
+ /* Remote File-I/O communications
+ 
+-   Copyright 2003 Free Software Foundation, Inc.
++   Copyright 2003, 2005 Free Software Foundation, Inc.
+ 
+    This file is part of GDB.
+ 
+@@ -1279,19 +1279,19 @@ static struct {
+   char *name;
+   void (*func)(char *);
+ } remote_fio_func_map[] = {
+-  "open", remote_fileio_func_open,
+-  "close", remote_fileio_func_close,
+-  "read", remote_fileio_func_read,
+-  "write", remote_fileio_func_write,
+-  "lseek", remote_fileio_func_lseek,
+-  "rename", remote_fileio_func_rename,
+-  "unlink", remote_fileio_func_unlink,
+-  "stat", remote_fileio_func_stat,
+-  "fstat", remote_fileio_func_fstat,
+-  "gettimeofday", remote_fileio_func_gettimeofday,
+-  "isatty", remote_fileio_func_isatty,
+-  "system", remote_fileio_func_system,
+-  NULL, NULL
++	{"open", remote_fileio_func_open},
++	{"close", remote_fileio_func_close},
++	{"read", remote_fileio_func_read},
++	{"write", remote_fileio_func_write},
++	{"lseek", remote_fileio_func_lseek},
++	{"rename", remote_fileio_func_rename},
++	{"unlink", remote_fileio_func_unlink},
++	{"stat", remote_fileio_func_stat},
++	{"fstat", remote_fileio_func_fstat},
++	{"gettimeofday", remote_fileio_func_gettimeofday},
++	{"isatty", remote_fileio_func_isatty},
++	{"system", remote_fileio_func_system},
++	{NULL, NULL}
+ };
+ 
+ static int
+--- gdb-6.3/gdb/source.c.fix	2005-03-17 18:17:50.000000000 -0500
++++ gdb-6.3/gdb/source.c	2005-03-21 11:53:22.000000000 -0500
+@@ -1,6 +1,6 @@
+ /* List lines of source files for GDB, the GNU debugger.
+    Copyright 1986, 1987, 1988, 1989, 1990, 1991, 1992, 1993, 1994,
+-   1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004
++   1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
+    Free Software Foundation, Inc.
+ 
+    This file is part of GDB.
+@@ -147,7 +147,7 @@ get_lines_to_list (void)
+ struct symtab_and_line
+ get_current_source_symtab_and_line (void)
+ {
+-  struct symtab_and_line cursal;
++  struct symtab_and_line cursal = {0};
+ 
+   cursal.symtab = current_source_symtab;
+   cursal.line = current_source_line;
+@@ -186,7 +186,7 @@ set_default_source_symtab_and_line (void
+ struct symtab_and_line
+ set_current_source_symtab_and_line (const struct symtab_and_line *sal)
+ {
+-  struct symtab_and_line cursal;
++  struct symtab_and_line cursal = {0};
+   
+   cursal.symtab = current_source_symtab;
+   cursal.line = current_source_line;
+@@ -1304,7 +1304,7 @@ static void
+ line_info (char *arg, int from_tty)
+ {
+   struct symtabs_and_lines sals;
+-  struct symtab_and_line sal;
++  struct symtab_and_line sal = {0};
+   CORE_ADDR start_pc, end_pc;
+   int i;
+ 
+--- gdb-6.3/gdb/symfile.c.fix	2005-03-17 18:36:52.000000000 -0500
++++ gdb-6.3/gdb/symfile.c	2005-03-21 11:53:49.000000000 -0500
+@@ -1,7 +1,7 @@
+ /* Generic symbol file reading for the GNU debugger, GDB.
+ 
+    Copyright 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998,
+-   1999, 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
++   1999, 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+ 
+    Contributed by Cygnus Support, using pieces from other GDB modules.
+ 
+@@ -2688,6 +2688,8 @@ add_psymbol_with_dem_name_to_list (char 
+ 	deprecated_bcache (buf, dem_namelength + 1, objfile->psymbol_cache);
+       break;
+       /* FIXME What should be done for the default case? Ignoring for now. */
++    default:
++      break;
+     }
+ 
+   /* val and coreaddr are mutually exclusive, one of them *will* be zero */
+--- gdb-6.3/gdb/linespec.c.fix	2005-03-17 19:06:14.000000000 -0500
++++ gdb-6.3/gdb/linespec.c	2005-03-21 11:52:28.000000000 -0500
+@@ -1,6 +1,6 @@
+ /* Parser for linespec for the GNU debugger, GDB.
+    Copyright 1986, 1987, 1988, 1989, 1990, 1991, 1992, 1993, 1994, 1995,
+-   1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004
++   1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
+    Free Software Foundation, Inc.
+ 
+    This file is part of GDB.
+@@ -1629,7 +1629,7 @@ static struct symtabs_and_lines
+ find_method (int funfirstline, char ***canonical, char *saved_arg,
+ 	     char *copy, struct type *t, struct symbol *sym_class)
+ {
+-  struct symtabs_and_lines values;
++  struct symtabs_and_lines values = {0};
+   struct symbol *sym = 0;
+   int i1;	/*  Counter for the symbol array.  */
+   struct symbol **sym_arr =  alloca (total_number_of_methods (t)
+--- gdb-6.3/gdb/macroexp.c.fix	2005-03-17 19:14:37.000000000 -0500
++++ gdb-6.3/gdb/macroexp.c	2005-03-21 11:52:37.000000000 -0500
+@@ -1,5 +1,5 @@
+ /* C preprocessor macro expansion for GDB.
+-   Copyright 2002 Free Software Foundation, Inc.
++   Copyright 2002, 2005 Free Software Foundation, Inc.
+    Contributed by Red Hat, Inc.
+ 
+    This file is part of GDB.
+@@ -927,7 +927,7 @@ expand (const char *id,
+   else if (def->kind == macro_function_like)
+     {
+       struct cleanup *back_to = make_cleanup (null_cleanup, 0);
+-      int argc;
++      int argc = 0;
+       struct macro_buffer *argv = NULL;
+       struct macro_buffer substituted;
+       struct macro_buffer substituted_src;
+--- gdb-6.3/gdb/macroscope.c.fix	2005-03-17 19:15:28.000000000 -0500
++++ gdb-6.3/gdb/macroscope.c	2005-03-21 11:52:46.000000000 -0500
+@@ -1,5 +1,5 @@
+ /* Functions for deciding which macros are currently in scope.
+-   Copyright 2002 Free Software Foundation, Inc.
++   Copyright 2002, 2005 Free Software Foundation, Inc.
+    Contributed by Red Hat, Inc.
+ 
+    This file is part of GDB.
+@@ -33,7 +33,7 @@
+ struct macro_scope *
+ sal_macro_scope (struct symtab_and_line sal)
+ {
+-  struct macro_source_file *main, *inclusion;
++  struct macro_source_file *main_sf, *inclusion;
+   struct macro_scope *ms;
+ 
+   if (! sal.symtab
+@@ -42,8 +42,8 @@ sal_macro_scope (struct symtab_and_line 
+ 
+   ms = (struct macro_scope *) xmalloc (sizeof (*ms));
+ 
+-  main = macro_main (sal.symtab->macro_table);
+-  inclusion = macro_lookup_inclusion (main, sal.symtab->filename);
++  main_sf = macro_main (sal.symtab->macro_table);
++  inclusion = macro_lookup_inclusion (main_sf, sal.symtab->filename);
+ 
+   if (inclusion)
+     {
+@@ -66,7 +66,7 @@ sal_macro_scope (struct symtab_and_line 
+ 
+          For the time being, though, we'll just treat these as
+          occurring at the end of the main source file.  */
+-      ms->file = main;
++      ms->file = main_sf;
+       ms->line = -1;
+ 
+       complaint (&symfile_complaints,
+@@ -83,7 +83,6 @@ struct macro_scope *
+ default_macro_scope (void)
+ {
+   struct symtab_and_line sal;
+-  struct macro_source_file *main;
+   struct macro_scope *ms;
+ 
+   /* If there's a selected frame, use its PC.  */ 
+--- gdb-6.3/gdb/target.c.fix	2005-03-17 19:18:18.000000000 -0500
++++ gdb-6.3/gdb/target.c	2005-03-17 19:18:58.000000000 -0500
+@@ -1137,6 +1137,9 @@ target_xfer_memory (CORE_ADDR memaddr, c
+ 	  if (!write)
+ 	    return EIO;
+ 	  break;
++
++	default:
++	  break;
+ 	}
+ 
+       while (reg_len > 0)
+@@ -1214,6 +1217,9 @@ target_xfer_memory_partial (CORE_ADDR me
+ 	  return -1;
+ 	}
+       break;
++
++    default:
++      break;
+     }
+ 
+   if (region->attrib.cache)
+--- gdb-6.3/gdb/gdb-events.c.fix	2005-03-17 19:19:14.000000000 -0500
++++ gdb-6.3/gdb/gdb-events.c	2005-03-21 11:52:18.000000000 -0500
+@@ -1,6 +1,6 @@
+ /* User Interface Events.
+ 
+-   Copyright 1999, 2001, 2002, 2004 Free Software Foundation, Inc.
++   Copyright 1999, 2001, 2002, 2004, 2005 Free Software Foundation, Inc.
+ 
+    Contributed by Cygnus Solutions.
+ 
+@@ -312,6 +312,8 @@ gdb_events_deliver (struct gdb_events *v
+ 	case architecture_changed:
+ 	  vector->architecture_changed ();
+ 	  break;
++	default:
++	  break;
+ 	}
+       delivering_events = event->next;
+       xfree (event);
+--- gdb-6.3/gdb/dwarf2read.c.fix	2005-03-17 19:20:05.000000000 -0500
++++ gdb-6.3/gdb/dwarf2read.c	2005-03-17 19:24:29.000000000 -0500
+@@ -9052,6 +9052,7 @@ dwarf_decode_macros (struct line_header 
+   for (;;)
+     {
+       enum dwarf_macinfo_record_type macinfo_type;
++      int tmp;
+ 
+       /* Do we at least have room for a macinfo type byte?  */
+       if (mac_ptr >= mac_end)
+@@ -9063,13 +9064,16 @@ dwarf_decode_macros (struct line_header 
+       macinfo_type = read_1_byte (abfd, mac_ptr);
+       mac_ptr++;
+ 
++      /* Check for a zero macinfo type which indicates the end of the macro
++         information.  We do this as the compiler may warn us if we
++         try and look for 0 in the switch below because 0 is not
++         an enumerated value.  */
++      tmp = (int)macinfo_type;
++      if (tmp == 0)
++	return;
++      
+       switch (macinfo_type)
+         {
+-          /* A zero macinfo type indicates the end of the macro
+-             information.  */
+-        case 0:
+-          return;
+-
+         case DW_MACINFO_define:
+         case DW_MACINFO_undef:
+           {
+--- gdb-6.3/gdb/stabsread.c.fix	2005-03-17 19:24:48.000000000 -0500
++++ gdb-6.3/gdb/stabsread.c	2005-03-21 11:53:40.000000000 -0500
+@@ -1,8 +1,8 @@
+ /* Support routines for decoding "stabs" debugging information format.
+ 
+    Copyright 1986, 1987, 1988, 1989, 1990, 1991, 1992, 1993, 1994,
+-   1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004 Free
+-   Software Foundation, Inc.
++   1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
++   Free Software Foundation, Inc.
+ 
+    This file is part of GDB.
+ 
+@@ -1794,7 +1794,8 @@ again:
+ 	  struct type *domain = read_type (pp, objfile);
+ 	  struct type *return_type;
+ 	  struct field *args;
+-	  int nargs, varargs;
++	  int nargs = 0;
++	  int varargs = 0;
+ 
+ 	  if (**pp != ',')
+ 	    /* Invalid member type data format.  */
+--- gdb-6.3/gdb/dwarf2expr.c.fix	2005-03-17 19:25:46.000000000 -0500
++++ gdb-6.3/gdb/dwarf2expr.c	2005-03-21 11:51:42.000000000 -0500
+@@ -1,5 +1,5 @@
+ /* Dwarf2 Expression Evaluator
+-   Copyright 2001, 2002, 2003 Free Software Foundation, Inc.
++   Copyright 2001, 2002, 2003, 2005 Free Software Foundation, Inc.
+    Contributed by Daniel Berlin (dan@dberlin.org)
+ 
+    This file is part of GDB.
+@@ -560,6 +560,8 @@ execute_stack_op (struct dwarf_expr_cont
+ 	      op_ptr = read_uleb128 (op_ptr, op_end, &reg);
+ 	      result += reg;
+ 	      break;
++	    default:
++	      break;
+ 	    }
+ 	  break;
+ 
+--- gdb-6.3/gdb/dwarf2-frame.c.fix	2005-03-17 19:27:00.000000000 -0500
++++ gdb-6.3/gdb/dwarf2-frame.c	2005-03-21 16:50:11.000000000 -0500
+@@ -1,6 +1,6 @@
+ /* Frame unwinder for frames with DWARF Call Frame Information.
+ 
+-   Copyright 2003, 2004 Free Software Foundation, Inc.
++   Copyright 2003, 2004, 2005 Free Software Foundation, Inc.
+ 
+    Contributed by Mark Kettenis.
+ 
+@@ -1368,7 +1368,8 @@ decode_frame_entry_1 (struct comp_unit *
+ 	  else if (*augmentation == 'P')
+ 	    {
+ 	      /* Skip.  */
+-	      buf += size_of_encoded_value (*buf++);
++	      buf += size_of_encoded_value (*buf);
++	      ++buf;
+ 	      augmentation++;
+ 	    }
+ 
+--- gdb-6.3/gdb/ada-lang.h.fix	2005-03-17 19:34:31.000000000 -0500
++++ gdb-6.3/gdb/ada-lang.h	2005-03-21 11:51:19.000000000 -0500
+@@ -1,5 +1,5 @@
+ /* Ada language support definitions for GDB, the GNU debugger.
+-   Copyright 1992, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004
++   Copyright 1992, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
+    Free Software Foundation, Inc.
+ 
+ This file is part of GDB.
+@@ -171,7 +171,7 @@ extern struct task_entry *task_list;
+    least M objects, updating V and S as necessary. */
+ 
+ #define GROW_VECT(v, s, m)                                              \
+-   if ((s) < (m)) grow_vect ((void**) &(v), &(s), (m), sizeof(*(v)));
++   if ((s) < (m)) grow_vect ((void**)(char *) &(v), &(s), (m), sizeof(*(v)));
+ 
+ extern void grow_vect (void **, size_t *, size_t, int);
+ 
+--- gdb-6.3/gdb/varobj.c.fix	2005-03-17 19:35:38.000000000 -0500
++++ gdb-6.3/gdb/varobj.c	2005-03-22 16:29:10.000000000 -0500
+@@ -1,5 +1,5 @@
+ /* Implementation of the GDB variable objects API.
+-   Copyright 1999, 2000, 2001 Free Software Foundation, Inc.
++   Copyright 1999, 2000, 2001, 2005 Free Software Foundation, Inc.
+ 
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+@@ -315,10 +315,9 @@ struct language_specific
+ 
+ /* Array of known source language routines. */
+ static struct language_specific
+-  languages[vlang_end][sizeof (struct language_specific)] = {
++  languages[vlang_end] = {
+   /* Unknown (try treating as C */
+-  {
+-   vlang_unknown,
++  {vlang_unknown,
+    c_number_of_children,
+    c_name_of_variable,
+    c_name_of_child,
+@@ -329,8 +328,7 @@ static struct language_specific
+    c_value_of_variable}
+   ,
+   /* C */
+-  {
+-   vlang_c,
++  {vlang_c,
+    c_number_of_children,
+    c_name_of_variable,
+    c_name_of_child,
+@@ -341,8 +339,7 @@ static struct language_specific
+    c_value_of_variable}
+   ,
+   /* C++ */
+-  {
+-   vlang_cplus,
++  {vlang_cplus,
+    cplus_number_of_children,
+    cplus_name_of_variable,
+    cplus_name_of_child,
+@@ -353,8 +350,7 @@ static struct language_specific
+    cplus_value_of_variable}
+   ,
+   /* Java */
+-  {
+-   vlang_java,
++  {vlang_java,
+    java_number_of_children,
+    java_name_of_variable,
+    java_name_of_child,
+@@ -509,7 +505,7 @@ varobj_create (char *objname,
+ 
+       /* Set language info */
+       lang = variable_language (var);
+-      var->root->lang = languages[lang];
++      var->root->lang = &languages[lang];
+ 
+       /* Set ourselves as our root */
+       var->root->rootvar = var;
+--- gdb-6.3/gdb/configure.in.fix	2005-03-21 17:59:50.000000000 -0500
++++ gdb-6.3/gdb/configure.in	2005-03-21 18:00:42.000000000 -0500
+@@ -1,5 +1,5 @@
+ dnl Autoconf configure script for GDB, the GNU debugger.
+-dnl Copyright 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004
++dnl Copyright 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
+ dnl Free Software Foundation, Inc.
+ dnl
+ dnl This file is part of GDB.
+@@ -1132,7 +1132,8 @@ AC_SUBST(TARGET_SYSTEM_ROOT_DEFINE)
+ # gdb/doc/gdbint.texinfo.
+ build_warnings="-Wimplicit -Wreturn-type -Wcomment -Wtrigraphs \
+ -Wformat -Wparentheses -Wpointer-arith -Wuninitialized -Wformat-nonliteral \
+--Wunused-label -Wunused-function"
++-Wunused-label -Wunused-function -Wno-pointer-sign -Wno-unused \
++-Wp,-U_FORTIFY_SOURCE"
+ # Up for debate: -Wswitch -Wcomment -trigraphs -Wtrigraphs
+ # -Wunused-function -Wunused-variable -Wunused-value
+ # -Wchar-subscripts -Wtraditional -Wshadow -Wcast-qual
diff --git a/gdb.spec b/gdb.spec
index 983964b..03c85fb 100644
--- a/gdb.spec
+++ b/gdb.spec
@@ -11,7 +11,7 @@ Name: gdb
 Version: 6.3.0.0
 
 # The release always contains a leading reserved number, start it at 0.
-Release: 1
+Release: 1.3
 
 License: GPL
 Group: Development/Debuggers
@@ -195,6 +195,9 @@ Patch145: gdb-6.3-threaded-watchpoints2-20050225.patch
 # Follow vfork fix from mainline sources
 Patch146: gdb-6.3-follow-vfork-20050303.patch
 
+# Fix unexpected compiler warning messages.
+Patch147: gdb-6.3-warnings-20050317.patch
+
 %ifarch ia64
 BuildRequires: ncurses-devel glibc-devel gcc make gzip texinfo dejagnu libunwind >= 0.96-3
 %else
@@ -274,6 +277,7 @@ and printing their data.
 %patch144 -p1
 %patch145 -p1
 %patch146 -p1
+%patch147 -p1
 
 # Change the version that gets printed at GDB startup, so it is RedHat
 # specific.
@@ -313,7 +317,7 @@ cd %{gdb_build}
 # at least one warning, and stop the compilation.  The whole configury
 # line needs to be cleaned up.
 
-export CFLAGS="$RPM_OPT_FLAGS -Wno-unused -Wno-pointer-sign -Wp,-U_FORTIFY_SOURCE"
+export CFLAGS="$RPM_OPT_FLAGS"
 
 enable_build_warnings=""
 %ifarch %{ix86} alpha ia64 ppc s390 s390x x86_64 ppc64
@@ -329,7 +333,7 @@ enable_build_warnings="--enable-gdb-build-warnings=,-Werror"
         --with-separate-debug-dir=/usr/lib/debug \
     %{_target_platform}
 
-make
+make -k
 make info
 
 # Get some information about which tools we interact with. We cannot
@@ -442,6 +446,12 @@ fi
 # don't include the files in include, they are part of binutils
 
 %changelog
+* Tue Mar 22 2005 Jeff Johnston <jjohnstn@redhat.com>	6.3.0.0-1.3
+- Bump up release number.
+
+* Thu Mar 17 2005 Jeff Johnston <jjohnstn@redhat.com>	6.3.0.0-1.1
+- Remove warnings that cause errors when compiled with gcc4 and -Werror.
+
 * Wed Mar 16 2005 Elliot Lee <sopwith@redhat.com>
 - rebuilt