beos-elf.h (STARTFILE_SPEC): Add i386-mcount.o when user gives -p option.

        * config/i386/beos-elf.h (STARTFILE_SPEC): Add i386-mcount.o
        when user gives -p option.  Add init_term_dyn.o for BeOS 5.0
        and later.

        * config/i386/beos-elf.h (INCLUDE_DEFAULTS): Add additional
        Be directories to search path.

        Remove support for __declspec(dllimport) and __declspec(dllexport).
        This is leftover cruft from the earlier BeOS gcc port when BeOS
        used Microsoft's PE object file format.
        * configure.in (i*86-*-beoself): Remove extra_objs=winnt.o.
        * config/i386/t-beos (winnt.o): Remove Makefile frag.
        * config/i386/beos-elf.h (TARGET_NOP_FUN_DLLIMPORT): Remove.
        (VALID_MACHINE_DECL_ATTRIBUTE): Remove.
        (VALID_MACHINE_TYPE_ATTRIBUTE): Remove.
        (MERGE_MACHINE_DECL_ATTRIBUTES): Remove.
        (REDO_SECTION_INFO_P): Remove.
        (ASM_EXPORT_DECL): Remove.
        (ASM_DECLARE_FUNCTION_NAME): Remove.
        (ASM_DECLARE_OBJECT_NAME): Remove.
        (ASM_OUTPUT_ALIGNED_COMMON): Remove.
        (ASM_OUTPUT_ALIGNED_DECL_COMMON): Remove.
        (ASM_OUTPUT_ALIGNED_LOCAL): Remove.
        (STRIP_NAME_ENCODING): Remove.

        Remove support for obsolete version of BeOS that is no longer
        supported by Be.
        * configure.in (i*86-*-beospe*): Remove.
        * config/i386/beos-pe.h: Remove.

From-SVN: r35420

6 files changed, 150 insertions, 365 deletions

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 2d75224..873b3ed 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,35 @@
+2000-08-02  Fred Fish  <fnf@be.com>
+
+	* config/i386/beos-elf.h (STARTFILE_SPEC): Add i386-mcount.o
+	when user gives -p option.  Add init_term_dyn.o for BeOS 5.0
+	and later.
+
+	* config/i386/beos-elf.h (INCLUDE_DEFAULTS): Add additional
+	Be directories to search path.
+	
+	Remove support for __declspec(dllimport) and __declspec(dllexport).
+	This is leftover cruft from the earlier BeOS gcc port when BeOS
+	used Microsoft's PE object file format.
+	* configure.in (i*86-*-beoself): Remove extra_objs=winnt.o.
+	* config/i386/t-beos (winnt.o): Remove Makefile frag.
+	* config/i386/beos-elf.h (TARGET_NOP_FUN_DLLIMPORT): Remove.
+	(VALID_MACHINE_DECL_ATTRIBUTE): Remove.
+	(VALID_MACHINE_TYPE_ATTRIBUTE): Remove.
+	(MERGE_MACHINE_DECL_ATTRIBUTES): Remove.
+	(REDO_SECTION_INFO_P): Remove.
+	(ASM_EXPORT_DECL): Remove.
+	(ASM_DECLARE_FUNCTION_NAME): Remove.
+	(ASM_DECLARE_OBJECT_NAME): Remove.
+	(ASM_OUTPUT_ALIGNED_COMMON): Remove.
+	(ASM_OUTPUT_ALIGNED_DECL_COMMON): Remove.
+	(ASM_OUTPUT_ALIGNED_LOCAL): Remove.
+	(STRIP_NAME_ENCODING): Remove.
+	
+	Remove support for obsolete version of BeOS that is no longer
+	supported by Be.
+	* configure.in (i*86-*-beospe*): Remove.
+	* config/i386/beos-pe.h: Remove.
+	
 2000-08-01  Jeffrey Oldham  <oldham@codesourcery.com>
             Mark Mitchell <mark@codesourcery.com>
 	
diff --git a/gcc/config/i386/beos-elf.h b/gcc/config/i386/beos-elf.h
index 3d72d02..a3588f0 100644
--- a/gcc/config/i386/beos-elf.h
+++ b/gcc/config/i386/beos-elf.h
@@ -128,7 +128,7 @@ Boston, MA 02111-1307, USA.  */
 #define LIBGCC_SPEC ""
 
 #undef  STARTFILE_SPEC
-#define STARTFILE_SPEC "crti.o%s crtbegin.o%s %{!nostart:start_dyn.o%s}"
+#define STARTFILE_SPEC "crti.o%s crtbegin.o%s %{!nostart:start_dyn.o%s} init_term_dyn.o%s %{p:i386-mcount.o%s}"
 
 #undef  ENDFILE_SPEC
 #define ENDFILE_SPEC "crtend.o%s crtn.o%s"
@@ -157,133 +157,6 @@ Boston, MA 02111-1307, USA.  */
     else fprintf ((FILE), "\t.p2align %d,,%d\n", (LOG), (MAX_SKIP))
 #endif
 
