new rc6 stuff; texinfo integrated into gcc

5 files changed, 1881 insertions, 19 deletions

diff --git a/sys-devel/gcc/files/digest-gcc-2.95.3-r5 b/sys-devel/gcc/files/digest-gcc-2.95.3-r5
new file mode 100644
index 000000000000..58a0c137ffe6
--- /dev/null
+++ b/sys-devel/gcc/files/digest-gcc-2.95.3-r5
@@ -0,0 +1,7 @@
+MD5 f3ad4f32c2296fad758ed051b5ac8e28 gcc-2.95.3.tar.gz
+MD5 906124171f15ee1585d840ed7d174009 libg++-2.8.1.3-20000312.diff.gz
+MD5 47b93312badd9550ccb7d113bbf0242a libg++-2.8.1.3-20000419.diff.gz
+MD5 9e00e62b8fb7af3e41364b7c6d9f4cf8 libg++-2.8.1.3-20000816.diff.gz
+MD5 625dd5a953661b901c876f92c2c5e7a6 libg++-2.8.1.3-20000914.diff.gz
+MD5 2826dbbd081646c459b1774145ffd7bf libg++-2.8.1.3.tar.gz
+MD5 070493baeb2c277c34575b0df4e2baf1 texinfo-4.0.tar.gz
diff --git a/sys-devel/gcc/files/mkinfodir b/sys-devel/gcc/files/mkinfodir
new file mode 100644
index 000000000000..a62840ee86ee
--- /dev/null
+++ b/sys-devel/gcc/files/mkinfodir
@@ -0,0 +1,233 @@
+#!/bin/bash
+# $Id: mkinfodir,v 1.1 2001/09/01 07:56:19 drobbins Exp $
+# Generate the top-level Info node, given a directory of Info files
+# and (optionally) a skeleton file.  The output will be suitable for a
+# top-level dir file.  The skeleton file contains info topic names in the
+# order they should appear in the output.  There are three special
+# lines that alter the behavior: a line consisting of just "--" causes
+# the next line to be echoed verbatim to the output.  A line
+# containing just "%%" causes all the remaining filenames (wildcards
+# allowed) in the rest of the file to be ignored.  A line containing
+# just "!!" exits the script when reached (unless preceded by a line
+# containing just "--").  Once the script reaches the end of the
+# skeleton file, it goes through the remaining files in the directory
+# in order, putting their entries at the end.  The script will use the
+# ENTRY information in each info file if it exists.  Otherwise it will
+# make a minimal entry.
+
+# sent by Jeffrey Osier <jeffrey@cygnus.com>, who thinks it came from
+# zoo@winternet.com (david d `zoo' zuhn)
+
+# modified 7 April 1995 by Joe Harrington <jh@tecate.gsfc.nasa.gov> to
+# take special flags
+
+INFODIR=$1
+if [ $# = 2 ] ; then
+  SKELETON=$2
+else
+  SKELETON=/dev/null
+fi
+
+skip=
+
+if [ $# -gt 2 ] ; then
+  echo usage: $0 info-directory [ skeleton-file ] 1>&2
+  exit 1
+elif [ -z "${INFODIR}" ] ; then
+  INFODIR="%%DEFAULT_INFO_DIR%%"
+else
+  true
+fi
+
+if [ ! -d ${INFODIR} ] ; then
+  echo "$0: first argument must specify a directory"
+  exit 1
+fi
+
+### output the dir header
+echo "-*- Text -*-"
+echo "This file was generated automatically by $0."
+echo "This version was generated on `date`"
+echo "by `whoami`@`hostname` for `(cd ${INFODIR}; pwd)`"
+
+cat << moobler
+\$Id: mkinfodir,v 1.1 2001/09/01 07:56:19 drobbins Exp $
+This is the file .../info/dir, which contains the topmost node of the
+Info hierarchy.  The first time you invoke Info you start off
+looking at that node, which is (dir)Top.
+
+File: dir	Node: Top	This is the top of the INFO tree
+
+  This (the Directory node) gives a menu of major topics. 
+  Typing "q" exits, "?" lists all Info commands, "d" returns here,
+  "h" gives a primer for first-timers,
+  "mEmacs<Return>" visits the Emacs topic, etc.
+
+  In Emacs, you can click mouse button 2 on a menu item or cross reference
+  to select it.
+
+* Menu: The list of major topics begins on the next line.
+
+moobler
+
+### go through the list of files in the skeleton.  If an info file
+### exists, grab the ENTRY information from it.  If an entry exists
+### use it, otherwise create a minimal dir entry.
+###
+### Then remove that file from the list of existing files.  If any
+### additional files remain (ones that don't have a skeleton entry), 
+### then generate entries for those in the same way, putting the info for 
+### those at the end....
+
+infofiles=`(cd ${INFODIR}; /bin/ls | grep -v '\-[0-9]*\.gz$' | grep -v '\-[0-9]*$' | egrep -v '^dir$|^dir\.info$|^dir\.orig$')`
+
+# echoing gets clobbered by backquotes; we do it the hard way...
+lines=`wc $SKELETON | awk '{print $1}'`
+line=1
+while [ $lines -ge $line ] ; do
+  # Read one line from the file.  This is so that we can echo lines with
+  # whitespace and quoted characters in them.
+  fileline=`awk NR==$line $SKELETON`
+
+  # flag fancy features
+  if [ ! -z "$echoline" ] ; then	# echo line
+    echo "$fileline"
+    fileline=
+    echoline=
+  elif [ "${fileline}" = "--" ] ; then	# should we echo the next line?
+    echoline=1
+  elif [ "${fileline}" = "%%" ] ; then	# eliminate remaining files from dir?
+    skip=1
+  elif [ "${fileline}" = "!!" ] ; then	# quit now
+    exit 0
+  fi
+
+  # handle files if they exist
+  for file in $fileline"" ; do	# expand wildcards ("" handles blank lines)
+
+    fname=
+
+    if [ -z "$echoline" -a ! -z "$file" ] ; then
+
+      # Find the file to operate upon.  Check both possible names.
+      infoname=`echo $file | sed 's/\.gz$//'`
+      infoname=`echo $infoname | sed 's/\.info$//'`
+      noext=
+      ext=
+      if [ -f ${INFODIR}/$infoname ] ; then
+        noext=$infoname
+      fi
+      if [ -f ${INFODIR}/${infoname}.info ] ; then
+        ext=${infoname}.info
+      fi
+      if [ -f ${INFODIR}/${infoname}.info.gz ] ; then
+	ext=${infoname}.info.gz
+      fi
+      # If it exists with both names take what was said in the file.
+      if [ ! -z "$ext" -a ! -z "$noext" ]; then
+        fname=$file
+        warn="### Warning: $ext and $noext both exist!  Using ${file}. ###"
+      elif [ ! \( -z "$ext" -a -z "$noext" \) ]; then
+        # just take the name if it exists only once
+        fname=${noext}${ext}
+      fi
+
+      # if we found something and aren't skipping, do the entry
+      if [ ! -z "$fname" ] ; then
+        if [ -z "$skip" ] ; then
+
+          if [ ! -z "$warn" ] ; then	# issue any warning
+	    echo $warn
+	    warn=
+          fi
+	  if [ "${fname##*.}" = "gz" ] ; then
+	    entry=`zcat ${INFODIR}/${fname} | sed -e '1,/START-INFO-DIR-ENTRY/d' \
+		     -e '/END-INFO-DIR-ENTRY/,$d' `
+	  else
+            entry=`sed -e '1,/START-INFO-DIR-ENTRY/d' \
+		     -e '/END-INFO-DIR-ENTRY/,$d' ${INFODIR}/$fname`
+	  fi
+          if [ ! -z "${entry}" ] ; then
+            echo "${entry}"
+          else
+            echo "* ${infoname}: (${infoname})."
+          fi
+        fi
+
+        # remove the name from the directory listing
+	infofiles=`echo "" ${infofiles} "" | sed -e "s/ ${fname} / /" -e "s/  / /g"`
+
+      fi
+
+    fi
+
+  done
+
+  line=`expr $line + 1`
+done
+
+if [ -z "${infofiles}" ] ; then
+  exit 0
+elif [ $lines -gt 0 ]; then
+  echo
+fi
+
+# Sort remaining files by INFO-DIR-SECTION.
+prevsect=
+filesectdata=`(cd ${INFODIR}; fgrep INFO-DIR-SECTION /dev/null ${infofiles} | \
+	      fgrep -v 'INFO-DIR-SECTION Miscellaneous' | \
+	      sort -t: -k2 -k1 | tr ' ' '_')`
+for sectdata in ${filesectdata}; do
+  file=`echo ${sectdata} | cut -d: -f1`
+  section=`sed -n -e 's/^INFO-DIR-SECTION //p' ${INFODIR}/${file}`
+  infofiles=`echo "" ${infofiles} "" | sed -e "s/ ${file} / /" -e "s/  / /g"`
+
+  if [ "${prevsect}" != "${section}" ] ; then
+    if [ ! -z "${prevsect}" ] ; then
+      echo ""
+    fi
+    echo "${section}"
+    prevsect="${section}"
+  fi
+  infoname=`echo $file | sed 's/\.gz$//'`
+  infoname=`echo $infoname | sed 's/\.info$//'`
+  if [ "${file##*.}" = "gz" ] ; then
+	    entry=`zcat ${INFODIR}/$file | sed -e '1,/START-INFO-DIR-ENTRY/d' \
+		     -e '/END-INFO-DIR-ENTRY/,$d' `
+	  else
+            entry=`sed -e '1,/START-INFO-DIR-ENTRY/d' \
+		     -e '/END-INFO-DIR-ENTRY/,$d' ${INFODIR}/$file`
+	  fi
+  if [ ! -z "${entry}" ] ; then
+    echo "${entry}"
+  elif [ ! -d "${INFODIR}/${file}" ] ; then
+    echo "* ${infoname}: (${infoname})."
+  fi
+done
+
+# Process miscellaneous files.
+for file in ${infofiles}; do
+  if [ ! -z "${prevsect}" ] ; then
+    echo ""
+    echo "Miscellaneous"
+    prevsect=""
+  fi
+
+  infoname=`echo $file | sed 's/\.gz$//'`
+  infoname=`echo $infoname | sed 's/\.info$//'`
+  if [ "${file##*.}" = "gz" ] ; then
+           entry=`zcat ${INFODIR}/${file} | sed -e '1,/START-INFO-DIR-ENTRY/d' \
+		     -e '/END-INFO-DIR-ENTRY/,$d'`
+	  else
+            entry=`sed -e '1,/START-INFO-DIR-ENTRY/d' \
+		     -e '/END-INFO-DIR-ENTRY/,$d' ${INFODIR}/$file`
+	  fi
+
+
+  if [ ! -z "${entry}" ] ; then
+    echo "${entry}"
+  elif [ ! -d "${INFODIR}/${file}" ] ; then
+    echo "* ${infoname}: (${infoname})."
+  fi
+done
+
diff --git a/sys-devel/gcc/files/texinfo-4.0-no-ncurses-gentoo.diff b/sys-devel/gcc/files/texinfo-4.0-no-ncurses-gentoo.diff
new file mode 100644
index 000000000000..84b9af0ed2d9
--- /dev/null
+++ b/sys-devel/gcc/files/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-r4.ebuild b/sys-devel/gcc/gcc-2.95.3-r4.ebuild
index 903e4e4a0c8a..e06b4b044c9e 100644
--- a/sys-devel/gcc/gcc-2.95.3-r4.ebuild
+++ b/sys-devel/gcc/gcc-2.95.3-r4.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Maintainer: System Team <system@gentoo.org>
 # Author: Achim Gottinger <achim@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-2.95.3-r4.ebuild,v 1.8 2001/08/31 19:20:26 drobbins Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-2.95.3-r4.ebuild,v 1.9 2001/09/01 07:56:18 drobbins Exp $
 
 SRC_URI="ftp://gcc.gnu.org/pub/gcc/releases/${P}/${P}.tar.gz
 	ftp://ftp.freesoftware.com/pub/sourceware/gcc/infrastructure/libg++-2.8.1.3.tar.gz
@@ -141,21 +141,3 @@ src_install() {
 	newbin util/install-info install-info.gcc
 	newbin util/texindex texindex.gcc
 }
-
-pkg_postinst() {
-	#create symlinks for makeinfo, etc pointing to the gcc (3.12) versions only if the
-	#*real* version (4.0) isn't already installed.  Should allow us to use 3.12 until
-	#4.0 is available and not worry about having gcc overwrite our texinfo-4.0 stuff.
-	local x
-	cd ${ROOT}usr/bin
-	for x in makeinfo texi2dvi install-info texindex
-	do
-		if [ ! -e $x ]
-		then
-			ln -s ${x}.gcc $x
-		fi
-	done
-}
-
-
-
diff --git a/sys-devel/gcc/gcc-2.95.3-r5.ebuild b/sys-devel/gcc/gcc-2.95.3-r5.ebuild
new file mode 100644
index 000000000000..f073440721f6
--- /dev/null
+++ b/sys-devel/gcc/gcc-2.95.3-r5.ebuild
@@ -0,0 +1,173 @@
+# Copyright 1999-2001 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License, v2 or later
+# Maintainer: System Team <system@gentoo.org>
+# Author: Achim Gottinger <achim@gentoo.org>, Daniel Robbins <drobbins@gentoo.org>
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-2.95.3-r5.ebuild,v 1.1 2001/09/01 07:56:18 drobbins Exp $
+
+TV=4.0
+SRC_URI="ftp://gcc.gnu.org/pub/gcc/releases/${P}/${P}.tar.gz
+	ftp://ftp.freesoftware.com/pub/sourceware/gcc/infrastructure/libg++-2.8.1.3.tar.gz
+    ftp://ftp.freesoftware.com/pub/sourceware/gcc/infrastructure/libg++-2.8.1.3-20000312.diff.gz
+    ftp://ftp.freesoftware.com/pub/sourceware/gcc/infrastructure/libg++-2.8.1.3-20000419.diff.gz
+    ftp://ftp.freesoftware.com/pub/sourceware/gcc/infrastructure/libg++-2.8.1.3-20000816.diff.gz
+    ftp://ftp.freesoftware.com/pub/sourceware/gcc/infrastructure/libg++-2.8.1.3-20000914.diff.gz
+	ftp://gatekeeper.dec.com/pub/GNU/texinfo/texinfo-${TV}.tar.gz
+	ftp://ftp.gnu.org/pub/gnu/texinfo/texinfo-${TV}.tar.gz"
+
+S=${WORKDIR}/${P}
+LOC=/usr
+
+DESCRIPTION="Modern GCC C/C++ compiler and an included, upgraded version of texinfo to boot"
+HOMEPAGE="http://www.gnu.org/software/gcc/gcc.html"
+DEPEND="virtual/glibc"
+RDEPEND="virtual/glibc"
+if [ -z "`use build`" ]
+then
+	DEPEND="$DEPEND nls? ( sys-devel/gettext ) >=sys-libs/ncurses-5.2-r2"
+	RDEPEND="$RDEPEND >=sys-libs/ncurses-5.2-r2"
+fi
+
+src_unpack() {
+	unpack ${P}.tar.gz
+	if [ "`use libg++`" ]
+	then
+		unpack libg++-2.8.1.3.tar.gz
+		cd ${S}/../libg++-2.8.1.3
+		gzip -dc ${DISTDIR}/libg++-2.8.1.3-20000312.diff.gz | patch -p1 || die
+		gzip -dc ${DISTDIR}/libg++-2.8.1.3-20000419.diff.gz | patch -p1 || die
+		gzip -dc ${DISTDIR}/libg++-2.8.1.3-20000816.diff.gz | patch -p1 || die
+		gzip -dc ${DISTDIR}/libg++-2.8.1.3-20000914.diff.gz | patch -p1 || die
+		cd ${S}
+		mv ../libg++-2.8.1.3/* .
+		rmdir ../libg++-2.8.1.3
+	fi
+	cd ${S}
+	# A patch for the atexit problem occured with glibc-2.2.3
+	patch -l -p0 < ${FILESDIR}/${P}-atexit.diff || die
+	# Now we integrate texinfo-${TV} into gcc.  It comes with texinfo-3.12.
+	cd ${S}
+	tar xzf ${DISTDIR}/texinfo-${TV}.tar.gz || die
+	cp -a ${S}/texinfo-4.0/* ${S}/texinfo
+	cd ${S}/texinfo
+	if [ "`use build`" ]
+	then
+		patch -p0 < ${FILESDIR}/texinfo-${TV}-no-ncurses-gentoo.diff || die
+ 		touch *
+	fi
+}
+
+src_compile() {
+	local myconf
+	if [ -z "`use build`" ]
+	then
+		myconf="--enable-shared"
+	else
+		myconf="--enable-languages=c"
+	fi
+	if [ -z "`use nls`" ] || [ "`use build`" ] ; then
+		myconf="$myconf --disable-nls"
+	else
+		myconf="$myconf --enable-nls --without-included-gettext"
+	fi
+
+	# gcc does not like optimization
+
+	export CFLAGS="${CFLAGS/-O?/}"
+	export CXXFLAGS="${CXXFLAGS/-O?/}"
+
+	${S}/configure --prefix=${LOC} --mandir=${LOC}/share/man --infodir=${LOC}/share/info \
+	--enable-version-specific-runtime-libs --host=${CHOST} --build=${CHOST} --target=${CHOST} --enable-threads  \
+	--with-local-prefix=${LOC}/local ${myconf} || die
+
+	if [ -z "`use static`" ]
+	then
+		emake bootstrap-lean || die
+	else
+		emake LDFLAGS=-static bootstrap || die
+	fi
+}
+
+src_install() {
+	make install prefix=${D}${LOC} mandir=${D}${LOC}/share/man infodir=${D}${LOC}/share/info || die
+	[ -e ${D}/usr/bin/gcc ] || die "gcc not found in ${D}"
+    FULLPATH=${D}${LOC}/lib/gcc-lib/${CHOST}/${PV}
+	cd ${FULLPATH}
+	dodir /lib
+	dosym /usr/bin/cpp /lib/cpp
+	dosym gcc /usr/bin/cc
+	dodir /etc/env.d
+	echo "LDPATH=${LOC}/lib/gcc-lib/${CHOST}/${PV}" > ${D}/etc/env.d/05gcc
+	cd ${S}
+    if [ -z "`use build`" ]
+    then
+		#do a full texinfo-${TV} install
+		
+		cd ${S}/texinfo
+	  	make DESTDIR=${D} infodir=${D}/usr/share/info install || die
+		exeinto /usr/sbin
+		doexe ${FILESDIR}/mkinfodir
+
+		cd ${D}/usr/share/info
+		mv texinfo texinfo.info
+		for i in texinfo-*
+		do
+			mv ${i} texinfo.info-${i#texinfo-*}
+		done
+
+		cd ${S}/texinfo
+	   	docinto texinfo
+		dodoc AUTHORS ChangeLog COPYING INTRODUCTION NEWS README TODO 
+		docinto texinfo/info
+		dodoc info/README
+		docinto texinfo/makeinfo
+		dodoc makeinfo/README
+
+		# end texinfo 4.0; begin more gcc stuff
+
+		cd ${S}
+		docinto /	
+		dodoc COPYING COPYING.LIB README* FAQ MAINTAINERS
+		docinto html
+		dodoc faq.html
+		docinto gcc
+		cd ${S}/gcc
+		dodoc BUGS ChangeLog* COPYING* FSFChangeLog* LANGUAGES NEWS PROBLEMS README* SERVICE TESTS.FLUNK
+	    cd ${S}/libchill
+	    docinto libchill
+	    dodoc ChangeLog
+	    cd ${S}/libf2c
+	    docinto libf2c
+	    dodoc ChangeLog changes.netlib README TODO
+	    cd ${S}/libiberty
+	    docinto libiberty
+	    dodoc ChangeLog COPYING.LIB README
+	    cd ${S}/libio
+	    docinto libio
+	    dodoc ChangeLog NEWS README
+	    cd dbz
+	    docinto libio/dbz
+	    dodoc README
+	    cd ../stdio
+	    docinto libio/stdio
+	    dodoc ChangeLog*
+	    cd ${S}/libobjc
+	    docinto libobjc
+	    dodoc ChangeLog README* THREADS*
+
+        if [ "`use libg++`" ]
+        then
+            cd ${S}/libg++
+	        docinto libg++
+	        dodoc ChangeLog g++FAQ.txt NEWS README* TODO
+        else
+            cd ${S}/libstdc++
+	        docinto libstdc++
+            dodoc ChangeLog NEWS
+        fi
+    else
+        rm -rf ${D}/usr/share/{man,info}
+		#do a minimal texinfo install (build image)
+		cd ${S}/texinfo
+		dobin makeinfo/makeinfo util/{install-info,texi2dvi,texindex}
+	fi
+}