cleanup patches

5 files changed, 1677 insertions, 16 deletions

diff --git a/sys-devel/gcc/Manifest b/sys-devel/gcc/Manifest
index 2ac72a01b780..53be2b1b6108 100644
--- a/sys-devel/gcc/Manifest
+++ b/sys-devel/gcc/Manifest
@@ -2,8 +2,8 @@
 Hash: SHA1
 
 MD5 86661ba0ca338a2783dd95296df291f3 ChangeLog 55289
-MD5 142c4f0f1b36b7e57a99103c618ea5d9 gcc-2.95.3-r8.ebuild 9107
-MD5 8ba3ef9809d3cee777b3f2c995bdb742 gcc-3.0.4-r6.ebuild 8469
+MD5 ff1e34206f0acd8bf35fdfe97d7416d4 gcc-2.95.3-r8.ebuild 9108
+MD5 f6c84e13f0ffb79fa7856b2f7a3a1e63 gcc-3.0.4-r6.ebuild 8460
 MD5 3a2e4f5d5f2d94e5ee2a399ab3b0f32e gcc-3.3-r1.ebuild 16506
 MD5 ca02ab22b16026345e426c4698eb3058 gcc-3.1.1-r1.ebuild 9451
 MD5 b5f1d4d71ad38c5c5e489466ac0ad399 gcc-3.3.3-r3.ebuild 24690
@@ -37,6 +37,7 @@ MD5 5a9db19cd5ad6ad16b0f838d525d842a files/digest-gcc-3.3.3-r3 522
 MD5 0d683280daf95e6bb9712549352a200c files/digest-gcc-3.1.1-r1 140
 MD5 651abb651e5fdcec7c83354b5742d26d files/digest-gcc-3.4.0-r6 443
 MD5 3fd5a29d44b89f4fb220fccaa968fc05 files/digest-gcc-3.3.3-r6 442
+MD5 9c13e6b0d5770979430b76c578afa22c files/gcc3-program-transform.patch 9771
 MD5 8f56750ce25ca30ffebcbdb65de95a1f files/digest-gcc-3.3.3_pre20040426 138
 MD5 f57a9900e4d0edcae7b1e327e263d2f7 files/digest-gcc-3.3 294
 MD5 12d4b0c4fc49fad52850ab007c3c7371 files/digest-gcc-3.3-r1 353
@@ -47,13 +48,12 @@ MD5 f48105f24e5c714530e66a94aa56d615 files/digest-gcc-3.3.2-r2 361
 MD5 f48105f24e5c714530e66a94aa56d615 files/digest-gcc-3.3.2-r3 361
 MD5 29b68fb9b347114baf405bf67ebca0cd files/digest-gcc-3.3.2-r4 361
 MD5 b56b1fa94f82e5c569de7677b8a485e0 files/fix_libtool_files.sh 1738
+MD5 33df162e1767e168f4f39442785071af files/texinfo-4.0-no-ncurses-gentoo.diff 51748
 MD5 385267d11aa8b32522d1585b2d520476 files/gcc-3-deopt-doc.patch 819
 MD5 a84561f46d573c1c835b1c4d2510cc07 files/gcc-3-deopt.patch 588
-MD5 9c13e6b0d5770979430b76c578afa22c files/gcc3-program-transform.patch 9771
 MD5 8baffb486c75efe253bd2daa88daa7d6 files/gcc331_use_multilib.amd64.patch 352
 MD5 e3193bdffb435b77a21bfb504ff6f591 files/mkinfodir 7324
 MD5 c589fe6a54dc88cf40463cf85a32e81e files/specs-3.3-amd64-unilib 3953
-MD5 33df162e1767e168f4f39442785071af files/texinfo-4.0-no-ncurses-gentoo.diff 51748
 MD5 782ac9b8dbc629fe4fdfaa7744cfc004 files/scan_libgcc_linked_ssp.sh 869
 MD5 01c41c9e6857eb40d402f2acb2bd96f9 files/digest-gcc-3.3.2-r5 361
 MD5 21848cde4833618f2898e7d17b75633e files/scan_libgcc_linked_ssp.txt 173
@@ -67,6 +67,10 @@ MD5 d476dba058ac32b251723e136c6dfa8e files/digest-gcc-3.3.3-r4 526
 MD5 9996ea8d65888808363832ea1571fe0a files/digest-gcc-3.3.3_pre20040322 138
 MD5 e962c23dd4396850f0e36424ec5596d7 files/digest-gcc-3.3.3_pre20040408-r1 138
 MD5 3a68d40d170427ffbfcf181b5099d693 files/digest-gcc-3.3.3-r5 528
+MD5 33df162e1767e168f4f39442785071af files/3.0/texinfo-4.0-no-ncurses-gentoo.diff 51748
+MD5 9c13e6b0d5770979430b76c578afa22c files/3.0/gcc3-program-transform.patch 9771
+MD5 b1a242694f56184cbcdd40ba25800d50 files/2.95.3/gcc-2.95.3-alpha.diff 14345
+MD5 523970c128b929fe7c7cf36508ebd1d5 files/2.95.3/gcc-2.95.3-new-atexit.diff 13604
 MD5 aa7a1e8bbe618c0d88368e69caeb7653 files/3.1/gcc31-attr-visibility.patch.bz2 3671
 MD5 8b4c6af1c730dcdd843a77e8095d312b files/3.1/gcc31-attr-visibility2.patch.bz2 2341
 MD5 98f539e65ab7e21994e5d378537a5506 files/3.1/gcc31-boehm-gc-libs.patch.bz2 1921
@@ -87,8 +91,6 @@ MD5 2f1d2c02b99aa182f1fd9b6328c8b77a files/3.1/gcc31-libstdc++-setrlim.patch.bz2
 MD5 df404bbcc95193a2591895758915e74e files/3.1/gcc31-pr6643.patch.bz2 421
 MD5 386ffd7fc3ca4a8af55155fe57871dc4 files/3.1/gcc31-test-rotate.patch.bz2 1060
 MD5 7f4bc242692c8e5a2ea0e3e865433d94 files/3.1/gcc31-trunc_int_for_mode.patch.bz2 826
-MD5 b1a242694f56184cbcdd40ba25800d50 files/2.95.3/gcc-2.95.3-alpha.diff 14345
-MD5 523970c128b929fe7c7cf36508ebd1d5 files/2.95.3/gcc-2.95.3-new-atexit.diff 13604
 MD5 2b3b3b8637dc17eedce3b1ca1b68f1f1 files/3.2/gcc-3.2-glibc-2.3-compat.diff 5511
 MD5 a97a78f90c372855823b9facf1ba57b6 files/3.2/gcc-3.2.ctype.patch 3500
 MD5 7f884a426afe182c10d2a5fad94c73cc files/3.2/gcc-3.2.fix-copy.patch 2185
@@ -155,7 +157,7 @@ MD5 4edccdf0b4f6dbbc9f7bc9370c255e0c files/3.4.0/reiser4-why-do-you-hate-me.patc
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.9.8 (GNU/Linux)
 
-iD8DBQFAxPwuHTu7gpaalycRAkFdAKCy+gndVUp9+b9eg6HZRCdpRPr6jwCg8es3
-IggGoNn2BFZgLAEYtF70zeE=
-=GSDh
+iD8DBQFAxQFoHTu7gpaalycRAqWtAKC7YnGiVjaqUJiaTc4H6DljmmWlrACcDUmJ
+yziUbR8+/7jSfk6Go9CFqZs=
+=2MeR
 -----END PGP SIGNATURE-----