-/*
- * Support for __declspec(dllimport) & __declspec(dllexport).
- */
-
-/* We don't care about dllimport.  */
-
-#define TARGET_NOP_FUN_DLLIMPORT 1
-
-/* A C expression whose value is nonzero if IDENTIFIER with arguments ARGS
-   is a valid machine specific attribute for DECL.
-   The attributes in ATTRIBUTES have previously been assigned to DECL.  */
-
-#undef VALID_MACHINE_DECL_ATTRIBUTE
-#define VALID_MACHINE_DECL_ATTRIBUTE(DECL, ATTRIBUTES, IDENTIFIER, ARGS) \
-  i386_pe_valid_decl_attribute_p (DECL, ATTRIBUTES, IDENTIFIER, ARGS)
-extern int i386_pe_valid_decl_attribute_p ();
-
-/* A C expression whose value is nonzero if IDENTIFIER with arguments ARGS
-   is a valid machine specific attribute for TYPE.
-   The attributes in ATTRIBUTES have previously been assigned to TYPE.  */
-
-#undef VALID_MACHINE_TYPE_ATTRIBUTE
-#define VALID_MACHINE_TYPE_ATTRIBUTE(TYPE, ATTRIBUTES, IDENTIFIER, ARGS) \
-  i386_pe_valid_type_attribute_p (TYPE, ATTRIBUTES, IDENTIFIER, ARGS)
-extern int i386_pe_valid_type_attribute_p ();
-
-#define MERGE_MACHINE_DECL_ATTRIBUTES(OLD, NEW) \
-  i386_pe_merge_decl_attributes ((OLD), (NEW))
-extern union tree_node *i386_pe_merge_decl_attributes ();
-
-/* Used to implement dllexport overriding dllimport semantics.  It's also used
-   to handle vtables - the first pass won't do anything because
-   DECL_CONTEXT (DECL) will be 0 so i386_pe_dll{ex,im}port_p will return 0.
-   It's also used to handle dllimport override semantics.  */
-#if 0
-#define REDO_SECTION_INFO_P(DECL) \
-  ((DECL_MACHINE_ATTRIBUTES (DECL) != NULL_TREE) \
-   || (TREE_CODE (DECL) == VAR_DECL && DECL_VIRTUAL_P (DECL)))
-#else
-#define REDO_SECTION_INFO_P(DECL) 1
-#endif
-
-/* Used only here locally.  If the decl has been exported, emit the 
-   necessary assembly.  */
-
-#define ASM_EXPORT_DECL(FILE, NAME, DECL)				\
-  do {									\
-    if ((DECL) && i386_pe_dllexport_p (DECL))				\
-      {									\
-	fprintf ((FILE), ".section .exports\n");			\
-	fprintf ((FILE), "\t%s\t\"", STRING_ASM_OP);			\
-        assemble_name (FILE, NAME);					\
-	fprintf ((FILE), "\"\n.previous\n");				\
-      }									\
-  } while (0)
-
-/* Write the extra assembler code needed to declare a function properly.
-   Some svr4 assemblers need to also have something extra said about the
-   function's return value.  We allow for that here.  */
-
-#undef ASM_DECLARE_FUNCTION_NAME
-#define ASM_DECLARE_FUNCTION_NAME(FILE, NAME, DECL)			\
-  do {									\
-    ASM_EXPORT_DECL(FILE, NAME, DECL);					\
-    fprintf (FILE, "\t%s\t ", TYPE_ASM_OP);				\
-    assemble_name (FILE, NAME);						\
-    putc (',', FILE);							\
-    fprintf (FILE, TYPE_OPERAND_FMT, "function");			\
-    putc ('\n', FILE);							\
-    ASM_DECLARE_RESULT (FILE, DECL_RESULT (DECL));			\
-    ASM_OUTPUT_LABEL(FILE, NAME);					\
-  } while (0)
-
-/* Write the extra assembler code needed to declare an object properly.  */
-
-#undef ASM_DECLARE_OBJECT_NAME
-#define ASM_DECLARE_OBJECT_NAME(FILE, NAME, DECL)			\
-  do {									\
-    ASM_EXPORT_DECL(FILE, NAME, DECL);					\
-    fprintf (FILE, "\t%s\t ", TYPE_ASM_OP);				\
-    assemble_name (FILE, NAME);						\
-    putc (',', FILE);							\
-    fprintf (FILE, TYPE_OPERAND_FMT, "object");				\
-    putc ('\n', FILE);							\
-    size_directive_output = 0;						\
-    if (!flag_inhibit_size_directive && DECL_SIZE (DECL))		\
-      {									\
-        size_directive_output = 1;					\
-        fprintf (FILE, "\t%s\t ", SIZE_ASM_OP);				\
-        assemble_name (FILE, NAME);					\
-        putc (',', FILE);						\
-        fprintf (FILE, HOST_WIDE_INT_PRINT_DEC,				\
-                 int_size_in_bytes (TREE_TYPE (DECL)));			\
-        fputc ('\n', FILE);						\
-      }									\
-    ASM_OUTPUT_LABEL(FILE, NAME);					\
-  } while (0)
-
-/* Similarly for COMMON symbols.  */
-
-#undef ASM_OUTPUT_ALIGNED_COMMON
-#undef ASM_OUTPUT_ALIGNED_DECL_COMMON
-#define ASM_OUTPUT_ALIGNED_DECL_COMMON(FILE, DECL, NAME, SIZE, ALIGN)	\
-  do {									\
-    ASM_EXPORT_DECL(FILE, NAME, DECL);					\
-    fprintf ((FILE), "\t%s\t", COMMON_ASM_OP);				\
-    assemble_name ((FILE), (NAME));					\
-    fprintf ((FILE), ",%u,%u\n", (SIZE), (ALIGN) / BITS_PER_UNIT);	\
-  } while (0)
-
-#undef ASM_OUTPUT_ALIGNED_LOCAL
-#undef ASM_OUTPUT_ALIGNED_DECL_LOCAL
-#define ASM_OUTPUT_ALIGNED_DECL_LOCAL(FILE, DECL, NAME, SIZE, ALIGN)	     \
-  do {									     \
-    fprintf ((FILE), "\t%s\t", LOCAL_ASM_OP);				     \
-    assemble_name ((FILE), (NAME));					     \
-    fprintf ((FILE), "\n");						     \
-    ASM_OUTPUT_ALIGNED_DECL_COMMON((FILE), (DECL), (NAME), (SIZE), (ALIGN)); \
-  } while (0)
-
-/* This macro gets just the user-specified name out of the string in a
-   SYMBOL_REF.  Discard trailing @[NUM] encoded by ENCODE_SECTION_INFO.  */
-/* Unused except to let winnt.c compile.  */
-
-#undef  STRIP_NAME_ENCODING
-#define STRIP_NAME_ENCODING(VAR,SYMBOL_NAME) ((VAR) = (SYMBOL_NAME))
-
 /* For native compiler, use standard BeOS include file search paths
    rooted in /boot/develop/headers.  For a cross compiler, don't
    expect the host to use the BeOS directory scheme, and instead look
@@ -310,14 +183,25 @@ extern union tree_node *i386_pe_merge_decl_attributes ();
     { "/boot/develop/headers/be/kernel", 0, 0, 0 },\
     { "/boot/develop/headers/be/net", 0, 0, 0 },\
     { "/boot/develop/headers/be/midi", 0, 0, 0 },\
+    { "/boot/develop/headers/be/midi2", 0, 0, 0 },\
     { "/boot/develop/headers/be/media", 0, 0, 0 },\
     { "/boot/develop/headers/be/interface", 0, 0, 0 },\
     { "/boot/develop/headers/be/device", 0, 0, 0 },\
     { "/boot/develop/headers/be/app", 0, 0, 0 },\
-    { "/boot/develop/headers/cpp", 0, 0, 0 },\
-    { "/boot/develop/headers/posix", 0, 0, 0 },\
     { "/boot/develop/headers/be/precompiled", 0, 0, 0 },\
+    { "/boot/develop/headers/be/add-ons/input_server", 0, 0, 0 },\
+    { "/boot/develop/headers/be/add-ons/net_server", 0, 0, 0 },\
+    { "/boot/develop/headers/be/add-ons/screen_saver", 0, 0, 0 },\
+    { "/boot/develop/headers/be/add-ons/tracker", 0, 0, 0 },\
+    { "/boot/develop/headers/be/be_apps/Deskbar", 0, 0, 0 },\
+    { "/boot/develop/headers/be/be_apps/NetPositive", 0, 0, 0 },\
+    { "/boot/develop/headers/be/be_apps/Tracker", 0, 0, 0 },\
+    { "/boot/develop/headers/be/drivers/tty", 0, 0, 0 },\
+    { "/boot/develop/headers/be/net/netinet", 0, 0, 0 },\
+    { "/boot/develop/headers/be/storage", 0, 0, 0 },\
     { "/boot/develop/headers/be", 0, 0, 0 },\
+    { "/boot/develop/headers/cpp", 0, 0, 0 },\
+    { "/boot/develop/headers/posix", 0, 0, 0 },\
     { "/boot/develop/headers", 0, 0, 0 }, \
     { 0, 0, 0, 0 } \
     };
@@ -341,14 +225,25 @@ extern union tree_node *i386_pe_merge_decl_attributes ();
     { CROSS_INCLUDE_DIR "/be/kernel", 0, 0, 0 },\
     { CROSS_INCLUDE_DIR "/be/net", 0, 0, 0 },\
     { CROSS_INCLUDE_DIR "/be/midi", 0, 0, 0 },\
+    { CROSS_INCLUDE_DIR "/be/midi2", 0, 0, 0 },\
     { CROSS_INCLUDE_DIR "/be/media", 0, 0, 0 },\
     { CROSS_INCLUDE_DIR "/be/interface", 0, 0, 0 },\
     { CROSS_INCLUDE_DIR "/be/device", 0, 0, 0 },\
     { CROSS_INCLUDE_DIR "/be/app", 0, 0, 0 },\
-    { CROSS_INCLUDE_DIR "/cpp", 0, 0, 0 },\
-    { CROSS_INCLUDE_DIR "/posix", 0, 0, 0 },\
     { CROSS_INCLUDE_DIR "/be/precompiled", 0, 0, 0 },\
+    { CROSS_INCLUDE_DIR "/be/add-ons/input_server", 0, 0, 0 },\
+    { CROSS_INCLUDE_DIR "/be/add-ons/net_server", 0, 0, 0 },\
+    { CROSS_INCLUDE_DIR "/be/add-ons/screen_saver", 0, 0, 0 },\
+    { CROSS_INCLUDE_DIR "/be/add-ons/tracker", 0, 0, 0 },\
+    { CROSS_INCLUDE_DIR "/be/be_apps/Deskbar", 0, 0, 0 },\
+    { CROSS_INCLUDE_DIR "/be/be_apps/NetPositive", 0, 0, 0 },\
+    { CROSS_INCLUDE_DIR "/be/be_apps/Tracker", 0, 0, 0 },\
+    { CROSS_INCLUDE_DIR "/be/drivers/tty", 0, 0, 0 },\
+    { CROSS_INCLUDE_DIR "/be/net/netinet", 0, 0, 0 },\
+    { CROSS_INCLUDE_DIR "/be/storage", 0, 0, 0 },\
     { CROSS_INCLUDE_DIR "/be", 0, 0, 0 },\
+    { CROSS_INCLUDE_DIR "/cpp", 0, 0, 0 },\
+    { CROSS_INCLUDE_DIR "/posix", 0, 0, 0 },\
     { CROSS_INCLUDE_DIR , 0, 0, 0 }, \
     { 0, 0, 0, 0 } \
     };
diff --git a/gcc/config/i386/beos-pe.h b/gcc/config/i386/beos-pe.h
index f28cecf..e69de29 100644
--- a/gcc/config/i386/beos-pe.h
+++ b/gcc/config/i386/beos-pe.h
@@ -1,119 +0,0 @@
-/* Operating system specific defines for BeOS target.
-   Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000
-   Free Software Foundation, Inc.
-   Contributed by Fred Fish (fnf@cygnus.com), based on cygwin32.h.
-
-This file is part of GNU CC.
-
-GNU CC is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
-
-GNU CC is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with GNU CC; see the file COPYING.  If not, write to
-the Free Software Foundation, 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
-
-
-/* Get all the PE support related things.  */
-#include "cygwin32.h"
-
-/* Change debugging to Dwarf2.  */
-#undef SDB_DEBUGGING_INFO
-#undef DBX_DEBUGGING_INFO
-#define DWARF2_DEBUGGING_INFO
-#undef PREFERRED_DEBUGGING_TYPE
-#define PREFERRED_DEBUGGING_TYPE DWARF2_DEBUG
-
-/* Support the __declspec keyword by turning them into attributes.
-   We currently only support: dllimport and dllexport.
-   Note that the current way we do this may result in a collision with
-   predefined attributes later on.  This can be solved by using one attribute,
-   say __declspec__, and passing args to it.  The problem with that approach
-   is that args are not accumulated: each new appearance would clobber any
-   existing args.  */
-
-#undef CPP_PREDEFINES
-#define CPP_PREDEFINES "-D__BEOS__ -D__INTEL__ -D_X86_=1 \
--D__stdcall=__attribute__((__stdcall__)) \
--D__cdecl=__attribute__((__cdecl__)) \
--D__declspec(x)=__attribute__((x)) \
--Asystem(beos)"
-
-#undef CPP_SPEC
-#define CPP_SPEC "-remap %(cpp_cpu) %{posix:-D_POSIX_SOURCE}"
-
-#undef LIB_SPEC
-#define LIB_SPEC "-lroot -lbe -ltracker -lmedia -lnet -lnetdev -ldevice -lmidi -lgame -latalk -lmail"
-
-#undef STARTFILE_SPEC
-#define STARTFILE_SPEC "/boot/develop/lib/x86/start_dyn.o /boot/develop/lib/x86/init_term_dyn.o /boot/develop/lib/x86/glue-noinit.a"
-
-/* Temporary. */
-#define LINKERSCRIPT_SPEC "%{!T:-Tbeos.ld}"
-
-/* No math library. */
-#define MATH_LIBRARY ""
-
-/* Don't ignore dllimport for functions.  */
-#undef TARGET_NOP_FUN_DLLIMPORT
-#define TARGET_NOP_FUN_DLLIMPORT 0
-
-#undef SUBTARGET_SWITCHES
-#define SUBTARGET_SWITCHES
-
-/* Disable DWARF2 unwind info; this doesn't appear to work on
-   COFF-based targets right now. (I want to say "duh?" but someone
-   will correct me later. */
-
-#undef INCOMING_RETURN_ADDR_RTX
-#undef DWARF2_UNWIND_INFO
-
-/* In the current BeOS release (DR9), use of gcc's builtin alloca is a
-   problem because of the relatively low default stack size of 256K with no
-   way to expand it.  So anything we compile for the BeOS target should not
-   use the builtin alloca.  Defining SMALL_STACK disables builtin alloca.  */
-
-#define SMALL_STACK
-
-/* Yuck. */
-#ifndef CROSS_COMPILE
-#undef INCLUDE_DEFAULTS
-#define INCLUDE_DEFAULTS \
-    { \
-    { GPLUSPLUS_INCLUDE_DIR, "G++", 1, 1 },\
-    { GCC_INCLUDE_DIR, "GCC", 0, 0 },\
-    { TOOL_INCLUDE_DIR, "BINUTILS", 0, 1}, \
-    { "/boot/develop/headers/be/add-ons/graphics", 0, 0, 0 },\
-    { "/boot/develop/headers/be/translation", 0, 0, 0 },\
-    { "/boot/develop/headers/be/mail", 0, 0, 0 },\
-    { "/boot/develop/headers/gnu", 0, 0, 0 },\
-    { "/boot/develop/headers/be/drivers", 0, 0, 0 },\
-    { "/boot/develop/headers/be/game", 0, 0, 0 },\
-    { "/boot/develop/headers/be/support", 0, 0, 0 },\
-    { "/boot/develop/headers/be/storage", 0, 0, 0 },\
-    { "/boot/develop/headers/be/kernel", 0, 0, 0 },\
-    { "/boot/develop/headers/be/net", 0, 0, 0 },\
-    { "/boot/develop/headers/be/midi", 0, 0, 0 },\
-    { "/boot/develop/headers/be/media", 0, 0, 0 },\
-    { "/boot/develop/headers/be/interface", 0, 0, 0 },\
-    { "/boot/develop/headers/be/device", 0, 0, 0 },\
-    { "/boot/develop/headers/be/app", 0, 0, 0 },\
-    { "/boot/develop/headers/cpp", 0, 0, 0 },\
-    { "/boot/develop/headers/posix", 0, 0, 0 },\
-    { "/boot/develop/headers/be/precompiled", 0, 0, 0 },\
-    { "/boot/develop/headers/be", 0, 0, 0 },\
-    { "/boot/develop/headers", 0, 0, 0 }, \
-    { 0, 0, 0, 0 } \
-    };
-#endif
-
-/* Whee.  LIBRARY_PATH is Be's LD_LIBRARY_PATH, which of course will
-   cause nasty problems if we override it.  */
-#define LIBRARY_PATH_ENV	"BELIBRARIES"
diff --git a/gcc/config/i386/t-beos b/gcc/config/i386/t-beos
index 5d73a23..e8e8e50 100644
--- a/gcc/config/i386/t-beos
+++ b/gcc/config/i386/t-beos
@@ -9,6 +9,3 @@ CROSS_SYSTEM_HEADER_DIR = $(tooldir)/sys-include/posix
 
 # Use the system assert.h
 INSTALL_ASSERT_H =
