Integrate bash 3.2 version

This is merge of current Debian stable (Lenny) version of Bash
with Vyatta changes.

1 files changed, 16 insertions, 12 deletions

diff --git a/configure.in b/configure.in
index c40c1bd..9807f68 100644
--- a/configure.in
+++ b/configure.in
@@ -1,11 +1,11 @@
 dnl
-dnl Configure script for bash-3.1
+dnl Configure script for bash-3.2
 dnl
 dnl report bugs to chet@po.cwru.edu
 dnl
 dnl Process this file with autoconf to produce a configure script.
 
-# Copyright (C) 1987-2005 Free Software Foundation, Inc.
+# Copyright (C) 1987-2006 Free Software Foundation, Inc.
 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -22,12 +22,12 @@ dnl Process this file with autoconf to produce a configure script.
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
 # 02111-1307, USA.
 
-AC_REVISION([for Bash 3.1, version 3.183])dnl
+AC_REVISION([for Bash 3.2, version 3.190])dnl
 
-define(bashvers, 3.1)
+define(bashvers, 3.2)
 define(relstatus, release)
 
-AC_INIT(bash, bashvers-relstatus, bug-bash@gnu.org)
+AC_INIT([bash], bashvers-relstatus, [bug-bash@gnu.org])
 
 dnl make sure we are using a recent autoconf version
 AC_PREREQ(2.50)
@@ -149,7 +149,7 @@ if test "$opt_curses" = yes; then
 fi
 
 if test -z "${DEBUGGER_START_FILE}"; then
-	DEBUGGER_START_FILE=${ac_default_prefix}/lib/bashdb/bashdb-main.inc
+	DEBUGGER_START_FILE=${ac_default_prefix}/share/bashdb/bashdb-main.inc
 fi
 
 dnl optional shell features in config.h.in
@@ -381,6 +381,7 @@ AC_SYS_LARGEFILE
 dnl BEGIN changes for cross-building (currently cygwin, minGW, and
 dnl (obsolete) BeOS)
 
+SIGNAMES_O=
 SIGNAMES_H=lsignames.h
 
 dnl load up the cross-building cache file -- add more cases and cache
@@ -390,18 +391,17 @@ dnl Note that host and target machine are the same, and different than the
 dnl build machine.
 dnl Set SIGNAMES_H based on whether or not we're cross-compiling.
 
+CROSS_COMPILE=
 if test "x$cross_compiling" = "xyes"; then
     case "${host}" in
     *-cygwin*)
 	cross_cache=${srcdir}/cross-build/cygwin32.cache
-	SIGNAMES_H='$(srcdir)/cross-build/win32sig.h'
 	;;
     *-mingw*)
 	cross_cache=${srcdir}/cross-build/cygwin32.cache
 	;;
     i[[3456]]86-*-beos*)
 	cross_cache=${srcdir}/cross-build/x86-beos.cache
-	SIGNAMES_H='${srcdir}/cross-build/beos-sig.h'
 	;;
     *)	echo "configure: cross-compiling for $host is not supported" >&2
 	;;
@@ -411,10 +411,12 @@ if test "x$cross_compiling" = "xyes"; then
 	. ${cross_cache}
     fi
     unset cross_cache
+    SIGNAMES_O='signames.o'
     CROSS_COMPILE='-DCROSS_COMPILING'
     AC_SUBST(CROSS_COMPILE)
 fi
 AC_SUBST(SIGNAMES_H)
+AC_SUBST(SIGNAMES_O)
 
 if test -z "$CC_FOR_BUILD"; then
     if test "x$cross_compiling" = "xno"; then
@@ -695,15 +697,16 @@ dnl checks for certain version-specific system calls and libc functions
 AC_CHECK_FUNC(__setostype, AC_DEFINE(HAVE_SETOSTYPE))
 AC_CHECK_FUNC(wait3, AC_DEFINE(HAVE_WAIT3))
 AC_CHECK_FUNC(isinf, AC_DEFINE(HAVE_ISINF_IN_LIBC))
+AC_CHECK_FUNC(isnan, AC_DEFINE(HAVE_ISNAN_IN_LIBC))
 
 dnl checks for missing libc functions
 AC_CHECK_FUNC(mkfifo,AC_DEFINE(HAVE_MKFIFO),AC_DEFINE(MKFIFO_MISSING))
 
 dnl checks for system calls
-AC_CHECK_FUNCS(dup2 fcntl getdtablesize getgroups gethostname getpagesize \
-		getpeername getrlimit getrusage gettimeofday kill killpg \
-		lstat readlink sbrk select setdtablesize tcgetpgrp uname \
-		ulimit waitpid)
+AC_CHECK_FUNCS(dup2 eaccess fcntl getdtablesize getgroups gethostname \
+		getpagesize getpeername getrlimit getrusage gettimeofday \
+		kill killpg lstat readlink sbrk select setdtablesize \
+		tcgetpgrp uname ulimit waitpid)
 AC_REPLACE_FUNCS(rename)
 
 dnl checks for c library functions
@@ -722,6 +725,7 @@ AC_REPLACE_FUNCS(strtod strtol strtoul strtoll strtoull strtoimax strtoumax)
 AC_CHECK_DECLS([confstr])
 AC_CHECK_DECLS([printf])
 AC_CHECK_DECLS([sbrk])
+AC_CHECK_DECLS([setregid])
 AC_CHECK_DECLS([strcpy])
 AC_CHECK_DECLS([strsignal])