diff --git a/sys-devel/gcc/files/3.0/gcc3-program-transform.patch b/sys-devel/gcc/files/3.0/gcc3-program-transform.patch
new file mode 100644
index 000000000000..acaec1857929
--- /dev/null
+++ b/sys-devel/gcc/files/3.0/gcc3-program-transform.patch
@@ -0,0 +1,192 @@
+--- gcc-3.0.3/gcc/cp/Make-lang.in.transform	Tue Nov 20 10:24:02 2001
++++ gcc-3.0.3/gcc/cp/Make-lang.in	Sat Dec  1 17:49:20 2001
+@@ -38,14 +38,16 @@
+ # - define the names for selecting the language in LANGUAGES.
+ 
+ # Actual names to use when installing a native compiler.
+-CXX_INSTALL_NAME = `t='$(program_transform_name)'; echo c++ | sed $$t`
+-GXX_INSTALL_NAME = `t='$(program_transform_name)'; echo g++ | sed $$t`
+-DEMANGLER_INSTALL_NAME = `t='$(program_transform_name)'; echo c++filt | sed $$t`
++CXX_INSTALL_NAME = `echo c++|sed '$(program_transform_name)'`
++GXX_INSTALL_NAME = `echo g++|sed '$(program_transform_name)'`
++DEMANGLER_INSTALL_NAME = `echo c++filt|sed '$(program_transform_name)'`
++CXX_TARGET_INSTALL_NAME = $(target_alias)-`echo c++|sed '$(program_transform_name)'`
++GXX_TARGET_INSTALL_NAME = $(target_alias)-`echo g++|sed '$(program_transform_name)'`
+ 
+ # Actual names to use when installing a cross-compiler.
+-CXX_CROSS_NAME = `t='$(program_transform_cross_name)'; echo c++ | sed $$t`
+-GXX_CROSS_NAME = `t='$(program_transform_cross_name)'; echo g++ | sed $$t`
+-DEMANGLER_CROSS_NAME = `t='$(program_transform_cross_name)'; echo c++filt | sed $$t`
++CXX_CROSS_NAME = `echo c++|sed '$(program_transform_cross_name)'`
++GXX_CROSS_NAME = `echo g++|sed '$(program_transform_cross_name)'`
++DEMANGLER_CROSS_NAME = `echo c++filt|sed '$(program_transform_cross_name)'`
+ 
+ # The name to use for the demangler program.
+ DEMANGLER_PROG = c++filt$(exeext)
+@@ -161,10 +163,10 @@
+ 	    chmod a+x $(bindir)/$(GXX_INSTALL_NAME)$(exeext); \
+ 	    rm -f $(bindir)/$(CXX_INSTALL_NAME)$(exeext); \
+ 	    $(LN) $(bindir)/$(GXX_INSTALL_NAME)$(exeext) $(bindir)/$(CXX_INSTALL_NAME)$(exeext); \
+-	    rm -f $(bindir)/$(target_alias)-g++$(exeext); \
+-	    $(LN) $(bindir)/$(GXX_INSTALL_NAME)$(exeext) $(bindir)/$(target_alias)-g++$(exeext); \
+-	    rm -f $(bindir)/$(target_alias)-c++$(exeext); \
+-	    $(LN) $(bindir)/$(CXX_INSTALL_NAME)$(exeext) $(bindir)/$(target_alias)-c++$(exeext); \
++	    rm -f $(bindir)/$(GXX_TARGET_INSTALL_NAME)$(exeext); \
++	    $(LN) $(bindir)/$(GXX_INSTALL_NAME)$(exeext) $(bindir)/$(GXX_TARGET_INSTALL_NAME)$(exeext); \
++	    rm -f $(bindir)/$(CXX_TARGET_INSTALL_NAME)$(exeext); \
++	    $(LN) $(bindir)/$(CXX_INSTALL_NAME)$(exeext) $(bindir)/$(CXX_TARGET_INSTALL_NAME)$(exeext); \
+ 	  fi ; \
+ 	  if [ x$(DEMANGLER_PROG) != x ] && [ -x "$(DEMANGLER_PROG)" ]; then \
+ 	    if [ -f g++-cross$(exeext) ] ; then \
+--- gcc-3.0.3/gcc/doc/install.texi.transform	Tue Nov 20 10:24:10 2001
++++ gcc-3.0.3/gcc/doc/install.texi	Sat Dec  1 17:49:50 2001
+@@ -361,6 +361,51 @@
+ 
+ @end table
+ 
++@item --program-prefix=@var{prefix}
++GCC supports some transformations of the names of its programs when
++installing them. This option prepends @var{prefix} to the names of
++programs to install in @var{bindir} (see above). For example, specifying
++@option{--program-prefix=foo-} would result in @samp{gcc}
++being installed as @file{/usr/local/bin/foo-gcc}.
++
++@item --program-suffix=@var{suffix}
++Appends @var{suffix} to the names of programs to install in @var{bindir}
++(see above). For example, specifying @option{--program-suffix=-3.1}
++would result in @samp{gcc} being installed as
++@file{/usr/local/bin/gcc-3.1}.
++
++@item --program-transform-name=@var{pattern}
++Applies the @samp{sed} script @var{pattern} to be applied to the names
++of programs to install in @var{bindir} (see above). @var{pattern} has to
++consist of one or more basic @samp{sed} editing commands, separated by
++semicolons. For example, if you want the @samp{gcc} program name to be
++transformed to the installed program @file{/usr/local/bin/myowngcc} and
++the @samp{g++} program name to be transformed to
++@file{/usr/local/bin/gspecial++} without changing other program names,
++you could use the pattern
++@option{--program-transform-name='s/^gcc$/myowngcc/; s/^g++$/gspecial++/'}
++to achieve this effect.
++
++All three options can be combined and used together, resulting in more
++complex conversion patterns. As a basic rule, @var{prefix} (and
++@var{suffix}) are prepended (appended) before further transformations
++can happen with a special transformation script @var{pattern}.
++
++As currently implemented, this options only take effect for native
++builds; cross compiler binaries' names are not transformed even when a
++transformation is explicitly asked for by one of this options.
++
++For native builds, some of the installed programs are also installed
++with the target alias in front of their name, as in
++@samp{i686-pc-linux-gnu-gcc}. All of the above transformations happen
++before the target alias is prepended to the name - so, specifying
++@option{--program-prefix=foo-} and @option{program-suffix=-3.1}, the
++resulting binary would be installed as
++@file{/usr/local/bin/i686-pc-linux-gnu-foo-gcc-3.1}.
++
++As a last shortcoming, none of the installed CHILL and Ada programs are
++transformed yet, which will be fixed in some time.
++
+ @item --with-local-prefix=@var{dirname}
+ Specify the
+ installation directory for local include files.  The default is
+--- gcc-3.0.3/gcc/f/Make-lang.in.transform	Tue Nov 20 10:24:10 2001
++++ gcc-3.0.3/gcc/f/Make-lang.in	Sat Dec  1 17:49:25 2001
+@@ -39,10 +39,10 @@
+ # $(srcdir) must be set to the gcc/ source directory (not gcc/f/).
+ #
+ # Actual name to use when installing a native compiler.
+-G77_INSTALL_NAME = `t='$(program_transform_name)'; echo g77 | sed $$t`
++G77_INSTALL_NAME = `echo g77|sed '$(program_transform_name)'`
+ 
+ # Actual name to use when installing a cross-compiler.
+-G77_CROSS_NAME = `t='$(program_transform_cross_name)'; echo g77 | sed $$t`
++G77_CROSS_NAME = `echo g77|sed '$(program_transform_cross_name)'`
+ 
+ # Some versions of `touch' (such as the version on Solaris 2.8) 
+ # do not correctly set the timestamp due to buggy versions of `utime'
+--- gcc-3.0.3/gcc/java/Make-lang.in.transform	Wed Jul 18 19:02:18 2001
++++ gcc-3.0.3/gcc/java/Make-lang.in	Sat Dec  1 17:49:44 2001
+@@ -42,10 +42,10 @@
+ # - define the names for selecting the language in LANGUAGES.
+ 
+ # Actual names to use when installing a native compiler.
+-JAVA_INSTALL_NAME = `t='$(program_transform_name)'; echo gcj | sed $$t`
++JAVA_INSTALL_NAME = `echo gcj|sed '$(program_transform_name)'` 
+ 
+ # Actual names to use when installing a cross-compiler.
+-JAVA_CROSS_NAME = `t='$(program_transform_cross_name)'; echo gcj | sed $$t`
++JAVA_CROSS_NAME = `echo gcj|sed '$(program_transform_cross_name)'` 
+ 
+ GCJ = gcj
+ 
+@@ -170,10 +170,11 @@
+ 	  fi ; \
+ 	fi ; \
+         for tool in $(JAVA_TARGET_INDEPENDENT_BIN_TOOLS); do \
++	  tool_transformed_name=`echo $$tool|sed '$(program_transform_name)'`; \
+           if [ -f $$tool$(exeext) ]; then \
+-	    rm -f $(bindir)/$$tool$(exeext); \
+-	    $(INSTALL_PROGRAM) $$tool$(exeext) $(bindir)/$$tool$(exeext); \
+-	    chmod a+x $(bindir)/$$tool$(exeext); \
++	    rm -f $(bindir)/$$tool_transformed_name$(exeext); \
++	    $(INSTALL_PROGRAM) $$tool$(exeext) $(bindir)/$$tool_transformed_name$(exeext); \
++	    chmod a+x $(bindir)/$$tool_transformed_name$(exeext); \
+           fi ; \
+        done
+ 
+--- gcc-3.0.3/gcc/Makefile.in.transform	Tue Nov 20 10:23:44 2001
++++ gcc-3.0.3/gcc/Makefile.in	Sat Dec  1 17:48:59 2001
+@@ -540,18 +540,19 @@
+ HOST_STRSTR=$(STRSTR)
+ 
+ # Actual name to use when installing a native compiler.
+-GCC_INSTALL_NAME = `t='$(program_transform_name)'; echo gcc | sed -e $$t`
+-CPP_INSTALL_NAME = `t='$(program_transform_name)'; echo cpp | sed -e $$t`
+-PROTOIZE_INSTALL_NAME = `t='$(program_transform_name)'; echo protoize | sed -e $$t`
+-UNPROTOIZE_INSTALL_NAME = `t='$(program_transform_name)'; echo unprotoize | sed -e $$t`
+-GCOV_INSTALL_NAME = `t='$(program_transform_name)'; echo gcov | sed -e $$t`
+-GCCBUG_INSTALL_NAME = `t='$(program_transform_name)'; echo gccbug | sed -e $$t`
++GCC_INSTALL_NAME = `echo gcc|sed '$(program_transform_name)'`
++GCC_TARGET_INSTALL_NAME = $(target_alias)-`echo gcc|sed '$(program_transform_name)'`
++CPP_INSTALL_NAME = `echo cpp|sed '$(program_transform_name)'`
++PROTOIZE_INSTALL_NAME = `echo protoize|sed '$(program_transform_name)'`
++UNPROTOIZE_INSTALL_NAME = `echo unprotoize|sed '$(program_transform_name)'`
++GCOV_INSTALL_NAME = `echo gcov|sed '$(program_transform_name)'`
++GCCBUG_INSTALL_NAME = `echo gccbug|sed '$(program_transform_name)'`
+ 
+ # Actual name to use when installing a cross-compiler.
+-GCC_CROSS_NAME = `t='$(program_transform_cross_name)'; echo gcc | sed -e $$t`
+-CPP_CROSS_NAME = `t='$(program_transform_cross_name)'; echo cpp | sed -e $$t`
+-PROTOIZE_CROSS_NAME = `t='$(program_transform_cross_name)'; echo protoize | sed -e $$t`
+-UNPROTOIZE_CROSS_NAME = `t='$(program_transform_cross_name)'; echo unprotoize | sed -e $$t`
++GCC_CROSS_NAME = `echo gcc|sed '$(program_transform_cross_name)'`
++CPP_CROSS_NAME = `echo cpp|sed '$(program_transform_cross_name)'`
++PROTOIZE_CROSS_NAME = `echo protoize|sed '$(program_transform_cross_name)'`
++UNPROTOIZE_CROSS_NAME = `echo unprotoize|sed '$(program_transform_cross_name)'`
+ 
+ # Choose the real default target.
+ ALL=all.internal
+@@ -2669,7 +2670,7 @@
+ 	  $(INSTALL_PROGRAM) xgcc$(exeext) $(bindir)/$(GCC_INSTALL_NAME)$(exeext); \
+ 	  rm -f $(bindir)/$(target_alias)-gcc-1$(exeext); \
+ 	  $(LN) $(bindir)/$(GCC_INSTALL_NAME)$(exeext) $(bindir)/$(target_alias)-gcc-1$(exeext); \
+-	  mv $(bindir)/$(target_alias)-gcc-1$(exeext) $(bindir)/$(target_alias)-gcc$(exeext); \
++	  mv $(bindir)/$(target_alias)-gcc-1$(exeext) $(bindir)/$(GCC_TARGET_INSTALL_NAME)$(exeext); \
+ 	fi
+ 
+ # Install the info files.
+--- gcc-3.0.3/gcc/configure.in.transform	Sat Dec  1 17:47:38 2001
++++ gcc-3.0.3/gcc/configure.in	Sat Dec  1 17:48:59 2001
+@@ -334,6 +334,9 @@
+ # Determine the host, build, and target systems
+ AC_CANONICAL_SYSTEM
+ 
++# Set program_transform_name
++AC_ARG_PROGRAM
++
+ # Find the native compiler
+ AC_PROG_CC
+ AC_PROG_CC_C_O
diff --git a/sys-devel/gcc/files/3.0/texinfo-4.0-no-ncurses-gentoo.diff b/sys-devel/gcc/files/3.0/texinfo-4.0-no-ncurses-gentoo.diff
new file mode 100644
index 000000000000..84b9af0ed2d9
--- /dev/null
+++ b/sys-devel/gcc/files/3.0/texinfo-4.0-no-ncurses-gentoo.diff
@@ -0,0 +1,1467 @@
+--- configure.in.orig	Wed Aug 29 23:32:26 2001
++++ configure.in	Wed Aug 29 23:33:22 2001
+@@ -25,21 +25,20 @@
+ # rather ncurses.  So we check for it.
+ TERMLIBS=
+ # Check for termlib before termcap because Solaris termcap needs libucb.
+-for termlib in ncurses curses termlib termcap terminfo; do
+-   AC_CHECK_LIB(${termlib}, tgetent,
+-     [TERMLIBS="${TERMLIBS} -l${termlib}"; break])
+-done
++#for termlib in ncurses curses termlib termcap terminfo; do
++#   AC_CHECK_LIB(${termlib}, tgetent,
++#     [TERMLIBS="${TERMLIBS} -l${termlib}"; break])
++#done
+ 
+ dnl Checks for header files.
+ dnl Do not use <ncurses/termcap.h> unless we're linking with ncurses.
+-if test "x$termlib" = xncurses; then
+-  dnl Use AC_CHECK_HEADERS so the HAVE_*_H symbol gets defined.
+-  AC_CHECK_HEADERS(ncurses/termcap.h)
+-fi
++#if test "x$termlib" = xncurses; then
++#  dnl Use AC_CHECK_HEADERS so the HAVE_*_H symbol gets defined.
++#  AC_CHECK_HEADERS(ncurses/termcap.h)
++#fi
+ AC_HEADER_STAT
+ AC_HEADER_STDC
+-AC_CHECK_HEADERS(fcntl.h pwd.h string.h strings.h termcap.h termio.h \
+-  termios.h unistd.h \
++AC_CHECK_HEADERS(fcntl.h pwd.h string.h strings.h \
+   sys/fcntl.h sys/file.h sys/ptem.h sys/time.h sys/ttold.h sys/wait.h)
+ AM_SYS_POSIX_TERMIOS
+ AM_HEADER_TIOCGWINSZ_NEEDS_SYS_IOCTL
+@@ -64,16 +63,16 @@
+ 
+ dnl Checks for variables.
+ # HP-UX 9 (at least) needs -lncurses which defines termcap variables PC etc.
+-AC_MSG_CHECKING(for library with termcap variables)
+-AC_CACHE_VAL(ac_cv_var_ospeed,
+-oldLIBS=$LIBS 
+-for trylib in $termlib ncurses curses termlib termcap terminfo; do
+-   if test "x$trylib" != "x$termlib"; then
+-     LIBS="$oldLIBS -l$termlib -l$trylib"
+-   else
+-     LIBS="$oldLIBS -l$termlib"
+-   fi
+-   AC_TRY_LINK(, 
++#AC_MSG_CHECKING(for library with termcap variables)
++#AC_CACHE_VAL(ac_cv_var_ospeed,
++#oldLIBS=$LIBS 
++#for trylib in $termlib ncurses curses termlib termcap terminfo; do
++#   if test "x$trylib" != "x$termlib"; then
++#     LIBS="$oldLIBS -l$termlib -l$trylib"
++#   else
++#     LIBS="$oldLIBS -l$termlib"
++#   fi
++#   AC_TRY_LINK(, 
+ #ifdef HAVE_NCURSES_TERMCAP_H
+ #include <ncurses/termcap.h>
+ #else
+@@ -81,22 +80,22 @@
+ #include <termcap.h>
+ #else
+ #undef PC
+-char *BC;
+-char* *UP;
+-char PC;      
+-short ospeed; 
++#char *BC;
++#char* *UP;
++#char PC;      
++#short ospeed; 
+ #endif
+ #endif
+-return ospeed != 0;
+-, ac_cv_var_ospeed=$trylib; break)
+-done
+-LIBS=$oldLIBS
+-)
+-AC_MSG_RESULT($ac_cv_var_ospeed)
+-if test -n "$ac_cv_var_ospeed" \
+-   && test "x$termlib" != "x$ac_cv_var_ospeed"; then
+-  TERMLIBS="${TERMLIBS} -l${ac_cv_var_ospeed}"
+-fi
++#return ospeed != 0;
++#, ac_cv_var_ospeed=$trylib; break)
++#done
++#LIBS=$oldLIBS
++#)
++#AC_MSG_RESULT($ac_cv_var_ospeed)
++#if test -n "$ac_cv_var_ospeed" \
++#   && test "x$termlib" != "x$ac_cv_var_ospeed"; then
++#  TERMLIBS="${TERMLIBS} -l${ac_cv_var_ospeed}"
++#fi
+ AC_SUBST(TERMLIBS)
+ 
+ dnl Set of available languages and i18n macros.
+--- Makefile.in.orig	Wed Aug 29 23:32:40 2001
++++ Makefile.in	Wed Aug 29 23:32:47 2001
+@@ -99,7 +99,7 @@
+ # Do intl/ and lib/ first since the C programs depend on them.
+ # Do doc/ last so makeinfo will be built when we get there.
+ # Others are alphabetical.
+-SUBDIRS = intl lib info makeinfo po util doc
++SUBDIRS = intl lib makeinfo po util
+ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+ CONFIG_HEADER = config.h
+--- configure.orig	Wed Aug 29 23:37:48 2001
++++ configure	Wed Aug 29 23:38:08 2001
+@@ -1409,98 +1409,22 @@
+ # rather ncurses.  So we check for it.
+ TERMLIBS=
+ # Check for termlib before termcap because Solaris termcap needs libucb.
+-for termlib in ncurses curses termlib termcap terminfo; do
+-   echo $ac_n "checking for tgetent in -l${termlib}""... $ac_c" 1>&6
+-echo "configure:1415: checking for tgetent in -l${termlib}" >&5
+-ac_lib_var=`echo ${termlib}'_'tgetent | sed 'y%./+-%__p_%'`
+-if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+-  echo $ac_n "(cached) $ac_c" 1>&6
+-else
+-  ac_save_LIBS="$LIBS"
+-LIBS="-l${termlib}  $LIBS"
+-cat > conftest.$ac_ext <<EOF
+-#line 1423 "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
+-    builtin and then its argument prototype would still apply.  */
+-char tgetent();
+-
+-int main() {
+-tgetent()
+-; return 0; }
+-EOF
+-if { (eval echo configure:1434: \"$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
+-  echo "configure: failed program was:" >&5
+-  cat conftest.$ac_ext >&5
+-  rm -rf conftest*
+-  eval "ac_cv_lib_$ac_lib_var=no"
+-fi
+-rm -f conftest*
+-LIBS="$ac_save_LIBS"
+-
+-fi
+-if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+-  echo "$ac_t""yes" 1>&6
+-  TERMLIBS="${TERMLIBS} -l${termlib}"; break
+-else
+-  echo "$ac_t""no" 1>&6
+-fi
+-
+-done
+-
+-if test "x$termlib" = xncurses; then
+-    for ac_hdr in ncurses/termcap.h
+-do
+-ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
+-echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
+-echo "configure:1461: 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 1466 "configure"
+-#include "confdefs.h"
+-#include <$ac_hdr>
+-EOF
+-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+-{ (eval echo configure:1471: \"$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*
+-  eval "ac_cv_header_$ac_safe=yes"
+-else
+-  echo "$ac_err" >&5
+-  echo "configure: failed program was:" >&5
+-  cat conftest.$ac_ext >&5
+-  rm -rf conftest*
+-  eval "ac_cv_header_$ac_safe=no"
+-fi
+-rm -f conftest*
+-fi
+-if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
+-  echo "$ac_t""yes" 1>&6
+-    ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'`
+-  cat >> confdefs.h <<EOF
+-#define $ac_tr_hdr 1
+-EOF
+- 
+-else
+-  echo "$ac_t""no" 1>&6
+-fi
+-done
+-
+-fi
++#for termlib in ncurses curses termlib termcap terminfo; do
++#   AC_CHECK_LIB(${termlib}, tgetent,
++#     [TERMLIBS="${TERMLIBS} -l${termlib}"; break])
++#done
++
++#if test "x$termlib" = xncurses; then
++#  dnl Use AC_CHECK_HEADERS so the HAVE_*_H symbol gets defined.
++#  AC_CHECK_HEADERS(ncurses/termcap.h)
++#fi
+ echo $ac_n "checking whether stat file-mode macros are broken""... $ac_c" 1>&6
+-echo "configure:1499: checking whether stat file-mode macros are broken" >&5
++echo "configure:1423: 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 1504 "configure"
++#line 1428 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ #include <sys/stat.h>
+@@ -1551,12 +1475,12 @@
+ fi
+ 
+ echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6
+-echo "configure:1555: checking for ANSI C header files" >&5
++echo "configure:1479: 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 1560 "configure"
++#line 1484 "configure"
+ #include "confdefs.h"
+ #include <stdlib.h>
+ #include <stdarg.h>
+@@ -1564,7 +1488,7 @@
+ #include <float.h>
+ EOF
+ ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+-{ (eval echo configure:1568: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:1492: \"$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*
+@@ -1581,7 +1505,7 @@
+ if test $ac_cv_header_stdc = yes; then
+   # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
+ cat > conftest.$ac_ext <<EOF
+-#line 1585 "configure"
++#line 1509 "configure"
+ #include "confdefs.h"
+ #include <string.h>
+ EOF
+@@ -1599,7 +1523,7 @@
+ if test $ac_cv_header_stdc = yes; then
+   # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
+ cat > conftest.$ac_ext <<EOF
+-#line 1603 "configure"
++#line 1527 "configure"
+ #include "confdefs.h"
+ #include <stdlib.h>
+ EOF
+@@ -1620,7 +1544,7 @@
+   :
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 1624 "configure"
++#line 1548 "configure"
+ #include "confdefs.h"
+ #include <ctype.h>
+ #define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
+@@ -1631,7 +1555,7 @@
+ exit (0); }
+ 
+ EOF
+-if { (eval echo configure:1635: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:1559: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+ then
+   :
+ else
+@@ -1654,23 +1578,22 @@
+ 
+ fi
+ 
+-for ac_hdr in fcntl.h pwd.h string.h strings.h termcap.h termio.h \
+-  termios.h unistd.h \
++for ac_hdr in fcntl.h pwd.h string.h strings.h \
+   sys/fcntl.h sys/file.h sys/ptem.h sys/time.h sys/ttold.h sys/wait.h
+ do
+ ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
+ echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
+-echo "configure:1664: checking for $ac_hdr" >&5
++echo "configure:1587: 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 1669 "configure"
++#line 1592 "configure"
+ #include "confdefs.h"
+ #include <$ac_hdr>
+ EOF
+ ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+-{ (eval echo configure:1674: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:1597: \"$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*
+@@ -1697,12 +1620,12 @@
+ done
+ 
+ echo $ac_n "checking POSIX termios""... $ac_c" 1>&6
+-echo "configure:1701: checking POSIX termios" >&5
++echo "configure:1624: checking POSIX termios" >&5
+ if eval "test \"`echo '$''{'am_cv_sys_posix_termios'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 1706 "configure"
++#line 1629 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ #include <unistd.h>
+@@ -1712,7 +1635,7 @@
+    tcgetattr(0, 0);
+ ; return 0; }
+ EOF
+-if { (eval echo configure:1716: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:1639: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   am_cv_sys_posix_termios=yes
+ else
+@@ -1728,7 +1651,7 @@
+ 
+ 
+  echo $ac_n "checking whether use of TIOCGWINSZ requires sys/ioctl.h""... $ac_c" 1>&6
+-echo "configure:1732: checking whether use of TIOCGWINSZ requires sys/ioctl.h" >&5
++echo "configure:1655: checking whether use of TIOCGWINSZ requires sys/ioctl.h" >&5
+ if eval "test \"`echo '$''{'am_cv_sys_tiocgwinsz_needs_sys_ioctl_h'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -1737,7 +1660,7 @@
+   gwinsz_in_termios_h=no
+   if test $am_cv_sys_posix_termios = yes; then
+     cat > conftest.$ac_ext <<EOF
+-#line 1741 "configure"
++#line 1664 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ #     include <termios.h>
+@@ -1757,7 +1680,7 @@
+ 
+   if test $gwinsz_in_termios_h = no; then
+     cat > conftest.$ac_ext <<EOF
+-#line 1761 "configure"
++#line 1684 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ #     include <sys/ioctl.h>
+@@ -1787,12 +1710,12 @@
+ 
+ 
+ echo $ac_n "checking for off_t""... $ac_c" 1>&6
+-echo "configure:1791: checking for off_t" >&5
++echo "configure:1714: 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 1796 "configure"
++#line 1719 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ #if STDC_HEADERS
+@@ -1820,12 +1743,12 @@
+ fi
+ 
+ echo $ac_n "checking return type of signal handlers""... $ac_c" 1>&6
+-echo "configure:1824: checking return type of signal handlers" >&5
++echo "configure:1747: 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 1829 "configure"
++#line 1752 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ #include <signal.h>
+@@ -1842,7 +1765,7 @@
+ int i;
+ ; return 0; }
+ EOF
+-if { (eval echo configure:1846: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:1769: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+   rm -rf conftest*
+   ac_cv_type_signal=void
+ else
+@@ -1861,12 +1784,12 @@
+ 
+ 
+ echo $ac_n "checking for working const""... $ac_c" 1>&6
+-echo "configure:1865: checking for working const" >&5
++echo "configure:1788: 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 1870 "configure"
++#line 1793 "configure"
+ #include "confdefs.h"
+ 
+ int main() {
+@@ -1915,7 +1838,7 @@
+ 
+ ; return 0; }
+ EOF
+-if { (eval echo configure:1919: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:1842: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+   rm -rf conftest*
+   ac_cv_c_const=yes
+ else
+@@ -1936,12 +1859,12 @@
+ fi
+ 
+ echo $ac_n "checking whether struct tm is in sys/time.h or time.h""... $ac_c" 1>&6
+-echo "configure:1940: checking whether struct tm is in sys/time.h or time.h" >&5
++echo "configure:1863: checking whether struct tm is in sys/time.h or time.h" >&5
+ if eval "test \"`echo '$''{'ac_cv_struct_tm'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 1945 "configure"
++#line 1868 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ #include <time.h>
+@@ -1949,7 +1872,7 @@
+ struct tm *tp; tp->tm_sec;
+ ; return 0; }
+ EOF
+-if { (eval echo configure:1953: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:1876: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+   rm -rf conftest*
+   ac_cv_struct_tm=time.h
+ else
+@@ -2018,17 +1941,17 @@
+ do
+ ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
+ echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
+-echo "configure:2022: checking for $ac_hdr" >&5
++echo "configure:1945: 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 2027 "configure"
++#line 1950 "configure"
+ #include "confdefs.h"
+ #include <$ac_hdr>
+ EOF
+ ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+-{ (eval echo configure:2032: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:1955: \"$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*
+@@ -2058,17 +1981,17 @@
+ do
+ ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
+ echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
+-echo "configure:2062: checking for $ac_hdr" >&5
++echo "configure:1985: 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 2067 "configure"
++#line 1990 "configure"
+ #include "confdefs.h"
+ #include <$ac_hdr>
+ EOF
+ ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+-{ (eval echo configure:2072: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:1995: \"$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*
+@@ -2098,17 +2021,17 @@
+ do
+ ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
+ echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
+-echo "configure:2102: checking for $ac_hdr" >&5
++echo "configure:2025: 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 2107 "configure"
++#line 2030 "configure"
+ #include "confdefs.h"
+ #include <$ac_hdr>
+ EOF
+ ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+-{ (eval echo configure:2112: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:2035: \"$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*
+@@ -2138,17 +2061,17 @@
+ do
+ ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
+ echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
+-echo "configure:2142: checking for $ac_hdr" >&5
++echo "configure:2065: 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 2147 "configure"
++#line 2070 "configure"
+ #include "confdefs.h"
+ #include <$ac_hdr>
+ EOF
+ ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+-{ (eval echo configure:2152: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:2075: \"$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*
+@@ -2178,17 +2101,17 @@
+ do
+ ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
+ echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
+-echo "configure:2182: checking for $ac_hdr" >&5
++echo "configure:2105: 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 2187 "configure"
++#line 2110 "configure"
+ #include "confdefs.h"
+ #include <$ac_hdr>
+ EOF
+ ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+-{ (eval echo configure:2192: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:2115: \"$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*
+@@ -2215,12 +2138,12 @@
+ done
+ 
+   echo $ac_n "checking whether $jm_func is declared""... $ac_c" 1>&6
+-echo "configure:2219: checking whether $jm_func is declared" >&5
++echo "configure:2142: checking whether $jm_func is declared" >&5
+   if eval "test \"`echo '$''{'jm_cv_func_decl_$jm_func'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 2224 "configure"
++#line 2147 "configure"
+ #include "confdefs.h"
+ $headers
+ int main() {
+@@ -2231,7 +2154,7 @@
+       
+ ; return 0; }
+ EOF
+-if { (eval echo configure:2235: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:2158: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+   rm -rf conftest*
+   eval "jm_cv_func_decl_$jm_func=yes"
+ else
+@@ -2262,19 +2185,19 @@
+ # The Ultrix 4.2 mips builtin alloca declared by alloca.h only works
+ # for constant arguments.  Useless!
+ echo $ac_n "checking for working alloca.h""... $ac_c" 1>&6
+-echo "configure:2266: checking for working alloca.h" >&5
++echo "configure:2189: 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 2271 "configure"
++#line 2194 "configure"
+ #include "confdefs.h"
+ #include <alloca.h>
+ int main() {
+ char *p = alloca(2 * sizeof(int));
+ ; return 0; }
+ EOF
+-if { (eval echo configure:2278: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:2201: \"$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
+@@ -2295,12 +2218,12 @@
+ fi
+ 
+ echo $ac_n "checking for alloca""... $ac_c" 1>&6
+-echo "configure:2299: checking for alloca" >&5
++echo "configure:2222: 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 2304 "configure"
++#line 2227 "configure"
+ #include "confdefs.h"
+ 
+ #ifdef __GNUC__
+@@ -2328,7 +2251,7 @@
+ char *p = (char *) alloca(1);
+ ; return 0; }
+ EOF
+-if { (eval echo configure:2332: \"$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*
+   ac_cv_func_alloca_works=yes
+ else
+@@ -2360,12 +2283,12 @@
+ 
+ 
+ echo $ac_n "checking whether alloca needs Cray hooks""... $ac_c" 1>&6
+-echo "configure:2364: checking whether alloca needs Cray hooks" >&5
++echo "configure:2287: 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 2369 "configure"
++#line 2292 "configure"
+ #include "confdefs.h"
+ #if defined(CRAY) && ! defined(CRAY2)
+ webecray
+@@ -2390,12 +2313,12 @@
+ if test $ac_cv_os_cray = yes; then
+ for ac_func in _getb67 GETB67 getb67; do
+   echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
+-echo "configure:2394: checking for $ac_func" >&5
++echo "configure:2317: 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 2399 "configure"
++#line 2322 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char $ac_func(); below.  */
+@@ -2418,7 +2341,7 @@
+ 
+ ; return 0; }
+ EOF
+-if { (eval echo configure:2422: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:2345: \"$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
+@@ -2445,7 +2368,7 @@
+ fi
+ 
+ echo $ac_n "checking stack direction for C alloca""... $ac_c" 1>&6
+-echo "configure:2449: checking stack direction for C alloca" >&5
++echo "configure:2372: 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
+@@ -2453,7 +2376,7 @@
+   ac_cv_c_stack_direction=0
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 2457 "configure"
++#line 2380 "configure"
+ #include "confdefs.h"
+ find_stack_direction ()
+ {
+@@ -2472,7 +2395,7 @@
+   exit (find_stack_direction() < 0);
+ }
+ EOF
+-if { (eval echo configure:2476: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:2399: \"$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
+@@ -2494,7 +2417,7 @@
+ fi
+ 
+ echo $ac_n "checking for working strcoll""... $ac_c" 1>&6
+-echo "configure:2498: checking for working strcoll" >&5
++echo "configure:2421: checking for working strcoll" >&5
+ if eval "test \"`echo '$''{'ac_cv_func_strcoll_works'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -2502,7 +2425,7 @@
+   ac_cv_func_strcoll_works=no
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 2506 "configure"
++#line 2429 "configure"
+ #include "confdefs.h"
+ #include <string.h>
+ main ()
+@@ -2512,7 +2435,7 @@
+ 	strcoll ("123", "456") >= 0);
+ }
+ EOF
+-if { (eval echo configure:2516: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:2439: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+ then
+   ac_cv_func_strcoll_works=yes
+ else
+@@ -2535,12 +2458,12 @@
+ fi
+ 
+ echo $ac_n "checking for vprintf""... $ac_c" 1>&6
+-echo "configure:2539: checking for vprintf" >&5
++echo "configure:2462: checking for vprintf" >&5
+ if eval "test \"`echo '$''{'ac_cv_func_vprintf'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 2544 "configure"
++#line 2467 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char vprintf(); below.  */
+@@ -2563,7 +2486,7 @@
+ 
+ ; return 0; }
+ EOF
+-if { (eval echo configure:2567: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:2490: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_func_vprintf=yes"
+ else
+@@ -2587,12 +2510,12 @@
+ 
+ if test "$ac_cv_func_vprintf" != yes; then
+ echo $ac_n "checking for _doprnt""... $ac_c" 1>&6
+-echo "configure:2591: checking for _doprnt" >&5
++echo "configure:2514: checking for _doprnt" >&5
+ if eval "test \"`echo '$''{'ac_cv_func__doprnt'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 2596 "configure"
++#line 2519 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char _doprnt(); below.  */
+@@ -2615,7 +2538,7 @@
+ 
+ ; return 0; }
+ EOF
+-if { (eval echo configure:2619: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:2542: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_func__doprnt=yes"
+ else
+@@ -2640,7 +2563,7 @@
+ fi
+ 
+ echo $ac_n "checking whether setvbuf arguments are reversed""... $ac_c" 1>&6
+-echo "configure:2644: checking whether setvbuf arguments are reversed" >&5
++echo "configure:2567: checking whether setvbuf arguments are reversed" >&5
+ if eval "test \"`echo '$''{'ac_cv_func_setvbuf_reversed'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -2648,7 +2571,7 @@
+     { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; }
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 2652 "configure"
++#line 2575 "configure"
+ #include "confdefs.h"
+ #include <stdio.h>
+ /* If setvbuf has the reversed format, exit 0. */
+@@ -2662,7 +2585,7 @@
+   exit(0);			/* Non-reversed systems segv here.  */
+ }
+ EOF
+-if { (eval echo configure:2666: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:2589: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+ then
+   ac_cv_func_setvbuf_reversed=yes
+ else
+@@ -2688,12 +2611,12 @@
+ for ac_func in setvbuf getcwd memset bzero strchr sigprocmask sigsetmask
+ do
+ echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
+-echo "configure:2692: checking for $ac_func" >&5
++echo "configure:2615: 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 2697 "configure"
++#line 2620 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char $ac_func(); below.  */
+@@ -2716,7 +2639,7 @@
+ 
+ ; return 0; }
+ EOF
+-if { (eval echo configure:2720: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:2643: \"$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
+@@ -2743,12 +2666,12 @@
+ for ac_func in memcpy memmove strdup strcasecmp strerror strncasecmp
+ do
+ echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
+-echo "configure:2747: checking for $ac_func" >&5
++echo "configure:2670: 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 2752 "configure"
++#line 2675 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char $ac_func(); below.  */
+@@ -2771,7 +2694,7 @@
+ 
+ ; return 0; }
+ EOF
+-if { (eval echo configure:2775: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:2698: \"$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
+@@ -2799,23 +2722,16 @@
+ 
+ 
+ # HP-UX 9 (at least) needs -lncurses which defines termcap variables PC etc.
+-echo $ac_n "checking for library with termcap variables""... $ac_c" 1>&6
+-echo "configure:2804: checking for library with termcap variables" >&5
+-if eval "test \"`echo '$''{'ac_cv_var_ospeed'+set}'`\" = set"; then
+-  echo $ac_n "(cached) $ac_c" 1>&6
+-else
+-  oldLIBS=$LIBS 
+-for trylib in $termlib ncurses curses termlib termcap terminfo; do
+-   if test "x$trylib" != "x$termlib"; then
+-     LIBS="$oldLIBS -l$termlib -l$trylib"
+-   else
+-     LIBS="$oldLIBS -l$termlib"
+-   fi
+-   cat > conftest.$ac_ext <<EOF
+-#line 2816 "configure"
+-#include "confdefs.h"
+-
+-int main() {
++#AC_MSG_CHECKING(for library with termcap variables)
++#AC_CACHE_VAL(ac_cv_var_ospeed,
++#oldLIBS=$LIBS 
++#for trylib in $termlib ncurses curses termlib termcap terminfo; do
++#   if test "x$trylib" != "x$termlib"; then
++#     LIBS="$oldLIBS -l$termlib -l$trylib"
++#   else
++#     LIBS="$oldLIBS -l$termlib"
++#   fi
++#   AC_TRY_LINK(, 
+ #ifdef HAVE_NCURSES_TERMCAP_H
+ #include <ncurses/termcap.h>
+ #else
+@@ -2823,53 +2739,41 @@
+ #include <termcap.h>
+ #else
+ #undef PC
+-char *BC;
+-char* *UP;
+-char PC;      
+-short ospeed; 
+-#endif
+-#endif
+-return ospeed != 0;
+-
+-; return 0; }
+-EOF
+-if { (eval echo configure:2837: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+-  rm -rf conftest*
+-  ac_cv_var_ospeed=$trylib; break
+-else
+-  echo "configure: failed program was:" >&5
+-  cat conftest.$ac_ext >&5
+-fi
+-rm -f conftest*
+-done
+-LIBS=$oldLIBS
+-
+-fi
+-
+-echo "$ac_t""$ac_cv_var_ospeed" 1>&6
+-if test -n "$ac_cv_var_ospeed" \
+-   && test "x$termlib" != "x$ac_cv_var_ospeed"; then
+-  TERMLIBS="${TERMLIBS} -l${ac_cv_var_ospeed}"
+-fi
++#char *BC;
++#char* *UP;
++#char PC;      
++#short ospeed; 
++#endif
++#endif
++#return ospeed != 0;
++#, ac_cv_var_ospeed=$trylib; break)
++#done
++#LIBS=$oldLIBS
++#)
++#AC_MSG_RESULT($ac_cv_var_ospeed)
++#if test -n "$ac_cv_var_ospeed" \
++#   && test "x$termlib" != "x$ac_cv_var_ospeed"; then
++#  TERMLIBS="${TERMLIBS} -l${ac_cv_var_ospeed}"
++#fi
+ 
+ 
+ ALL_LINGUAS="cs de de_AT eo fr nl no ru"
+ echo $ac_n "checking for inline""... $ac_c" 1>&6
+-echo "configure:2859: checking for inline" >&5
++echo "configure:2763: 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 2866 "configure"
++#line 2770 "configure"
+ #include "confdefs.h"
+ 
+ int main() {
+ } $ac_kw foo() {
+ ; return 0; }
+ EOF
+-if { (eval echo configure:2873: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:2777: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+   rm -rf conftest*
+   ac_cv_c_inline=$ac_kw; break
+ else
+@@ -2895,12 +2799,12 @@
+ esac
+ 
+ echo $ac_n "checking for size_t""... $ac_c" 1>&6
+-echo "configure:2899: checking for size_t" >&5
++echo "configure:2803: 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 2904 "configure"
++#line 2808 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ #if STDC_HEADERS
+@@ -2931,17 +2835,17 @@
+ do
+ ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
+ echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
+-echo "configure:2935: checking for $ac_hdr" >&5
++echo "configure:2839: 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 2940 "configure"
++#line 2844 "configure"
+ #include "confdefs.h"
+ #include <$ac_hdr>
+ EOF
+ ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+-{ (eval echo configure:2945: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:2849: \"$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*
+@@ -2970,12 +2874,12 @@
+ for ac_func in getpagesize
+ do
+ echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
+-echo "configure:2974: checking for $ac_func" >&5
++echo "configure:2878: 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 2979 "configure"
++#line 2883 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char $ac_func(); below.  */
+@@ -2998,7 +2902,7 @@
+ 
+ ; return 0; }
+ EOF
+-if { (eval echo configure:3002: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:2906: \"$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
+@@ -3023,7 +2927,7 @@
+ done
+ 
+ echo $ac_n "checking for working mmap""... $ac_c" 1>&6
+-echo "configure:3027: checking for working mmap" >&5
++echo "configure:2931: 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
+@@ -3031,7 +2935,7 @@
+   ac_cv_func_mmap_fixed_mapped=no
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 3035 "configure"
++#line 2939 "configure"
+ #include "confdefs.h"
+ 
+ /* Thanks to Mike Haertel and Jim Avera for this test.
+@@ -3171,7 +3075,7 @@
+ }
+ 
+ EOF
+-if { (eval echo configure:3175: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:3079: \"$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
+@@ -3199,17 +3103,17 @@
+ do
+ ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
+ echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
+-echo "configure:3203: checking for $ac_hdr" >&5
++echo "configure:3107: 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 3208 "configure"
++#line 3112 "configure"
+ #include "confdefs.h"
+ #include <$ac_hdr>
+ EOF
+ ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+-{ (eval echo configure:3213: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:3117: \"$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*
+@@ -3239,12 +3143,12 @@
+ strdup __argz_count __argz_stringify __argz_next
+ do
+ echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
+-echo "configure:3243: checking for $ac_func" >&5
++echo "configure:3147: 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 3248 "configure"
++#line 3152 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char $ac_func(); below.  */
+@@ -3267,7 +3171,7 @@
+ 
+ ; return 0; }
+ EOF
+-if { (eval echo configure:3271: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:3175: \"$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
+@@ -3296,12 +3200,12 @@
+      for ac_func in stpcpy
+ do
+ echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
+-echo "configure:3300: checking for $ac_func" >&5
++echo "configure:3204: 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 3305 "configure"
++#line 3209 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char $ac_func(); below.  */
+@@ -3324,7 +3228,7 @@
+ 
+ ; return 0; }
+ EOF
+-if { (eval echo configure:3328: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:3232: \"$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
+@@ -3358,19 +3262,19 @@
+ 
+    if test $ac_cv_header_locale_h = yes; then
+     echo $ac_n "checking for LC_MESSAGES""... $ac_c" 1>&6
+-echo "configure:3362: checking for LC_MESSAGES" >&5
++echo "configure:3266: 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 3367 "configure"
++#line 3271 "configure"
+ #include "confdefs.h"
+ #include <locale.h>
+ int main() {
+ return LC_MESSAGES
+ ; return 0; }
+ EOF
+-if { (eval echo configure:3374: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:3278: \"$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
+@@ -3391,7 +3295,7 @@
+     fi
+   fi
+    echo $ac_n "checking whether NLS is requested""... $ac_c" 1>&6
+-echo "configure:3395: checking whether NLS is requested" >&5
++echo "configure:3299: 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"
+@@ -3411,7 +3315,7 @@
+ EOF
+ 
+       echo $ac_n "checking whether included gettext is requested""... $ac_c" 1>&6
+-echo "configure:3415: checking whether included gettext is requested" >&5
++echo "configure:3319: 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"
+@@ -3430,17 +3334,17 @@
+ 
+ 	ac_safe=`echo "libintl.h" | sed 'y%./+-%__p_%'`
+ echo $ac_n "checking for libintl.h""... $ac_c" 1>&6
+-echo "configure:3434: checking for libintl.h" >&5
++echo "configure:3338: 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 3439 "configure"
++#line 3343 "configure"
+ #include "confdefs.h"
+ #include <libintl.h>
+ EOF
+ ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+-{ (eval echo configure:3444: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:3348: \"$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*
+@@ -3457,19 +3361,19 @@
+ 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:3461: checking for gettext in libc" >&5
++echo "configure:3365: 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 3466 "configure"
++#line 3370 "configure"
+ #include "confdefs.h"
+ #include <libintl.h>
+ int main() {
+ return (int) gettext ("")
+ ; return 0; }
+ EOF
+-if { (eval echo configure:3473: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:3377: \"$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
+@@ -3485,7 +3389,7 @@
+ 
+ 	   if test "$gt_cv_func_gettext_libc" != "yes"; then
+ 	     echo $ac_n "checking for bindtextdomain in -lintl""... $ac_c" 1>&6
+-echo "configure:3489: checking for bindtextdomain in -lintl" >&5
++echo "configure:3393: 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
+@@ -3493,7 +3397,7 @@
+   ac_save_LIBS="$LIBS"
+ LIBS="-lintl  $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 3497 "configure"
++#line 3401 "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
+@@ -3504,7 +3408,7 @@
+ bindtextdomain()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:3508: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:3412: \"$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
+@@ -3520,12 +3424,12 @@
+ 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:3524: checking for gettext in libintl" >&5
++echo "configure:3428: 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:3529: checking for gettext in -lintl" >&5
++echo "configure:3433: 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
+@@ -3533,7 +3437,7 @@
+   ac_save_LIBS="$LIBS"
+ LIBS="-lintl  $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 3537 "configure"
++#line 3441 "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
+@@ -3544,7 +3448,7 @@
+ gettext()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:3548: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:3452: \"$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
+@@ -3583,7 +3487,7 @@
+ 	      # Extract the first word of "msgfmt", so it can be a program name with args.
+ set dummy msgfmt; ac_word=$2
+ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:3587: checking for $ac_word" >&5
++echo "configure:3491: 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
+@@ -3617,12 +3521,12 @@
+ 		for ac_func in dcgettext
+ do
+ echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
+-echo "configure:3621: checking for $ac_func" >&5
++echo "configure:3525: 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 3626 "configure"
++#line 3530 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char $ac_func(); below.  */
+@@ -3645,7 +3549,7 @@
+ 
+ ; return 0; }
+ EOF
+-if { (eval echo configure:3649: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:3553: \"$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
+@@ -3672,7 +3576,7 @@
+ 		# Extract the first word of "gmsgfmt", so it can be a program name with args.
+ set dummy gmsgfmt; ac_word=$2
+ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:3676: checking for $ac_word" >&5
++echo "configure:3580: 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
+@@ -3708,7 +3612,7 @@
+ 		# Extract the first word of "xgettext", so it can be a program name with args.
+ set dummy xgettext; ac_word=$2
+ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:3712: checking for $ac_word" >&5
++echo "configure:3616: 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
+@@ -3740,7 +3644,7 @@
+ fi
+ 
+ 		cat > conftest.$ac_ext <<EOF
+-#line 3744 "configure"
++#line 3648 "configure"
+ #include "confdefs.h"
+ 
+ int main() {
+@@ -3748,7 +3652,7 @@
+ 			       return _nl_msg_cat_cntr
+ ; return 0; }
+ EOF
+-if { (eval echo configure:3752: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:3656: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   CATOBJEXT=.gmo
+ 		   DATADIRNAME=share
+@@ -3771,7 +3675,7 @@
+ 
+         if test "$CATOBJEXT" = "NONE"; then
+ 	  echo $ac_n "checking whether catgets can be used""... $ac_c" 1>&6
+-echo "configure:3775: checking whether catgets can be used" >&5
++echo "configure:3679: 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"
+@@ -3784,7 +3688,7 @@
+ 
+ 	  if test "$nls_cv_use_catgets" = "yes"; then
+ 	    	    echo $ac_n "checking for main in -li""... $ac_c" 1>&6
+-echo "configure:3788: checking for main in -li" >&5
++echo "configure:3692: 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
+@@ -3792,14 +3696,14 @@
+   ac_save_LIBS="$LIBS"
+ LIBS="-li  $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 3796 "configure"
++#line 3700 "configure"
+ #include "confdefs.h"
+ 
+ int main() {
+ main()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:3803: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:3707: \"$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
+@@ -3827,12 +3731,12 @@
+ fi
+ 
+ 	    echo $ac_n "checking for catgets""... $ac_c" 1>&6
+-echo "configure:3831: checking for catgets" >&5
++echo "configure:3735: 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 3836 "configure"
++#line 3740 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char catgets(); below.  */
+@@ -3855,7 +3759,7 @@
+ 
+ ; return 0; }
+ EOF
+-if { (eval echo configure:3859: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:3763: \"$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
+@@ -3877,7 +3781,7 @@
+ 	       # 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:3881: checking for $ac_word" >&5
++echo "configure:3785: 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
+@@ -3913,7 +3817,7 @@
+ 		 # Extract the first word of "gmsgfmt", so it can be a program name with args.
+ set dummy gmsgfmt; ac_word=$2
+ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:3917: checking for $ac_word" >&5
++echo "configure:3821: 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
+@@ -3950,7 +3854,7 @@
+ 		   # Extract the first word of "msgfmt", so it can be a program name with args.
+ set dummy msgfmt; ac_word=$2
+ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:3954: checking for $ac_word" >&5
++echo "configure:3858: 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
+@@ -3985,7 +3889,7 @@
+ 		 # Extract the first word of "xgettext", so it can be a program name with args.
+ set dummy xgettext; ac_word=$2
+ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:3989: checking for $ac_word" >&5
++echo "configure:3893: 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
+@@ -4043,7 +3947,7 @@
+         # Extract the first word of "msgfmt", so it can be a program name with args.
+ set dummy msgfmt; ac_word=$2
+ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:4047: checking for $ac_word" >&5
++echo "configure:3951: 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
+@@ -4077,7 +3981,7 @@
+         # Extract the first word of "gmsgfmt", so it can be a program name with args.
+ set dummy gmsgfmt; ac_word=$2
+ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:4081: checking for $ac_word" >&5
++echo "configure:3985: 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
+@@ -4113,7 +4017,7 @@
+         # Extract the first word of "xgettext", so it can be a program name with args.
+ set dummy xgettext; ac_word=$2
+ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:4117: checking for $ac_word" >&5
++echo "configure:4021: 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
+@@ -4206,7 +4110,7 @@
+        LINGUAS=
+      else
+        echo $ac_n "checking for catalogs to be installed""... $ac_c" 1>&6
+-echo "configure:4210: checking for catalogs to be installed" >&5
++echo "configure:4114: checking for catalogs to be installed" >&5
+        NEW_LINGUAS=
+        for lang in ${LINGUAS=$ALL_LINGUAS}; do
+          case "$ALL_LINGUAS" in
+@@ -4234,17 +4138,17 @@
+    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:4238: checking for linux/version.h" >&5
++echo "configure:4142: 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 4243 "configure"
++#line 4147 "configure"
+ #include "confdefs.h"
+ #include <linux/version.h>
+ EOF
+ ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+-{ (eval echo configure:4248: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:4152: \"$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*
diff --git a/sys-devel/gcc/gcc-2.95.3-r8.ebuild b/sys-devel/gcc/gcc-2.95.3-r8.ebuild
index 83e766dffd50..b08948ee5599 100644
--- a/sys-devel/gcc/gcc-2.95.3-r8.ebuild
+++ b/sys-devel/gcc/gcc-2.95.3-r8.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-2.95.3-r8.ebuild,v 1.27 2004/06/07 23:19:44 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-2.95.3-r8.ebuild,v 1.28 2004/06/07 23:59:16 vapier Exp $
 
 inherit eutils flag-o-matic gcc
 
@@ -108,9 +108,9 @@ src_unpack() {
 	# Azarah - 30 Jun 2002
 	#
 	if ! use alpha ; then
-		epatch ${FILESDIR}/${PV}/${P}-new-atexit.diff
+		epatch ${FILESDIR}/2.95.3/${P}-new-atexit.diff
 	else
-		epatch ${FILESDIR}/${PV}/${P}-alpha.diff
+		epatch ${FILESDIR}/2.95.3/${P}-alpha.diff
 	fi
 
 	# Currently if any path is changed via the configure script, it breaks
diff --git a/sys-devel/gcc/gcc-3.0.4-r6.ebuild b/sys-devel/gcc/gcc-3.0.4-r6.ebuild
index b82f8ddadf71..da56f2cb3f33 100644
--- a/sys-devel/gcc/gcc-3.0.4-r6.ebuild
+++ b/sys-devel/gcc/gcc-3.0.4-r6.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-3.0.4-r6.ebuild,v 1.20 2004/06/07 23:29:10 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-3.0.4-r6.ebuild,v 1.21 2004/06/07 23:59:16 vapier Exp $
 
 # NOTE TO MAINTAINER:  Info pages get nuked for multiple version installs.
 #                      Ill fix it later if i get a chance.
 
-inherit libtool flag-o-matic
+inherit libtool flag-o-matic eutils
 
 TV=4.0
 GCC_SUFFIX=-3.0
@@ -56,7 +56,7 @@ src_unpack() {
 	mv ${S}/texinfo-${TV} ${S}/texinfo
 	cd ${S}/texinfo
 	if use build ; then
-		patch -p0 < ${FILESDIR}/texinfo-${TV}-no-ncurses-gentoo.diff || die
+		epatch ${FILESDIR}/3.0/texinfo-${TV}-no-ncurses-gentoo.diff
 		touch *
 	fi
 
@@ -65,7 +65,7 @@ src_unpack() {
 	#of the binaries (thanks to Mandrake)
 	if build_multiple
 	then
-		patch -p1 <${FILESDIR}/gcc3-program-transform.patch || die
+		epatch ${FILESDIR}/3.0/gcc3-program-transform.patch
 	fi
 
 	#fixup libtool to correctly generate .la files with portage