-
-winnt.o: $(srcdir)/config/i386/winnt.c
-	$(CC) -c $(ALL_CFLAGS) $(ALL_CPPFLAGS) $(INCLUDES) $(srcdir)/config/i386/winnt.c
diff --git a/gcc/configure b/gcc/configure
index 46d4651..7761bc9 100755
--- a/gcc/configure
+++ b/gcc/configure
@@ -1494,7 +1494,7 @@ esac
 
 
 # Find some useful tools
-for ac_prog in mawk gawk nawk awk
+for ac_prog in gawk mawk nawk awk
 do
 # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
@@ -4473,20 +4473,11 @@ for machine in $build $host $target; do
 		tm_file=i386/i386-aout.h
 		tmake_file=i386/t-i386bare
 		;;
-	i[34567]86-*-beospe*)
-		xm_file=i386/xm-beos.h
-		xm_defines="USE_C_ALLOCA"
-		tmake_file=i386/t-beos
-		tm_file=i386/beos-pe.h
-		xmake_file=i386/x-beos
-		extra_objs=winnt.o
-		;;
 	i[34567]86-*-beoself* | i[34567]86-*-beos*)
 		xm_file=i386/xm-beos.h
 		tmake_file='i386/t-beos i386/t-crtpic'
 		tm_file=i386/beos-elf.h
 		xmake_file=i386/x-beos
-		extra_objs=winnt.o
 		extra_parts='crtbegin.o crtend.o'
 		;;
 	i[34567]86-*-bsdi* | i[34567]86-*-bsd386*)
@@ -7091,7 +7082,7 @@ fi
 
 
         echo $ac_n "checking for strerror in -lcposix""... $ac_c" 1>&6
-echo "configure:7095: checking for strerror in -lcposix" >&5
+echo "configure:7086: checking for strerror in -lcposix" >&5
 ac_lib_var=`echo cposix'_'strerror | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -7099,7 +7090,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lcposix  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 7103 "configure"
+#line 7094 "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
@@ -7110,7 +7101,7 @@ int main() {
 strerror()
 ; return 0; }
 EOF
-if { (eval echo configure:7114: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7105: \"$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
@@ -7133,12 +7124,12 @@ fi
   
 
 echo $ac_n "checking for working const""... $ac_c" 1>&6
-echo "configure:7137: checking for working const" >&5
+echo "configure:7128: 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 7142 "configure"
+#line 7133 "configure"
 #include "confdefs.h"
 
 int main() {
@@ -7187,7 +7178,7 @@ ccp = (char const *const *) p;
 
 ; return 0; }
 EOF
-if { (eval echo configure:7191: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:7182: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_c_const=yes
 else
@@ -7208,12 +7199,12 @@ EOF
 fi
 
 echo $ac_n "checking for off_t""... $ac_c" 1>&6
-echo "configure:7212: checking for off_t" >&5
+echo "configure:7203: 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 7217 "configure"
+#line 7208 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #if STDC_HEADERS
@@ -7241,12 +7232,12 @@ EOF
 fi
 
 echo $ac_n "checking for size_t""... $ac_c" 1>&6
-echo "configure:7245: checking for size_t" >&5
+echo "configure:7236: 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 7250 "configure"
+#line 7241 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #if STDC_HEADERS
@@ -7276,19 +7267,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:7280: checking for working alloca.h" >&5
+echo "configure:7271: 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 7285 "configure"
+#line 7276 "configure"
 #include "confdefs.h"
 #include <alloca.h>
 int main() {
 char *p = alloca(2 * sizeof(int));
 ; return 0; }
 EOF
-if { (eval echo configure:7292: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7283: \"$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
@@ -7309,12 +7300,12 @@ EOF
 fi
 
 echo $ac_n "checking for alloca""... $ac_c" 1>&6
-echo "configure:7313: checking for alloca" >&5
+echo "configure:7304: 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 7318 "configure"
+#line 7309 "configure"
 #include "confdefs.h"
 
 #ifdef __GNUC__
@@ -7342,7 +7333,7 @@ int main() {
 char *p = (char *) alloca(1);
 ; return 0; }
 EOF
-if { (eval echo configure:7346: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7337: \"$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
@@ -7374,12 +7365,12 @@ EOF
 
 
 echo $ac_n "checking whether alloca needs Cray hooks""... $ac_c" 1>&6
-echo "configure:7378: checking whether alloca needs Cray hooks" >&5
+echo "configure:7369: 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 7383 "configure"
+#line 7374 "configure"
 #include "confdefs.h"
 #if defined(CRAY) && ! defined(CRAY2)
 webecray
@@ -7404,12 +7395,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:7408: checking for $ac_func" >&5
+echo "configure:7399: 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 7413 "configure"
+#line 7404 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -7432,7 +7423,7 @@ $ac_func();
 
 ; return 0; }
 EOF
-if { (eval echo configure:7436: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7427: \"$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
@@ -7459,7 +7450,7 @@ done
 fi
 
 echo $ac_n "checking stack direction for C alloca""... $ac_c" 1>&6
-echo "configure:7463: checking stack direction for C alloca" >&5
+echo "configure:7454: 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
@@ -7467,7 +7458,7 @@ else
   ac_cv_c_stack_direction=0
 else
   cat > conftest.$ac_ext <<EOF
-#line 7471 "configure"
+#line 7462 "configure"
 #include "confdefs.h"
 find_stack_direction ()
 {
@@ -7486,7 +7477,7 @@ main ()
   exit (find_stack_direction() < 0);
 }
 EOF
-if { (eval echo configure:7490: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:7481: \"$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
@@ -7513,17 +7504,17 @@ unistd.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:7517: checking for $ac_hdr" >&5
+echo "configure:7508: 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 7522 "configure"
+#line 7513 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:7527: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:7518: \"$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*
@@ -7553,12 +7544,12 @@ done
 strdup __argz_count __argz_stringify __argz_next
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:7557: checking for $ac_func" >&5
+echo "configure:7548: 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 7562 "configure"
+#line 7553 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -7581,7 +7572,7 @@ $ac_func();
 
 ; return 0; }
 EOF
-if { (eval echo configure:7585: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7576: \"$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
@@ -7610,12 +7601,12 @@ done
      for ac_func in stpcpy
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:7614: checking for $ac_func" >&5
+echo "configure:7605: 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 7619 "configure"
+#line 7610 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -7638,7 +7629,7 @@ $ac_func();
 
 ; return 0; }
 EOF
-if { (eval echo configure:7642: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7633: \"$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
@@ -7672,19 +7663,19 @@ EOF
 
    if test $ac_cv_header_locale_h = yes; then
     echo $ac_n "checking for LC_MESSAGES""... $ac_c" 1>&6
-echo "configure:7676: checking for LC_MESSAGES" >&5
+echo "configure:7667: 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 7681 "configure"
+#line 7672 "configure"
 #include "confdefs.h"
 #include <locale.h>
 int main() {
 return LC_MESSAGES
 ; return 0; }
 EOF
-if { (eval echo configure:7688: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7679: \"$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
@@ -7705,7 +7696,7 @@ EOF
     fi
   fi
    echo $ac_n "checking whether NLS is requested""... $ac_c" 1>&6
-echo "configure:7709: checking whether NLS is requested" >&5
+echo "configure:7700: 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"
@@ -7725,7 +7716,7 @@ fi
 EOF
 
       echo $ac_n "checking whether included gettext is requested""... $ac_c" 1>&6
-echo "configure:7729: checking whether included gettext is requested" >&5
+echo "configure:7720: 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"
@@ -7744,17 +7735,17 @@ fi
 
 	ac_safe=`echo "libintl.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for libintl.h""... $ac_c" 1>&6
-echo "configure:7748: checking for libintl.h" >&5
+echo "configure:7739: 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 7753 "configure"
+#line 7744 "configure"
 #include "confdefs.h"
 #include <libintl.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:7758: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:7749: \"$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*
@@ -7771,19 +7762,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:7775: checking for gettext in libc" >&5
+echo "configure:7766: 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 7780 "configure"
+#line 7771 "configure"
 #include "confdefs.h"
 #include <libintl.h>
 int main() {
 return (int) gettext ("")
 ; return 0; }
 EOF
-if { (eval echo configure:7787: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7778: \"$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
@@ -7799,7 +7790,7 @@ echo "$ac_t""$gt_cv_func_gettext_libc" 1>&6
 
 	   if test "$gt_cv_func_gettext_libc" != "yes"; then
 	     echo $ac_n "checking for bindtextdomain in -lintl""... $ac_c" 1>&6
-echo "configure:7803: checking for bindtextdomain in -lintl" >&5
+echo "configure:7794: 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
@@ -7807,7 +7798,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lintl  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 7811 "configure"
+#line 7802 "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
@@ -7818,7 +7809,7 @@ int main() {
 bindtextdomain()
 ; return 0; }
 EOF
-if { (eval echo configure:7822: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7813: \"$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
@@ -7834,12 +7825,12 @@ 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:7838: checking for gettext in libintl" >&5
+echo "configure:7829: 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
   echo $ac_n "checking for gettext in -lintl""... $ac_c" 1>&6
-echo "configure:7843: checking for gettext in -lintl" >&5
+echo "configure:7834: checking for gettext in -lintl" >&5
 ac_lib_var=`echo intl'_'gettext | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -7847,7 +7838,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lintl  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 7851 "configure"
+#line 7842 "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
@@ -7858,7 +7849,7 @@ int main() {
 gettext()
 ; return 0; }
 EOF
-if { (eval echo configure:7862: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7853: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -7897,7 +7888,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:7901: checking for $ac_word" >&5
+echo "configure:7892: 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
@@ -7931,12 +7922,12 @@ fi
 		for ac_func in dcgettext
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:7935: checking for $ac_func" >&5
+echo "configure:7926: 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 7940 "configure"
+#line 7931 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -7959,7 +7950,7 @@ $ac_func();
 
 ; return 0; }
 EOF
-if { (eval echo configure:7963: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7954: \"$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
@@ -7986,7 +7977,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:7990: checking for $ac_word" >&5
+echo "configure:7981: 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
@@ -8022,7 +8013,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:8026: checking for $ac_word" >&5
+echo "configure:8017: 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
@@ -8054,7 +8045,7 @@ else
 fi
 
 		cat > conftest.$ac_ext <<EOF
-#line 8058 "configure"
+#line 8049 "configure"
 #include "confdefs.h"
 
 int main() {
@@ -8062,7 +8053,7 @@ extern int _nl_msg_cat_cntr;
 			       return _nl_msg_cat_cntr
 ; return 0; }
 EOF
-if { (eval echo configure:8066: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8057: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   CATOBJEXT=.gmo
 		   DATADIRNAME=share
@@ -8085,7 +8076,7 @@ fi
 
         if test "$CATOBJEXT" = "NONE"; then
 	  echo $ac_n "checking whether catgets can be used""... $ac_c" 1>&6
-echo "configure:8089: checking whether catgets can be used" >&5
+echo "configure:8080: checking whether catgets can be used" >&5
 	  # Check whether --with-catgets or --without-catgets was given.
 if test "${with_catgets+set}" = set; then
   withval="$with_catgets"
@@ -8098,7 +8089,7 @@ fi
 
 	  if test "$nls_cv_use_catgets" = "yes"; then
 	    	    echo $ac_n "checking for main in -li""... $ac_c" 1>&6
-echo "configure:8102: checking for main in -li" >&5
+echo "configure:8093: checking for main in -li" >&5
 ac_lib_var=`echo i'_'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
@@ -8106,14 +8097,14 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-li  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 8110 "configure"
+#line 8101 "configure"
 #include "confdefs.h"
 
 int main() {
 main()
 ; return 0; }
 EOF
-if { (eval echo configure:8117: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8108: \"$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
@@ -8141,12 +8132,12 @@ else
 fi
 
 	    echo $ac_n "checking for catgets""... $ac_c" 1>&6
-echo "configure:8145: checking for catgets" >&5
+echo "configure:8136: checking for catgets" >&5
 if eval "test \"`echo '$''{'ac_cv_func_catgets'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 8150 "configure"
+#line 8141 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char catgets(); below.  */
@@ -8169,7 +8160,7 @@ catgets();
 
 ; return 0; }
 EOF
-if { (eval echo configure:8173: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8164: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_catgets=yes"
 else
@@ -8191,7 +8182,7 @@ EOF
 	       # Extract the first word of "gencat", so it can be a program name with args.
 set dummy gencat; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:8195: checking for $ac_word" >&5
+echo "configure:8186: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_GENCAT'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -8227,7 +8218,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:8231: checking for $ac_word" >&5
+echo "configure:8222: 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
@@ -8264,7 +8255,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:8268: checking for $ac_word" >&5
+echo "configure:8259: 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
@@ -8303,7 +8294,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:8307: checking for $ac_word" >&5
+echo "configure:8298: 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
@@ -8361,7 +8352,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:8365: checking for $ac_word" >&5
+echo "configure:8356: 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
@@ -8395,7 +8386,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:8399: checking for $ac_word" >&5
+echo "configure:8390: 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
@@ -8435,7 +8426,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:8439: checking for $ac_word" >&5
+echo "configure:8430: 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
@@ -8530,7 +8521,7 @@ fi
        LINGUAS=
      else
        echo $ac_n "checking for catalogs to be installed""... $ac_c" 1>&6
-echo "configure:8534: checking for catalogs to be installed" >&5
+echo "configure:8525: checking for catalogs to be installed" >&5
        if test "x$LINGUAS" = "x"; then
 	 LINGUAS=$ALL_LINGUAS
        else
@@ -8562,17 +8553,17 @@ echo "configure:8534: checking for catalogs to be installed" >&5
    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:8566: checking for linux/version.h" >&5
+echo "configure:8557: 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 8571 "configure"
+#line 8562 "configure"
 #include "confdefs.h"
 #include <linux/version.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:8576: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:8567: \"$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*
@@ -8647,7 +8638,7 @@ fi
 
 
 echo $ac_n "checking whether windows registry support is requested""... $ac_c" 1>&6
-echo "configure:8651: checking whether windows registry support is requested" >&5
+echo "configure:8642: checking whether windows registry support is requested" >&5
 if test x$enable_win32_registry != xno; then
   cat >> confdefs.h <<\EOF
 #define ENABLE_WIN32_REGISTRY 1
@@ -8676,7 +8667,7 @@ esac
 
 if test x$enable_win32_registry != xno; then
   echo $ac_n "checking registry key on windows hosts""... $ac_c" 1>&6
-echo "configure:8680: checking registry key on windows hosts" >&5
+echo "configure:8671: checking registry key on windows hosts" >&5
   cat >> confdefs.h <<EOF
 #define WIN32_REGISTRY_KEY "$gcc_cv_win32_registry_key"
 EOF
@@ -8870,7 +8861,7 @@ fi
 
 # Figure out what assembler alignment features are present.
 echo $ac_n "checking assembler alignment features""... $ac_c" 1>&6
-echo "configure:8874: checking assembler alignment features" >&5
+echo "configure:8865: checking assembler alignment features" >&5
 gcc_cv_as=
 gcc_cv_as_alignment_features=
 gcc_cv_as_gas_srcdir=`echo $srcdir | sed -e 's,/gcc$,,'`/gas
@@ -8991,7 +8982,7 @@ fi
 echo "$ac_t""$gcc_cv_as_alignment_features" 1>&6
 
 echo $ac_n "checking assembler subsection support""... $ac_c" 1>&6
-echo "configure:8995: checking assembler subsection support" >&5
+echo "configure:8986: checking assembler subsection support" >&5
 gcc_cv_as_subsections=
 if test x$gcc_cv_as != x; then
 	# Check if we have .subsection
@@ -9031,7 +9022,7 @@ fi
 echo "$ac_t""$gcc_cv_as_subsections" 1>&6
 
 echo $ac_n "checking assembler weak support""... $ac_c" 1>&6
-echo "configure:9035: checking assembler weak support" >&5
+echo "configure:9026: checking assembler weak support" >&5
 gcc_cv_as_weak=
 if test x$gcc_cv_as != x; then
 	# Check if we have .weak
@@ -9048,7 +9039,7 @@ fi
 echo "$ac_t""$gcc_cv_as_weak" 1>&6
 
 echo $ac_n "checking assembler hidden support""... $ac_c" 1>&6
-echo "configure:9052: checking assembler hidden support" >&5
+echo "configure:9043: checking assembler hidden support" >&5
 gcc_cv_as_hidden=
 if test x$gcc_cv_as != x; then
 	# Check if we have .hidden
@@ -9068,7 +9059,7 @@ echo "$ac_t""$gcc_cv_as_hidden" 1>&6
 case "$target" in 
   sparc*-*-*)
     echo $ac_n "checking assembler .register pseudo-op support""... $ac_c" 1>&6
-echo "configure:9072: checking assembler .register pseudo-op support" >&5
+echo "configure:9063: checking assembler .register pseudo-op support" >&5
 if eval "test \"`echo '$''{'gcc_cv_as_register_pseudo_op'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -9096,7 +9087,7 @@ EOF
     fi
 
     echo $ac_n "checking assembler supports -relax""... $ac_c" 1>&6
-echo "configure:9100: checking assembler supports -relax" >&5
+echo "configure:9091: checking assembler supports -relax" >&5
 if eval "test \"`echo '$''{'gcc_cv_as_relax_opt'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -9126,7 +9117,7 @@ EOF
     case "$tm_file" in
     *64*)
 	echo $ac_n "checking for 64 bit support in assembler ($gcc_cv_as)""... $ac_c" 1>&6
-echo "configure:9130: checking for 64 bit support in assembler ($gcc_cv_as)" >&5
+echo "configure:9121: checking for 64 bit support in assembler ($gcc_cv_as)" >&5
 if eval "test \"`echo '$''{'gcc_cv_as_flags64'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -9171,7 +9162,7 @@ EOF
 
     if test "x$gcc_cv_as_flags64" != xno; then
 	echo $ac_n "checking for assembler offsetable %lo() support""... $ac_c" 1>&6
-echo "configure:9175: checking for assembler offsetable %lo() support" >&5
+echo "configure:9166: checking for assembler offsetable %lo() support" >&5
 if eval "test \"`echo '$''{'gcc_cv_as_offsetable_lo10'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -9210,7 +9201,7 @@ EOF
 
   i[34567]86-*-*)
     echo $ac_n "checking assembler instructions""... $ac_c" 1>&6
-echo "configure:9214: checking assembler instructions" >&5
+echo "configure:9205: checking assembler instructions" >&5
     gcc_cv_as_instructions=
     if test x$gcc_cv_as != x; then
 	set "filds fists" "filds mem; fists mem"
@@ -9340,7 +9331,7 @@ fi
 
 # Build a new-libstdc++ system (ie libstdc++-v3)
 echo $ac_n "checking for libstdc++ to install""... $ac_c" 1>&6
-echo "configure:9344: checking for libstdc++ to install" >&5
+echo "configure:9335: checking for libstdc++ to install" >&5
 # Check whether --enable-libstdcxx-v3 or --disable-libstdcxx-v3 was given.
 if test "${enable_libstdcxx_v3+set}" = set; then
   enableval="$enable_libstdcxx_v3"
@@ -9364,7 +9355,7 @@ EOF
 
 
 echo $ac_n "checking whether to enable maintainer-specific portions of Makefiles""... $ac_c" 1>&6
-echo "configure:9368: checking whether to enable maintainer-specific portions of Makefiles" >&5
+echo "configure:9359: 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"
diff --git a/gcc/configure.in b/gcc/configure.in
index 1cf7395..262ee46 100644
--- a/gcc/configure.in
+++ b/gcc/configure.in
@@ -1423,23 +1423,12 @@ changequote([,])dnl
 		tmake_file=i386/t-i386bare
 		;;
 changequote(,)dnl
-	i[34567]86-*-beospe*)
-changequote([,])dnl
-		xm_file=i386/xm-beos.h
-		xm_defines="USE_C_ALLOCA"
-		tmake_file=i386/t-beos
-		tm_file=i386/beos-pe.h
-		xmake_file=i386/x-beos
-		extra_objs=winnt.o
-		;;
-changequote(,)dnl
 	i[34567]86-*-beoself* | i[34567]86-*-beos*)
 changequote([,])dnl
 		xm_file=i386/xm-beos.h
 		tmake_file='i386/t-beos i386/t-crtpic'
 		tm_file=i386/beos-elf.h
 		xmake_file=i386/x-beos
-		extra_objs=winnt.o
 		extra_parts='crtbegin.o crtend.o'
 		;;
 changequote(,)dnl