]> git.ipfire.org Git - thirdparty/bash.git/commitdiff
commit bash-20091119 snapshot
authorChet Ramey <chet.ramey@case.edu>
Fri, 9 Dec 2011 01:21:07 +0000 (20:21 -0500)
committerChet Ramey <chet.ramey@case.edu>
Fri, 9 Dec 2011 01:21:07 +0000 (20:21 -0500)
28 files changed:
COMPAT
CWRU/CWRU.chlog
CWRU/CWRU.chlog~
aclocal.m4
aclocal.m4~
autom4te.cache/output.0
autom4te.cache/requests
autom4te.cache/traces.0
builtins/common.h
builtins/printf.def
builtins/printf.def~
builtins/shopt.def
config-top.h
configure
configure.in
configure.in~
doc/bash.1
execute_cmd.c
execute_cmd.c~
jobs.c
lib/glob/glob.c
lib/readline/rltty.c
lib/sh/snprintf.c
lib/sh/snprintf.c~
shell.c
support/config.sub
support/config.sub~ [new file with mode: 0644]
tests/RUN-ONE-TEST

diff --git a/COMPAT b/COMPAT
index ec68c2faff4cd25701686cfb1d632aec896a4c4d..1117e395eb4505f2adb5729cc8c65264945ba234 100644 (file)
--- a/COMPAT
+++ b/COMPAT
@@ -338,21 +338,23 @@ Shell Compatibility Level
 Bash-3.2 introduced the concept of a `shell compatibility level', specified
 as a set of options to the shopt builtin (compat31, compat32, compat40 at
 this writing).  There is only one current compatibility level -- each
-option is mutually exclusive.
+option is mutually exclusive.  This list does not mention behavior that is
+standard for a particular version (e.g., setting compat32 means that quoting
+the rhs of the regexp matching operator quotes special regexp characters in
+the word, which is default behavior in bash-3.2 and above).
 
 compat31 set
        - the < and > operators to the [[ command do not consider the current
          locale when comparing strings
+       - quoting the rhs of the regexp matching operator (=~) has no
+         special effect
 
 compat32 set
        - the < and > operators to the [[ command do not consider the current
          locale when comparing strings
-       - quoting the rhs of the regexp matching operator (=~) has no
-         special effect
 
 compat40 set
        - the < and > operators to the [[ command do not consider the current
          locale when comparing strings
        - interrupting a command list such as "a ; b ; c" causes the execution
          of the entire list to be aborted
-
index 1e48fa758741114f0a1a112018c87752ddcd0793..c04c53869b85df39097cf7248593c8b567846ded 100644 (file)
@@ -9160,3 +9160,48 @@ builtins/printf.def
        - in getintmax(), in the case of a conversion error, return the partial
          value accumulated so far, which is suppose to be what
          strtoimax/strtoll/strtol returns
+
+                                  11/18
+                                  -----
+builtins/{common.h,shopt.def},shell.c
+       - changed shopt variable "set functions" to take the option name as
+         the first argument; changed function prototypes and callers
+
+builtins/shopt.def
+       - change set_compatibility_level() to turn off other compatNN options
+         when one is set -- enforce mutual exclusivity.  Fixes problem noted
+         by Jan Schampera <jan.schampera@web.de>
+
+                                  11/19
+                                  -----
+lib/readline/rltty.c
+       - make sure prepare_terminal_settings() tests for the presence of
+         ECHOCTL before using it.  Fixes bug reported by Joachim Schmitz
+         <schmitz@hp.com>
+
+config-top.h
+       - new WORDEXP_OPTION define (off by default)
+
+shell.c
+       - don't include the --wordexp option or the supporting function
+         (run_wordexp) if WORDEXP_OPTION is not defined.  Suggested by
+         Aharon Robbins.
+
+execute_cmd.c
+       - in execute_cond_node, turn on comsub_ignore_return if the flags
+         indicate we're ignoring the return value before calling
+         cond_expand_word.  Fixes bug reported by Anirban Sinha
+         <asinha@zeugmasystems.com>
+
+                                  11/20
+                                  -----
+lib/sh/snprintf.c,builtins/printf.def
+       - change check for HAVE_ASPRINTF and HAVE_SNPRINTF to check if value
+         is 1 or 0 rather than whether they are defined or not.  This allows
+         a value of 0 to enable function replacement
+
+configure.in,aclocal.m4
+       - new autoconf macro, BASH_FUNC_SNPRINTF, checks for snprintf present
+         and working as C99 specifies with a zero length argument.  Idea
+         from Greg Wooledge <wooledg@eeg.ccf.org>
+       - new macro BASH_FUNC_VSNPRINTF, does same thing for vsnprintf
index 1402c827e4ad3344a805d80b9d0b0a4cc0ca8a61..5c7b526221b6869185794c102484045a30ad9b3f 100644 (file)
@@ -8141,7 +8141,7 @@ lib/readline/display.c
 
                                    6/5
                                    ---
-doc/{bash.1,bashref.texi
+doc/{bash.1,bashref.texi}
        - added some more explanation of the inheritance of the ERR trap at
          the suggestion of Thomas Pospisek <tpo@sourcepole.ch>
 
@@ -9151,3 +9151,59 @@ variables.c
          array, an indexed array, or a scalar.  Fixes Ubuntu bug #471504
          https://bugs.launchpad.net/ubuntu/+source/bash/+bug/471504 reported
          by AJ Slater <aj.slater@gmail.com>
+
+[bash-4.1-beta frozen]
+
+                                  11/11
+                                  -----
+builtins/printf.def
+       - in getintmax(), in the case of a conversion error, return the partial
+         value accumulated so far, which is suppose to be what
+         strtoimax/strtoll/strtol returns
+
+                                  11/18
+                                  -----
+builtins/{common.h,shopt.def},shell.c
+       - changed shopt variable "set functions" to take the option name as
+         the first argument; changed function prototypes and callers
+
+builtins/shopt.def
+       - change set_compatibility_level() to turn off other compatNN options
+         when one is set -- enforce mutual exclusivity.  Fixes problem noted
+         by Jan Schampera <jan.schampera@web.de>
+
+                                  11/19
+                                  -----
+lib/readline/rltty.c
+       - make sure prepare_terminal_settings() tests for the presence of
+         ECHOCTL before using it.  Fixes bug reported by Joachim Schmitz
+         <schmitz@hp.com>
+
+config-top.h
+       - new WORDEXP_OPTION define (off by default)
+
+shell.c
+       - don't include the --wordexp option or the supporting function
+         (run_wordexp) if WORDEXP_OPTION is not defined.  Suggested by
+         Aharon Robbins.
+
+execute_cmd.c
+       - in execute_cond_node, turn on comsub_ignore_return if the flags
+         indicate we're ignoring the return value before calling
+         cond_expand_word.  Fixes bug reported by Anirban Sinha
+         <asinha@zeugmasystems.com>
+
+                                  11/20
+                                  -----
+lib/sh/snprintf.c,builtins/printf.def
+       - change check for HAVE_ASPRINTF and HAVE_SNPRINTF to check if value
+         is 1 or 0 rather than whether they are defined or not.  This allows
+         a value of 0 to enable function replacement
+
+configure.in,aclocal.m4
+       - new autoconf macro, BASH_FUNC_SNPRINTF, checks for snprintf present
+         and working as C99 specifies with a zero length argument.  Idea
+         from Greg Wooledge <wooledg@eeg.ccf.org>
+
+
+
index be92a52aa8e71257878f1a59a187096e25719601..10a4741e8352540a945ceaf55912b8ccc7bbeaed 100644 (file)
@@ -4031,3 +4031,87 @@ AC_DEFUN([BASH_FUNC_FPURGE],
   AC_CHECK_FUNCS_ONCE([__fpurge])
   AC_CHECK_DECLS([fpurge], , , [#include <stdio.h>])
 ])
+
+AC_DEFUN([BASH_FUNC_SNPRINTF],
+[
+  AC_CHECK_FUNCS_ONCE([snprintf])
+  if test X$ac_cv_func_snprintf = Xyes; then
+    AC_CACHE_CHECK([for standard-conformant snprintf], [bash_cv_func_snprintf],
+      [AC_TRY_RUN([
+#include <stdio.h>
+
+main()
+{
+  int n;
+  n = snprintf (0, 0, "%s", "0123456");
+  exit(n != 7);
+}
+], bash_cv_func_snprintf=yes, bash_cv_func_snprintf=no,
+   [AC_MSG_WARN([cannot check standard snprintf if cross-compiling])
+    bash_cv_func_snprintf=yes]
+)])
+    if test $bash_cv_func_snprintf = no; then
+      ac_cv_func_snprintf=no
+    fi
+  fi
+  if test $ac_cv_func_snprintf = no; then
+    AC_DEFINE(HAVE_SNPRINTF, 0,
+      [Define if you have a standard-conformant snprintf function.])
+  fi
+])
+
+AC_DEFUN([BASH_FUNC_VSNPRINTF],
+[
+  AC_CHECK_FUNCS_ONCE([vsnprintf])
+  if test X$ac_cv_func_vsnprintf = Xyes; then
+    AC_CACHE_CHECK([for standard-conformant vsnprintf], [bash_cv_func_vsnprintf],
+      [AC_TRY_RUN([
+#if HAVE_STDARG_H
+#include <stdarg.h>
+#else
+#include <varargs.h>
+#endif
+#include <stdio.h>
+#include <stdlib.h>
+
+static int
+#if HAVE_STDARG_H
+foo(const char *fmt, ...)
+#else
+foo(format, va_alist)
+     const char *format;
+     va_dcl
+#endif
+{
+  va_list args;
+  int n;
+
+#if HAVE_STDARG_H
+  va_start(args, fmt);
+#else
+  va_start(args);
+#endif
+  n = vsnprintf(0, 0, fmt, args);
+  va_end (args);
+  return n;
+}
+
+main()
+{
+  int n;
+  n = foo("%s", "0123456");
+  exit(n != 7);
+}
+], bash_cv_func_vsnprintf=yes, bash_cv_func_vsnprintf=no,
+   [AC_MSG_WARN([cannot check standard vsnprintf if cross-compiling])
+    bash_cv_func_vsnprintf=yes]
+)])
+    if test $bash_cv_func_vsnprintf = no; then
+      ac_cv_func_vsnprintf=no
+    fi
+  fi
+  if test $ac_cv_func_vsnprintf = no; then
+    AC_DEFINE(HAVE_VSNPRINTF, 0,
+      [Define if you have a standard-conformant vsnprintf function.])
+  fi
+])
index da4de3e15fd0959fbdae3fd807a152698dd3076b..b3bd62f270a0bb06b561380fc3667499961c4954 100644 (file)
@@ -1759,6 +1759,13 @@ if test $bash_cv_type_wint_t = yes; then
         AC_DEFINE(HAVE_WINT_T, 1, [systems should define this type here])
 fi
 
+if test "$am_cv_func_iconv" = yes; then
+       OLDLIBS="$LIBS"
+       LIBS="$LIBS $LIBICONV"
+       AC_CHECK_FUNCS(locale_charset)
+       LIBS="$OLDLIBS"
+fi
+
 ])
 
 dnl need: prefix exec_prefix libdir includedir CC TERMCAP_LIB
@@ -4024,3 +4031,86 @@ AC_DEFUN([BASH_FUNC_FPURGE],
   AC_CHECK_FUNCS_ONCE([__fpurge])
   AC_CHECK_DECLS([fpurge], , , [#include <stdio.h>])
 ])
+
+AC_DEFUN([BASH_FUNC_SNPRINTF],
+[
+  AC_CHECK_FUNCS_ONCE([snprintf])
+  if test X$ac_cv_func_snprintf = Xyes; then
+    AC_CACHE_CHECK([for standard-conformant snprintf], [bash_cv_func_snprintf],
+      [AC_TRY_RUN([
+#include <stdio.h>
+
+main()
+{
+  int n;
+  n = snprintf (0, 0, "%s", "0123456");
+  exit(n != 7);
+}
+], bash_cv_func_snprintf=yes, bash_cv_func_snprintf=no,
+   [AC_MSG_WARN([cannot check snprintf if cross-compiling])
+    bash_cv_func_snprintf=yes]
+)])
+    if test $bash_cv_func_snprintf = no; then
+      ac_cv_func_snprintf=no
+    fi
+  fi
+  if test $ac_cv_func_snprintf = no; then
+    AC_DEFINE(HAVE_SNPRINTF, 0,
+      [Define if you have a standard-conformant snprintf function.])
+  fi
+])
+
+AC_DEFUN([BASH_FUNC_VSNPRINTF],
+[
+  AC_CHECK_FUNCS_ONCE([vsnprintf])
+  if test X$ac_cv_func_vsnprintf = Xyes; then
+    AC_CACHE_CHECK([for standard-conformant vsnprintf], [bash_cv_func_vsnprintf],
+      [AC_TRY_RUN([
+#if HAVE_STDARG_H
+#include <stdarg.h>
+#else
+#include <varargs.h>
+#endif
+#include <stdio.h>
+
+static int
+#if HAVE_STDARG_H
+foo(const char *fmt, ...)
+#else
+foo(format, va_alist)
+     const char *format;
+     va_dcl
+#endif
+{
+  va_list args;
+  int n;
+
+#if HAVE_STDARG_H
+  va_start(args, fmt);
+#else
+  va_start(args);
+#endif
+  n = vsnprintf(0, 0, fmt, args);
+  va_end (args);
+  return n;
+}
+
+main()
+{
+  int n;
+  n = foo("%s", "0123456");
+  exit(n != 7);
+}
+], bash_cv_func_vsnprintf=yes, bash_cv_func_vsnprintf=no,
+   [AC_MSG_WARN([cannot check vsnprintf if cross-compiling])
+    bash_cv_func_vsnprintf=yes]
+)])
+    if test $bash_cv_func_vsnprintf = no; then
+      ac_cv_func_vsnprintf=no
+    fi
+  fi
+  if test $ac_cv_func_vsnprintf = no; then
+    AC_DEFINE(HAVE_VSNPRINTF, 0,
+      [Define if you have a standard-conformant vsnprintf function.])
+  fi
+])
index 9b1d7e4adaab83cad106e08e538e39f84753433d..fa7389f8d646bc3021747b84918ddeaa170464da 100644 (file)
@@ -1,7 +1,7 @@
 @%:@! /bin/sh
-@%:@ From configure.in for Bash 4.1, version 4.016.
+@%:@ From configure.in for Bash 4.1, version 4.018.
 @%:@ Guess values for system-dependent variables and create Makefiles.
-@%:@ Generated by GNU Autoconf 2.63 for bash 4.1-beta.
+@%:@ Generated by GNU Autoconf 2.63 for bash 4.1-rc.
 @%:@
 @%:@ Report bugs to <bug-bash@gnu.org>.
 @%:@ 
@@ -597,8 +597,8 @@ SHELL=${CONFIG_SHELL-/bin/sh}
 # Identity of this package.
 PACKAGE_NAME='bash'
 PACKAGE_TARNAME='bash'
-PACKAGE_VERSION='4.1-beta'
-PACKAGE_STRING='bash 4.1-beta'
+PACKAGE_VERSION='4.1-rc'
+PACKAGE_STRING='bash 4.1-rc'
 PACKAGE_BUGREPORT='bug-bash@gnu.org'
 
 ac_unique_file="shell.h"
@@ -1411,7 +1411,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures bash 4.1-beta to adapt to many kinds of systems.
+\`configure' configures bash 4.1-rc to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1476,7 +1476,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of bash 4.1-beta:";;
+     short | recursive ) echo "Configuration of bash 4.1-rc:";;
    esac
   cat <<\_ACEOF
 
@@ -1652,7 +1652,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-bash configure 4.1-beta
+bash configure 4.1-rc
 generated by GNU Autoconf 2.63
 
 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1666,7 +1666,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by bash $as_me 4.1-beta, which was
+It was created by bash $as_me 4.1-rc, which was
 generated by GNU Autoconf 2.63.  Invocation command line was
 
   $ $0 $@
@@ -1948,6 +1948,8 @@ ac_header_list="$ac_header_list unistd.h"
 ac_func_list="$ac_func_list alarm"
 ac_func_list="$ac_func_list fpurge"
 ac_func_list="$ac_func_list __fpurge"
+ac_func_list="$ac_func_list snprintf"
+ac_func_list="$ac_func_list vsnprintf"
 # Check that the precious variables saved in the cache have kept the same
 # value.
 ac_cache_corrupted=false
@@ -2078,7 +2080,7 @@ ac_config_headers="$ac_config_headers config.h"
 
 
 BASHVERS=4.1
-RELSTATUS=beta
+RELSTATUS=rc
 
 case "$RELSTATUS" in
 alp*|bet*|dev*|rc*|maint*)     DEBUG='-DDEBUG' MALLOC_DEBUG='-DMALLOC_DEBUG' ;;
@@ -13681,9 +13683,7 @@ done
 
 
 
-
-
-for ac_func in vsnprintf snprintf vasprintf asprintf
+for ac_func in vasprintf asprintf
 do
 as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
 { $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
@@ -28683,6 +28683,212 @@ _ACEOF
 fi
 
 
+       
+
+  
+  
+
+  
+     
+
+  if test X$ac_cv_func_snprintf = Xyes; then
+    { $as_echo "$as_me:$LINENO: checking for standard-conformant snprintf" >&5
+$as_echo_n "checking for standard-conformant snprintf... " >&6; }
+if test "${bash_cv_func_snprintf+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  if test "$cross_compiling" = yes; then
+  { $as_echo "$as_me:$LINENO: WARNING: cannot check standard snprintf if cross-compiling" >&5
+$as_echo "$as_me: WARNING: cannot check standard snprintf if cross-compiling" >&2;}
+    bash_cv_func_snprintf=yes
+
+else
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+
+#include <stdio.h>
+
+main()
+{
+  int n;
+  n = snprintf (0, 0, "%s", "0123456");
+  exit(n != 7);
+}
+
+_ACEOF
+rm -f conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_link") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_try") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  bash_cv_func_snprintf=yes
+else
+  $as_echo "$as_me: program exited with status $ac_status" >&5
+$as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+( exit $ac_status )
+bash_cv_func_snprintf=no
+fi
+rm -rf conftest.dSYM
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+fi
+
+
+fi
+{ $as_echo "$as_me:$LINENO: result: $bash_cv_func_snprintf" >&5
+$as_echo "$bash_cv_func_snprintf" >&6; }
+    if test $bash_cv_func_snprintf = no; then
+      ac_cv_func_snprintf=no
+    fi
+  fi
+  if test $ac_cv_func_snprintf = no; then
+    
+cat >>confdefs.h <<\_ACEOF
+@%:@define HAVE_SNPRINTF 0
+_ACEOF
+
+  fi
+
+
+       
+
+  
+  
+
+  
+     
+
+  if test X$ac_cv_func_vsnprintf = Xyes; then
+    { $as_echo "$as_me:$LINENO: checking for standard-conformant vsnprintf" >&5
+$as_echo_n "checking for standard-conformant vsnprintf... " >&6; }
+if test "${bash_cv_func_vsnprintf+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  if test "$cross_compiling" = yes; then
+  { $as_echo "$as_me:$LINENO: WARNING: cannot check standard vsnprintf if cross-compiling" >&5
+$as_echo "$as_me: WARNING: cannot check standard vsnprintf if cross-compiling" >&2;}
+    bash_cv_func_vsnprintf=yes
+
+else
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+
+#if HAVE_STDARG_H
+#include <stdarg.h>
+#else
+#include <varargs.h>
+#endif
+#include <stdio.h>
+#include <stdlib.h>
+
+static int
+#if HAVE_STDARG_H
+foo(const char *fmt, ...)
+#else
+foo(format, va_alist)
+     const char *format;
+     va_dcl
+#endif
+{
+  va_list args;
+  int n;
+
+#if HAVE_STDARG_H
+  va_start(args, fmt);
+#else
+  va_start(args);
+#endif
+  n = vsnprintf(0, 0, fmt, args);
+  va_end (args);
+  return n;
+}
+
+main()
+{
+  int n;
+  n = foo("%s", "0123456");
+  exit(n != 7);
+}
+
+_ACEOF
+rm -f conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_link") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_try") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  bash_cv_func_vsnprintf=yes
+else
+  $as_echo "$as_me: program exited with status $ac_status" >&5
+$as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+( exit $ac_status )
+bash_cv_func_vsnprintf=no
+fi
+rm -rf conftest.dSYM
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+fi
+
+
+fi
+{ $as_echo "$as_me:$LINENO: result: $bash_cv_func_vsnprintf" >&5
+$as_echo "$bash_cv_func_vsnprintf" >&6; }
+    if test $bash_cv_func_vsnprintf = no; then
+      ac_cv_func_vsnprintf=no
+    fi
+  fi
+  if test $ac_cv_func_vsnprintf = no; then
+    
+cat >>confdefs.h <<\_ACEOF
+@%:@define HAVE_VSNPRINTF 0
+_ACEOF
+
+  fi
+
+
 
 if test "$ac_cv_func_putenv" = "yes"; then
 
@@ -30964,7 +31170,7 @@ exec 6>&1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by bash $as_me 4.1-beta, which was
+This file was extended by bash $as_me 4.1-rc, which was
 generated by GNU Autoconf 2.63.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -31027,7 +31233,7 @@ Report bugs to <bug-autoconf@gnu.org>."
 _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_version="\\
-bash config.status 4.1-beta
+bash config.status 4.1-rc
 configured by $0, generated by GNU Autoconf 2.63,
   with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
 
index 014c1526793ccc20fe5014394befba83e8496a78..4a5e08c959e79308e600ade061bffe6a5fcb00af 100644 (file)
                         'configure.in'
                       ],
                       {
-                        'AM_PROG_F77_C_O' => 1,
                         '_LT_AC_TAGCONFIG' => 1,
-                        'm4_pattern_forbid' => 1,
+                        'AM_PROG_F77_C_O' => 1,
                         'AC_INIT' => 1,
-                        'AC_CANONICAL_TARGET' => 1,
+                        'm4_pattern_forbid' => 1,
                         '_AM_COND_IF' => 1,
-                        'AC_CONFIG_LIBOBJ_DIR' => 1,
+                        'AC_CANONICAL_TARGET' => 1,
                         'AC_SUBST' => 1,
-                        'AC_CANONICAL_HOST' => 1,
+                        'AC_CONFIG_LIBOBJ_DIR' => 1,
                         'AC_FC_SRCEXT' => 1,
+                        'AC_CANONICAL_HOST' => 1,
                         'AC_PROG_LIBTOOL' => 1,
                         'AM_INIT_AUTOMAKE' => 1,
                         'AC_CONFIG_SUBDIRS' => 1,
                         'AM_AUTOMAKE_VERSION' => 1,
                         'LT_CONFIG_LTDL_DIR' => 1,
-                        'AC_CONFIG_LINKS' => 1,
                         'AC_REQUIRE_AUX_FILE' => 1,
-                        'LT_SUPPORTED_TAG' => 1,
+                        'AC_CONFIG_LINKS' => 1,
                         'm4_sinclude' => 1,
+                        'LT_SUPPORTED_TAG' => 1,
                         'AM_MAINTAINER_MODE' => 1,
                         'AM_GNU_GETTEXT_INTL_SUBDIR' => 1,
                         '_m4_warn' => 1,
                         'AC_CANONICAL_BUILD' => 1,
                         'AC_FC_FREEFORM' => 1,
                         'AH_OUTPUT' => 1,
-                        'AC_CONFIG_AUX_DIR' => 1,
                         '_AM_SUBST_NOTMAKE' => 1,
-                        'AM_PROG_CC_C_O' => 1,
-                        'm4_pattern_allow' => 1,
+                        'AC_CONFIG_AUX_DIR' => 1,
                         'sinclude' => 1,
-                        'AM_CONDITIONAL' => 1,
+                        'm4_pattern_allow' => 1,
+                        'AM_PROG_CC_C_O' => 1,
                         'AC_CANONICAL_SYSTEM' => 1,
+                        'AM_CONDITIONAL' => 1,
                         'AC_CONFIG_HEADERS' => 1,
                         'AC_DEFINE_TRACE_LITERAL' => 1,
                         'm4_include' => 1,
index ee6477cb4c4b70825366f505f809465cc2fa48be..36d05e3abd18011bd6e49f2dfa4471e8b46aab6b 100644 (file)
@@ -1,4 +1,4 @@
-m4trace:configure.in:29: -1- AC_INIT([bash], [4.1-beta], [bug-bash@gnu.org])
+m4trace:configure.in:29: -1- AC_INIT([bash], [4.1-rc], [bug-bash@gnu.org])
 m4trace:configure.in:29: -1- m4_pattern_forbid([^_?A[CHUM]_])
 m4trace:configure.in:29: -1- m4_pattern_forbid([_AC_])
 m4trace:configure.in:29: -1- m4_pattern_forbid([^LIBOBJS$], [do not use LIBOBJS directly, use AC_LIBOBJ (see section `AC_LIBOBJ vs LIBOBJS'])
@@ -1400,10 +1400,6 @@ m4trace:configure.in:730: -1- AH_OUTPUT([HAVE_TZSET], [/* Define to 1 if you hav
 #undef HAVE_TZSET])
 m4trace:configure.in:730: -1- AH_OUTPUT([HAVE_UNSETENV], [/* Define to 1 if you have the `unsetenv\' function. */
 #undef HAVE_UNSETENV])
-m4trace:configure.in:736: -1- AH_OUTPUT([HAVE_VSNPRINTF], [/* Define to 1 if you have the `vsnprintf\' function. */
-#undef HAVE_VSNPRINTF])
-m4trace:configure.in:736: -1- AH_OUTPUT([HAVE_SNPRINTF], [/* Define to 1 if you have the `snprintf\' function. */
-#undef HAVE_SNPRINTF])
 m4trace:configure.in:736: -1- AH_OUTPUT([HAVE_VASPRINTF], [/* Define to 1 if you have the `vasprintf\' function. */
 #undef HAVE_VASPRINTF])
 m4trace:configure.in:736: -1- AH_OUTPUT([HAVE_ASPRINTF], [/* Define to 1 if you have the `asprintf\' function. */
@@ -2286,116 +2282,142 @@ aclocal.m4:829: BASH_FUNC_STRCOLL is expanded from...
 configure.in:930: the top level])
 m4trace:configure.in:930: -1- AC_DEFINE_TRACE_LITERAL([STRCOLL_BROKEN])
 m4trace:configure.in:930: -1- m4_pattern_allow([^STRCOLL_BROKEN$])
-m4trace:configure.in:936: -1- _m4_warn([obsolete], [The macro `AC_TRY_LINK' is obsolete.
+m4trace:configure.in:931: -1- AH_OUTPUT([HAVE_SNPRINTF], [/* Define to 1 if you have the `snprintf\' function. */
+#undef HAVE_SNPRINTF])
+m4trace:configure.in:931: -1- _m4_warn([obsolete], [The macro `AC_TRY_RUN' is obsolete.
+You should run autoupdate.], [../../lib/autoconf/general.m4:2592: AC_TRY_RUN is expanded from...
+../../lib/m4sugar/m4sh.m4:505: AS_IF is expanded from...
+../../lib/autoconf/general.m4:1974: AC_CACHE_VAL is expanded from...
+../../lib/autoconf/general.m4:1994: AC_CACHE_CHECK is expanded from...
+aclocal.m4:4035: BASH_FUNC_SNPRINTF is expanded from...
+configure.in:931: the top level])
+m4trace:configure.in:931: -1- AC_DEFINE_TRACE_LITERAL([HAVE_SNPRINTF])
+m4trace:configure.in:931: -1- m4_pattern_allow([^HAVE_SNPRINTF$])
+m4trace:configure.in:931: -1- AH_OUTPUT([HAVE_SNPRINTF], [/* Define if you have a standard-conformant snprintf function. */
+#undef HAVE_SNPRINTF])
+m4trace:configure.in:932: -1- AH_OUTPUT([HAVE_VSNPRINTF], [/* Define to 1 if you have the `vsnprintf\' function. */
+#undef HAVE_VSNPRINTF])
+m4trace:configure.in:932: -1- _m4_warn([obsolete], [The macro `AC_TRY_RUN' is obsolete.
+You should run autoupdate.], [../../lib/autoconf/general.m4:2592: AC_TRY_RUN is expanded from...
+../../lib/m4sugar/m4sh.m4:505: AS_IF is expanded from...
+../../lib/autoconf/general.m4:1974: AC_CACHE_VAL is expanded from...
+../../lib/autoconf/general.m4:1994: AC_CACHE_CHECK is expanded from...
+aclocal.m4:4063: BASH_FUNC_VSNPRINTF is expanded from...
+configure.in:932: the top level])
+m4trace:configure.in:932: -1- AC_DEFINE_TRACE_LITERAL([HAVE_VSNPRINTF])
+m4trace:configure.in:932: -1- m4_pattern_allow([^HAVE_VSNPRINTF$])
+m4trace:configure.in:932: -1- AH_OUTPUT([HAVE_VSNPRINTF], [/* Define if you have a standard-conformant vsnprintf function. */
+#undef HAVE_VSNPRINTF])
+m4trace:configure.in:938: -1- _m4_warn([obsolete], [The macro `AC_TRY_LINK' is obsolete.
 You should run autoupdate.], [../../lib/autoconf/general.m4:2527: AC_TRY_LINK is expanded from...
 ../../lib/m4sugar/m4sh.m4:505: AS_IF is expanded from...
 ../../lib/autoconf/general.m4:1974: AC_CACHE_VAL is expanded from...
 ../../lib/autoconf/general.m4:1994: AC_CACHE_CHECK is expanded from...
 aclocal.m4:624: BASH_FUNC_STD_PUTENV is expanded from...
-configure.in:936: the top level])
-m4trace:configure.in:936: -1- AC_DEFINE_TRACE_LITERAL([HAVE_STD_PUTENV])
-m4trace:configure.in:936: -1- m4_pattern_allow([^HAVE_STD_PUTENV$])
+configure.in:938: the top level])
 m4trace:configure.in:938: -1- AC_DEFINE_TRACE_LITERAL([HAVE_STD_PUTENV])
 m4trace:configure.in:938: -1- m4_pattern_allow([^HAVE_STD_PUTENV$])
-m4trace:configure.in:941: -1- _m4_warn([obsolete], [The macro `AC_TRY_LINK' is obsolete.
+m4trace:configure.in:940: -1- AC_DEFINE_TRACE_LITERAL([HAVE_STD_PUTENV])
+m4trace:configure.in:940: -1- m4_pattern_allow([^HAVE_STD_PUTENV$])
+m4trace:configure.in:943: -1- _m4_warn([obsolete], [The macro `AC_TRY_LINK' is obsolete.
 You should run autoupdate.], [../../lib/autoconf/general.m4:2527: AC_TRY_LINK is expanded from...
 ../../lib/m4sugar/m4sh.m4:505: AS_IF is expanded from...
 ../../lib/autoconf/general.m4:1974: AC_CACHE_VAL is expanded from...
 ../../lib/autoconf/general.m4:1994: AC_CACHE_CHECK is expanded from...
 aclocal.m4:654: BASH_FUNC_STD_UNSETENV is expanded from...
-configure.in:941: the top level])
-m4trace:configure.in:941: -1- AC_DEFINE_TRACE_LITERAL([HAVE_STD_UNSETENV])
-m4trace:configure.in:941: -1- m4_pattern_allow([^HAVE_STD_UNSETENV$])
+configure.in:943: the top level])
 m4trace:configure.in:943: -1- AC_DEFINE_TRACE_LITERAL([HAVE_STD_UNSETENV])
 m4trace:configure.in:943: -1- m4_pattern_allow([^HAVE_STD_UNSETENV$])
-m4trace:configure.in:946: -1- _m4_warn([obsolete], [The macro `AC_TRY_RUN' is obsolete.
+m4trace:configure.in:945: -1- AC_DEFINE_TRACE_LITERAL([HAVE_STD_UNSETENV])
+m4trace:configure.in:945: -1- m4_pattern_allow([^HAVE_STD_UNSETENV$])
+m4trace:configure.in:948: -1- _m4_warn([obsolete], [The macro `AC_TRY_RUN' is obsolete.
 You should run autoupdate.], [../../lib/autoconf/general.m4:2592: AC_TRY_RUN is expanded from...
 ../../lib/m4sugar/m4sh.m4:505: AS_IF is expanded from...
 ../../lib/autoconf/general.m4:1974: AC_CACHE_VAL is expanded from...
 aclocal.m4:878: BASH_FUNC_PRINTF_A_FORMAT is expanded from...
-configure.in:946: the top level])
-m4trace:configure.in:946: -1- AC_DEFINE_TRACE_LITERAL([HAVE_PRINTF_A_FORMAT])
-m4trace:configure.in:946: -1- m4_pattern_allow([^HAVE_PRINTF_A_FORMAT$])
-m4trace:configure.in:949: -1- _m4_warn([obsolete], [The macro `AC_TRY_RUN' is obsolete.
+configure.in:948: the top level])
+m4trace:configure.in:948: -1- AC_DEFINE_TRACE_LITERAL([HAVE_PRINTF_A_FORMAT])
+m4trace:configure.in:948: -1- m4_pattern_allow([^HAVE_PRINTF_A_FORMAT$])
+m4trace:configure.in:951: -1- _m4_warn([obsolete], [The macro `AC_TRY_RUN' is obsolete.
 You should run autoupdate.], [../../lib/autoconf/general.m4:2592: AC_TRY_RUN is expanded from...
 ../../lib/m4sugar/m4sh.m4:505: AS_IF is expanded from...
 ../../lib/autoconf/general.m4:1974: AC_CACHE_VAL is expanded from...
 aclocal.m4:1297: BASH_SYS_REINSTALL_SIGHANDLERS is expanded from...
-configure.in:949: the top level])
-m4trace:configure.in:949: -1- AC_DEFINE_TRACE_LITERAL([MUST_REINSTALL_SIGHANDLERS])
-m4trace:configure.in:949: -1- m4_pattern_allow([^MUST_REINSTALL_SIGHANDLERS$])
-m4trace:configure.in:950: -1- _m4_warn([obsolete], [The macro `AC_TRY_RUN' is obsolete.
+configure.in:951: the top level])
+m4trace:configure.in:951: -1- AC_DEFINE_TRACE_LITERAL([MUST_REINSTALL_SIGHANDLERS])
+m4trace:configure.in:951: -1- m4_pattern_allow([^MUST_REINSTALL_SIGHANDLERS$])
+m4trace:configure.in:952: -1- _m4_warn([obsolete], [The macro `AC_TRY_RUN' is obsolete.
 You should run autoupdate.], [../../lib/autoconf/general.m4:2592: AC_TRY_RUN is expanded from...
 ../../lib/m4sugar/m4sh.m4:505: AS_IF is expanded from...
 ../../lib/autoconf/general.m4:1974: AC_CACHE_VAL is expanded from...
 aclocal.m4:1356: BASH_SYS_JOB_CONTROL_MISSING is expanded from...
-configure.in:950: the top level])
-m4trace:configure.in:950: -1- AC_DEFINE_TRACE_LITERAL([JOB_CONTROL_MISSING])
-m4trace:configure.in:950: -1- m4_pattern_allow([^JOB_CONTROL_MISSING$])
-m4trace:configure.in:951: -1- _m4_warn([obsolete], [The macro `AC_TRY_RUN' is obsolete.
+configure.in:952: the top level])
+m4trace:configure.in:952: -1- AC_DEFINE_TRACE_LITERAL([JOB_CONTROL_MISSING])
+m4trace:configure.in:952: -1- m4_pattern_allow([^JOB_CONTROL_MISSING$])
+m4trace:configure.in:953: -1- _m4_warn([obsolete], [The macro `AC_TRY_RUN' is obsolete.
 You should run autoupdate.], [../../lib/autoconf/general.m4:2592: AC_TRY_RUN is expanded from...
 ../../lib/m4sugar/m4sh.m4:505: AS_IF is expanded from...
 ../../lib/autoconf/general.m4:1974: AC_CACHE_VAL is expanded from...
 aclocal.m4:1415: BASH_SYS_NAMED_PIPES is expanded from...
-configure.in:951: the top level])
-m4trace:configure.in:951: -1- AC_DEFINE_TRACE_LITERAL([NAMED_PIPES_MISSING])
-m4trace:configure.in:951: -1- m4_pattern_allow([^NAMED_PIPES_MISSING$])
-m4trace:configure.in:954: -1- AC_DEFINE_TRACE_LITERAL([GWINSZ_IN_SYS_IOCTL])
-m4trace:configure.in:954: -1- m4_pattern_allow([^GWINSZ_IN_SYS_IOCTL$])
-m4trace:configure.in:954: -1- AH_OUTPUT([GWINSZ_IN_SYS_IOCTL], [/* Define to 1 if `TIOCGWINSZ\' requires <sys/ioctl.h>. */
+configure.in:953: the top level])
+m4trace:configure.in:953: -1- AC_DEFINE_TRACE_LITERAL([NAMED_PIPES_MISSING])
+m4trace:configure.in:953: -1- m4_pattern_allow([^NAMED_PIPES_MISSING$])
+m4trace:configure.in:956: -1- AC_DEFINE_TRACE_LITERAL([GWINSZ_IN_SYS_IOCTL])
+m4trace:configure.in:956: -1- m4_pattern_allow([^GWINSZ_IN_SYS_IOCTL$])
+m4trace:configure.in:956: -1- AH_OUTPUT([GWINSZ_IN_SYS_IOCTL], [/* Define to 1 if `TIOCGWINSZ\' requires <sys/ioctl.h>. */
 #undef GWINSZ_IN_SYS_IOCTL])
-m4trace:configure.in:955: -1- _m4_warn([obsolete], [The macro `AC_TRY_COMPILE' is obsolete.
+m4trace:configure.in:957: -1- _m4_warn([obsolete], [The macro `AC_TRY_COMPILE' is obsolete.
 You should run autoupdate.], [../../lib/autoconf/general.m4:2470: AC_TRY_COMPILE is expanded from...
 ../../lib/m4sugar/m4sh.m4:505: AS_IF is expanded from...
 ../../lib/autoconf/general.m4:1974: AC_CACHE_VAL is expanded from...
 aclocal.m4:1496: BASH_HAVE_TIOCSTAT is expanded from...
-configure.in:955: the top level])
-m4trace:configure.in:955: -1- AC_DEFINE_TRACE_LITERAL([TIOCSTAT_IN_SYS_IOCTL])
-m4trace:configure.in:955: -1- m4_pattern_allow([^TIOCSTAT_IN_SYS_IOCTL$])
-m4trace:configure.in:956: -1- _m4_warn([obsolete], [The macro `AC_TRY_COMPILE' is obsolete.
+configure.in:957: the top level])
+m4trace:configure.in:957: -1- AC_DEFINE_TRACE_LITERAL([TIOCSTAT_IN_SYS_IOCTL])
+m4trace:configure.in:957: -1- m4_pattern_allow([^TIOCSTAT_IN_SYS_IOCTL$])
+m4trace:configure.in:958: -1- _m4_warn([obsolete], [The macro `AC_TRY_COMPILE' is obsolete.
 You should run autoupdate.], [../../lib/autoconf/general.m4:2470: AC_TRY_COMPILE is expanded from...
 ../../lib/m4sugar/m4sh.m4:505: AS_IF is expanded from...
 ../../lib/autoconf/general.m4:1974: AC_CACHE_VAL is expanded from...
 aclocal.m4:1508: BASH_HAVE_FIONREAD is expanded from...
-configure.in:956: the top level])
-m4trace:configure.in:956: -1- AC_DEFINE_TRACE_LITERAL([FIONREAD_IN_SYS_IOCTL])
-m4trace:configure.in:956: -1- m4_pattern_allow([^FIONREAD_IN_SYS_IOCTL$])
-m4trace:configure.in:958: -1- _m4_warn([obsolete], [The macro `AC_TRY_RUN' is obsolete.
+configure.in:958: the top level])
+m4trace:configure.in:958: -1- AC_DEFINE_TRACE_LITERAL([FIONREAD_IN_SYS_IOCTL])
+m4trace:configure.in:958: -1- m4_pattern_allow([^FIONREAD_IN_SYS_IOCTL$])
+m4trace:configure.in:960: -1- _m4_warn([obsolete], [The macro `AC_TRY_RUN' is obsolete.
 You should run autoupdate.], [../../lib/autoconf/general.m4:2592: AC_TRY_RUN is expanded from...
 ../../lib/m4sugar/m4sh.m4:505: AS_IF is expanded from...
 ../../lib/autoconf/general.m4:1974: AC_CACHE_VAL is expanded from...
 aclocal.m4:1934: BASH_CHECK_WCONTINUED is expanded from...
-configure.in:958: the top level])
-m4trace:configure.in:958: -1- AC_DEFINE_TRACE_LITERAL([WCONTINUED_BROKEN])
-m4trace:configure.in:958: -1- m4_pattern_allow([^WCONTINUED_BROKEN$])
-m4trace:configure.in:961: -1- _m4_warn([obsolete], [The macro `AC_TRY_COMPILE' is obsolete.
+configure.in:960: the top level])
+m4trace:configure.in:960: -1- AC_DEFINE_TRACE_LITERAL([WCONTINUED_BROKEN])
+m4trace:configure.in:960: -1- m4_pattern_allow([^WCONTINUED_BROKEN$])
+m4trace:configure.in:963: -1- _m4_warn([obsolete], [The macro `AC_TRY_COMPILE' is obsolete.
 You should run autoupdate.], [../../lib/autoconf/general.m4:2470: AC_TRY_COMPILE is expanded from...
 ../../lib/m4sugar/m4sh.m4:505: AS_IF is expanded from...
 ../../lib/autoconf/general.m4:1974: AC_CACHE_VAL is expanded from...
 aclocal.m4:1526: BASH_CHECK_SPEED_T is expanded from...
-configure.in:961: the top level])
-m4trace:configure.in:961: -1- AC_DEFINE_TRACE_LITERAL([SPEED_T_IN_SYS_TYPES])
-m4trace:configure.in:961: -1- m4_pattern_allow([^SPEED_T_IN_SYS_TYPES$])
-m4trace:configure.in:962: -1- AC_DEFINE_TRACE_LITERAL([HAVE_GETPW_DECLS])
-m4trace:configure.in:962: -1- m4_pattern_allow([^HAVE_GETPW_DECLS$])
-m4trace:configure.in:963: -1- _m4_warn([obsolete], [The macro `AC_TRY_RUN' is obsolete.
+configure.in:963: the top level])
+m4trace:configure.in:963: -1- AC_DEFINE_TRACE_LITERAL([SPEED_T_IN_SYS_TYPES])
+m4trace:configure.in:963: -1- m4_pattern_allow([^SPEED_T_IN_SYS_TYPES$])
+m4trace:configure.in:964: -1- AC_DEFINE_TRACE_LITERAL([HAVE_GETPW_DECLS])
+m4trace:configure.in:964: -1- m4_pattern_allow([^HAVE_GETPW_DECLS$])
+m4trace:configure.in:965: -1- _m4_warn([obsolete], [The macro `AC_TRY_RUN' is obsolete.
 You should run autoupdate.], [../../lib/autoconf/general.m4:2592: AC_TRY_RUN is expanded from...
 ../../lib/m4sugar/m4sh.m4:505: AS_IF is expanded from...
 ../../lib/autoconf/general.m4:1974: AC_CACHE_VAL is expanded from...
 aclocal.m4:1653: BASH_CHECK_RTSIGS is expanded from...
-configure.in:963: the top level])
-m4trace:configure.in:963: -1- AC_DEFINE_TRACE_LITERAL([UNUSABLE_RT_SIGNALS])
-m4trace:configure.in:963: -1- m4_pattern_allow([^UNUSABLE_RT_SIGNALS$])
-m4trace:configure.in:964: -1- AC_SUBST([SIGLIST_O])
-m4trace:configure.in:964: -1- AC_SUBST_TRACE([SIGLIST_O])
-m4trace:configure.in:964: -1- m4_pattern_allow([^SIGLIST_O$])
-m4trace:configure.in:968: -1- _m4_warn([obsolete], [The macro `AC_TRY_COMPILE' is obsolete.
+configure.in:965: the top level])
+m4trace:configure.in:965: -1- AC_DEFINE_TRACE_LITERAL([UNUSABLE_RT_SIGNALS])
+m4trace:configure.in:965: -1- m4_pattern_allow([^UNUSABLE_RT_SIGNALS$])
+m4trace:configure.in:966: -1- AC_SUBST([SIGLIST_O])
+m4trace:configure.in:966: -1- AC_SUBST_TRACE([SIGLIST_O])
+m4trace:configure.in:966: -1- m4_pattern_allow([^SIGLIST_O$])
+m4trace:configure.in:970: -1- _m4_warn([obsolete], [The macro `AC_TRY_COMPILE' is obsolete.
 You should run autoupdate.], [../../lib/autoconf/general.m4:2470: AC_TRY_COMPILE is expanded from...
 ../../lib/m4sugar/m4sh.m4:505: AS_IF is expanded from...
 ../../lib/autoconf/general.m4:1974: AC_CACHE_VAL is expanded from...
 aclocal.m4:1605: BASH_CHECK_KERNEL_RLIMIT is expanded from...
-configure.in:968: the top level])
-m4trace:configure.in:968: -1- _m4_warn([obsolete], [The macro `AC_TRY_COMPILE' is obsolete.
+configure.in:970: the top level])
+m4trace:configure.in:970: -1- _m4_warn([obsolete], [The macro `AC_TRY_COMPILE' is obsolete.
 You should run autoupdate.], [../../lib/autoconf/general.m4:2470: AC_TRY_COMPILE is expanded from...
 ../../lib/m4sugar/m4sh.m4:505: AS_IF is expanded from...
 ../../lib/autoconf/general.m4:2462: AC_COMPILE_IFELSE is expanded from...
@@ -2403,140 +2425,140 @@ You should run autoupdate.], [../../lib/autoconf/general.m4:2470: AC_TRY_COMPILE
 ../../lib/m4sugar/m4sh.m4:505: AS_IF is expanded from...
 ../../lib/autoconf/general.m4:1974: AC_CACHE_VAL is expanded from...
 aclocal.m4:1605: BASH_CHECK_KERNEL_RLIMIT is expanded from...
-configure.in:968: the top level])
-m4trace:configure.in:968: -1- AC_DEFINE_TRACE_LITERAL([RLIMIT_NEEDS_KERNEL])
-m4trace:configure.in:968: -1- m4_pattern_allow([^RLIMIT_NEEDS_KERNEL$])
-m4trace:configure.in:978: -1- AC_SUBST([TERMCAP_LIB])
-m4trace:configure.in:978: -1- AC_SUBST_TRACE([TERMCAP_LIB])
-m4trace:configure.in:978: -1- m4_pattern_allow([^TERMCAP_LIB$])
-m4trace:configure.in:979: -1- AC_SUBST([TERMCAP_DEP])
-m4trace:configure.in:979: -1- AC_SUBST_TRACE([TERMCAP_DEP])
-m4trace:configure.in:979: -1- m4_pattern_allow([^TERMCAP_DEP$])
-m4trace:configure.in:981: -1- AC_DEFINE_TRACE_LITERAL([HAVE_DEV_FD])
-m4trace:configure.in:981: -1- m4_pattern_allow([^HAVE_DEV_FD$])
-m4trace:configure.in:981: -1- AC_DEFINE_TRACE_LITERAL([DEV_FD_PREFIX])
-m4trace:configure.in:981: -1- m4_pattern_allow([^DEV_FD_PREFIX$])
-m4trace:configure.in:981: -1- AC_DEFINE_TRACE_LITERAL([HAVE_DEV_FD])
-m4trace:configure.in:981: -1- m4_pattern_allow([^HAVE_DEV_FD$])
-m4trace:configure.in:981: -1- AC_DEFINE_TRACE_LITERAL([DEV_FD_PREFIX])
-m4trace:configure.in:981: -1- m4_pattern_allow([^DEV_FD_PREFIX$])
-m4trace:configure.in:982: -1- AC_DEFINE_TRACE_LITERAL([HAVE_DEV_STDIN])
-m4trace:configure.in:982: -1- m4_pattern_allow([^HAVE_DEV_STDIN$])
-m4trace:configure.in:983: -1- AC_DEFINE_TRACE_LITERAL([DEFAULT_MAIL_DIRECTORY])
-m4trace:configure.in:983: -1- m4_pattern_allow([^DEFAULT_MAIL_DIRECTORY$])
-m4trace:configure.in:990: -1- AC_DEFINE_TRACE_LITERAL([JOB_CONTROL])
-m4trace:configure.in:990: -1- m4_pattern_allow([^JOB_CONTROL$])
-m4trace:configure.in:996: -1- AC_SUBST([JOBS_O])
-m4trace:configure.in:996: -1- AC_SUBST_TRACE([JOBS_O])
-m4trace:configure.in:996: -1- m4_pattern_allow([^JOBS_O$])
-m4trace:configure.in:1009: -1- AC_DEFINE_TRACE_LITERAL([SVR4_2])
-m4trace:configure.in:1009: -1- m4_pattern_allow([^SVR4_2$])
-m4trace:configure.in:1010: -1- AC_DEFINE_TRACE_LITERAL([SVR4])
-m4trace:configure.in:1010: -1- m4_pattern_allow([^SVR4$])
-m4trace:configure.in:1011: -1- AC_DEFINE_TRACE_LITERAL([SVR4])
-m4trace:configure.in:1011: -1- m4_pattern_allow([^SVR4$])
-m4trace:configure.in:1012: -1- AC_DEFINE_TRACE_LITERAL([SVR5])
-m4trace:configure.in:1012: -1- m4_pattern_allow([^SVR5$])
-m4trace:configure.in:1031: -1- AC_DEFINE_TRACE_LITERAL([PGRP_PIPE])
-m4trace:configure.in:1031: -1- m4_pattern_allow([^PGRP_PIPE$])
-m4trace:configure.in:1078: -1- AC_SUBST([SHOBJ_CC])
-m4trace:configure.in:1078: -1- AC_SUBST_TRACE([SHOBJ_CC])
-m4trace:configure.in:1078: -1- m4_pattern_allow([^SHOBJ_CC$])
-m4trace:configure.in:1079: -1- AC_SUBST([SHOBJ_CFLAGS])
-m4trace:configure.in:1079: -1- AC_SUBST_TRACE([SHOBJ_CFLAGS])
-m4trace:configure.in:1079: -1- m4_pattern_allow([^SHOBJ_CFLAGS$])
-m4trace:configure.in:1080: -1- AC_SUBST([SHOBJ_LD])
-m4trace:configure.in:1080: -1- AC_SUBST_TRACE([SHOBJ_LD])
-m4trace:configure.in:1080: -1- m4_pattern_allow([^SHOBJ_LD$])
-m4trace:configure.in:1081: -1- AC_SUBST([SHOBJ_LDFLAGS])
-m4trace:configure.in:1081: -1- AC_SUBST_TRACE([SHOBJ_LDFLAGS])
-m4trace:configure.in:1081: -1- m4_pattern_allow([^SHOBJ_LDFLAGS$])
-m4trace:configure.in:1082: -1- AC_SUBST([SHOBJ_XLDFLAGS])
-m4trace:configure.in:1082: -1- AC_SUBST_TRACE([SHOBJ_XLDFLAGS])
-m4trace:configure.in:1082: -1- m4_pattern_allow([^SHOBJ_XLDFLAGS$])
-m4trace:configure.in:1083: -1- AC_SUBST([SHOBJ_LIBS])
-m4trace:configure.in:1083: -1- AC_SUBST_TRACE([SHOBJ_LIBS])
-m4trace:configure.in:1083: -1- m4_pattern_allow([^SHOBJ_LIBS$])
-m4trace:configure.in:1084: -1- AC_SUBST([SHOBJ_STATUS])
-m4trace:configure.in:1084: -1- AC_SUBST_TRACE([SHOBJ_STATUS])
-m4trace:configure.in:1084: -1- m4_pattern_allow([^SHOBJ_STATUS$])
-m4trace:configure.in:1116: -1- AC_SUBST([PROFILE_FLAGS])
-m4trace:configure.in:1116: -1- AC_SUBST_TRACE([PROFILE_FLAGS])
-m4trace:configure.in:1116: -1- m4_pattern_allow([^PROFILE_FLAGS$])
-m4trace:configure.in:1118: -1- AC_SUBST([incdir])
-m4trace:configure.in:1118: -1- AC_SUBST_TRACE([incdir])
-m4trace:configure.in:1118: -1- m4_pattern_allow([^incdir$])
-m4trace:configure.in:1119: -1- AC_SUBST([BUILD_DIR])
-m4trace:configure.in:1119: -1- AC_SUBST_TRACE([BUILD_DIR])
-m4trace:configure.in:1119: -1- m4_pattern_allow([^BUILD_DIR$])
-m4trace:configure.in:1122: -1- AC_SUBST([datarootdir])
-m4trace:configure.in:1122: -1- AC_SUBST_TRACE([datarootdir])
-m4trace:configure.in:1122: -1- m4_pattern_allow([^datarootdir$])
-m4trace:configure.in:1123: -1- AC_SUBST([localedir])
-m4trace:configure.in:1123: -1- AC_SUBST_TRACE([localedir])
-m4trace:configure.in:1123: -1- m4_pattern_allow([^localedir$])
-m4trace:configure.in:1125: -1- AC_SUBST([YACC])
-m4trace:configure.in:1125: -1- AC_SUBST_TRACE([YACC])
-m4trace:configure.in:1125: -1- m4_pattern_allow([^YACC$])
-m4trace:configure.in:1126: -1- AC_SUBST([AR])
-m4trace:configure.in:1126: -1- AC_SUBST_TRACE([AR])
-m4trace:configure.in:1126: -1- m4_pattern_allow([^AR$])
-m4trace:configure.in:1127: -1- AC_SUBST([ARFLAGS])
-m4trace:configure.in:1127: -1- AC_SUBST_TRACE([ARFLAGS])
-m4trace:configure.in:1127: -1- m4_pattern_allow([^ARFLAGS$])
-m4trace:configure.in:1129: -1- AC_SUBST([BASHVERS])
-m4trace:configure.in:1129: -1- AC_SUBST_TRACE([BASHVERS])
-m4trace:configure.in:1129: -1- m4_pattern_allow([^BASHVERS$])
-m4trace:configure.in:1130: -1- AC_SUBST([RELSTATUS])
-m4trace:configure.in:1130: -1- AC_SUBST_TRACE([RELSTATUS])
-m4trace:configure.in:1130: -1- m4_pattern_allow([^RELSTATUS$])
-m4trace:configure.in:1131: -1- AC_SUBST([DEBUG])
-m4trace:configure.in:1131: -1- AC_SUBST_TRACE([DEBUG])
-m4trace:configure.in:1131: -1- m4_pattern_allow([^DEBUG$])
-m4trace:configure.in:1132: -1- AC_SUBST([MALLOC_DEBUG])
-m4trace:configure.in:1132: -1- AC_SUBST_TRACE([MALLOC_DEBUG])
-m4trace:configure.in:1132: -1- m4_pattern_allow([^MALLOC_DEBUG$])
-m4trace:configure.in:1134: -1- AC_SUBST([host_cpu])
-m4trace:configure.in:1134: -1- AC_SUBST_TRACE([host_cpu])
-m4trace:configure.in:1134: -1- m4_pattern_allow([^host_cpu$])
-m4trace:configure.in:1135: -1- AC_SUBST([host_vendor])
-m4trace:configure.in:1135: -1- AC_SUBST_TRACE([host_vendor])
-m4trace:configure.in:1135: -1- m4_pattern_allow([^host_vendor$])
-m4trace:configure.in:1136: -1- AC_SUBST([host_os])
-m4trace:configure.in:1136: -1- AC_SUBST_TRACE([host_os])
-m4trace:configure.in:1136: -1- m4_pattern_allow([^host_os$])
-m4trace:configure.in:1138: -1- AC_SUBST([LOCAL_LIBS])
-m4trace:configure.in:1138: -1- AC_SUBST_TRACE([LOCAL_LIBS])
-m4trace:configure.in:1138: -1- m4_pattern_allow([^LOCAL_LIBS$])
-m4trace:configure.in:1139: -1- AC_SUBST([LOCAL_CFLAGS])
-m4trace:configure.in:1139: -1- AC_SUBST_TRACE([LOCAL_CFLAGS])
-m4trace:configure.in:1139: -1- m4_pattern_allow([^LOCAL_CFLAGS$])
-m4trace:configure.in:1140: -1- AC_SUBST([LOCAL_LDFLAGS])
-m4trace:configure.in:1140: -1- AC_SUBST_TRACE([LOCAL_LDFLAGS])
-m4trace:configure.in:1140: -1- m4_pattern_allow([^LOCAL_LDFLAGS$])
-m4trace:configure.in:1141: -1- AC_SUBST([LOCAL_DEFS])
-m4trace:configure.in:1141: -1- AC_SUBST_TRACE([LOCAL_DEFS])
-m4trace:configure.in:1141: -1- m4_pattern_allow([^LOCAL_DEFS$])
-m4trace:configure.in:1146: -1- AC_CONFIG_FILES([Makefile builtins/Makefile lib/readline/Makefile lib/glob/Makefile \
+configure.in:970: the top level])
+m4trace:configure.in:970: -1- AC_DEFINE_TRACE_LITERAL([RLIMIT_NEEDS_KERNEL])
+m4trace:configure.in:970: -1- m4_pattern_allow([^RLIMIT_NEEDS_KERNEL$])
+m4trace:configure.in:980: -1- AC_SUBST([TERMCAP_LIB])
+m4trace:configure.in:980: -1- AC_SUBST_TRACE([TERMCAP_LIB])
+m4trace:configure.in:980: -1- m4_pattern_allow([^TERMCAP_LIB$])
+m4trace:configure.in:981: -1- AC_SUBST([TERMCAP_DEP])
+m4trace:configure.in:981: -1- AC_SUBST_TRACE([TERMCAP_DEP])
+m4trace:configure.in:981: -1- m4_pattern_allow([^TERMCAP_DEP$])
+m4trace:configure.in:983: -1- AC_DEFINE_TRACE_LITERAL([HAVE_DEV_FD])
+m4trace:configure.in:983: -1- m4_pattern_allow([^HAVE_DEV_FD$])
+m4trace:configure.in:983: -1- AC_DEFINE_TRACE_LITERAL([DEV_FD_PREFIX])
+m4trace:configure.in:983: -1- m4_pattern_allow([^DEV_FD_PREFIX$])
+m4trace:configure.in:983: -1- AC_DEFINE_TRACE_LITERAL([HAVE_DEV_FD])
+m4trace:configure.in:983: -1- m4_pattern_allow([^HAVE_DEV_FD$])
+m4trace:configure.in:983: -1- AC_DEFINE_TRACE_LITERAL([DEV_FD_PREFIX])
+m4trace:configure.in:983: -1- m4_pattern_allow([^DEV_FD_PREFIX$])
+m4trace:configure.in:984: -1- AC_DEFINE_TRACE_LITERAL([HAVE_DEV_STDIN])
+m4trace:configure.in:984: -1- m4_pattern_allow([^HAVE_DEV_STDIN$])
+m4trace:configure.in:985: -1- AC_DEFINE_TRACE_LITERAL([DEFAULT_MAIL_DIRECTORY])
+m4trace:configure.in:985: -1- m4_pattern_allow([^DEFAULT_MAIL_DIRECTORY$])
+m4trace:configure.in:992: -1- AC_DEFINE_TRACE_LITERAL([JOB_CONTROL])
+m4trace:configure.in:992: -1- m4_pattern_allow([^JOB_CONTROL$])
+m4trace:configure.in:998: -1- AC_SUBST([JOBS_O])
+m4trace:configure.in:998: -1- AC_SUBST_TRACE([JOBS_O])
+m4trace:configure.in:998: -1- m4_pattern_allow([^JOBS_O$])
+m4trace:configure.in:1011: -1- AC_DEFINE_TRACE_LITERAL([SVR4_2])
+m4trace:configure.in:1011: -1- m4_pattern_allow([^SVR4_2$])
+m4trace:configure.in:1012: -1- AC_DEFINE_TRACE_LITERAL([SVR4])
+m4trace:configure.in:1012: -1- m4_pattern_allow([^SVR4$])
+m4trace:configure.in:1013: -1- AC_DEFINE_TRACE_LITERAL([SVR4])
+m4trace:configure.in:1013: -1- m4_pattern_allow([^SVR4$])
+m4trace:configure.in:1014: -1- AC_DEFINE_TRACE_LITERAL([SVR5])
+m4trace:configure.in:1014: -1- m4_pattern_allow([^SVR5$])
+m4trace:configure.in:1033: -1- AC_DEFINE_TRACE_LITERAL([PGRP_PIPE])
+m4trace:configure.in:1033: -1- m4_pattern_allow([^PGRP_PIPE$])
+m4trace:configure.in:1080: -1- AC_SUBST([SHOBJ_CC])
+m4trace:configure.in:1080: -1- AC_SUBST_TRACE([SHOBJ_CC])
+m4trace:configure.in:1080: -1- m4_pattern_allow([^SHOBJ_CC$])
+m4trace:configure.in:1081: -1- AC_SUBST([SHOBJ_CFLAGS])
+m4trace:configure.in:1081: -1- AC_SUBST_TRACE([SHOBJ_CFLAGS])
+m4trace:configure.in:1081: -1- m4_pattern_allow([^SHOBJ_CFLAGS$])
+m4trace:configure.in:1082: -1- AC_SUBST([SHOBJ_LD])
+m4trace:configure.in:1082: -1- AC_SUBST_TRACE([SHOBJ_LD])
+m4trace:configure.in:1082: -1- m4_pattern_allow([^SHOBJ_LD$])
+m4trace:configure.in:1083: -1- AC_SUBST([SHOBJ_LDFLAGS])
+m4trace:configure.in:1083: -1- AC_SUBST_TRACE([SHOBJ_LDFLAGS])
+m4trace:configure.in:1083: -1- m4_pattern_allow([^SHOBJ_LDFLAGS$])
+m4trace:configure.in:1084: -1- AC_SUBST([SHOBJ_XLDFLAGS])
+m4trace:configure.in:1084: -1- AC_SUBST_TRACE([SHOBJ_XLDFLAGS])
+m4trace:configure.in:1084: -1- m4_pattern_allow([^SHOBJ_XLDFLAGS$])
+m4trace:configure.in:1085: -1- AC_SUBST([SHOBJ_LIBS])
+m4trace:configure.in:1085: -1- AC_SUBST_TRACE([SHOBJ_LIBS])
+m4trace:configure.in:1085: -1- m4_pattern_allow([^SHOBJ_LIBS$])
+m4trace:configure.in:1086: -1- AC_SUBST([SHOBJ_STATUS])
+m4trace:configure.in:1086: -1- AC_SUBST_TRACE([SHOBJ_STATUS])
+m4trace:configure.in:1086: -1- m4_pattern_allow([^SHOBJ_STATUS$])
+m4trace:configure.in:1118: -1- AC_SUBST([PROFILE_FLAGS])
+m4trace:configure.in:1118: -1- AC_SUBST_TRACE([PROFILE_FLAGS])
+m4trace:configure.in:1118: -1- m4_pattern_allow([^PROFILE_FLAGS$])
+m4trace:configure.in:1120: -1- AC_SUBST([incdir])
+m4trace:configure.in:1120: -1- AC_SUBST_TRACE([incdir])
+m4trace:configure.in:1120: -1- m4_pattern_allow([^incdir$])
+m4trace:configure.in:1121: -1- AC_SUBST([BUILD_DIR])
+m4trace:configure.in:1121: -1- AC_SUBST_TRACE([BUILD_DIR])
+m4trace:configure.in:1121: -1- m4_pattern_allow([^BUILD_DIR$])
+m4trace:configure.in:1124: -1- AC_SUBST([datarootdir])
+m4trace:configure.in:1124: -1- AC_SUBST_TRACE([datarootdir])
+m4trace:configure.in:1124: -1- m4_pattern_allow([^datarootdir$])
+m4trace:configure.in:1125: -1- AC_SUBST([localedir])
+m4trace:configure.in:1125: -1- AC_SUBST_TRACE([localedir])
+m4trace:configure.in:1125: -1- m4_pattern_allow([^localedir$])
+m4trace:configure.in:1127: -1- AC_SUBST([YACC])
+m4trace:configure.in:1127: -1- AC_SUBST_TRACE([YACC])
+m4trace:configure.in:1127: -1- m4_pattern_allow([^YACC$])
+m4trace:configure.in:1128: -1- AC_SUBST([AR])
+m4trace:configure.in:1128: -1- AC_SUBST_TRACE([AR])
+m4trace:configure.in:1128: -1- m4_pattern_allow([^AR$])
+m4trace:configure.in:1129: -1- AC_SUBST([ARFLAGS])
+m4trace:configure.in:1129: -1- AC_SUBST_TRACE([ARFLAGS])
+m4trace:configure.in:1129: -1- m4_pattern_allow([^ARFLAGS$])
+m4trace:configure.in:1131: -1- AC_SUBST([BASHVERS])
+m4trace:configure.in:1131: -1- AC_SUBST_TRACE([BASHVERS])
+m4trace:configure.in:1131: -1- m4_pattern_allow([^BASHVERS$])
+m4trace:configure.in:1132: -1- AC_SUBST([RELSTATUS])
+m4trace:configure.in:1132: -1- AC_SUBST_TRACE([RELSTATUS])
+m4trace:configure.in:1132: -1- m4_pattern_allow([^RELSTATUS$])
+m4trace:configure.in:1133: -1- AC_SUBST([DEBUG])
+m4trace:configure.in:1133: -1- AC_SUBST_TRACE([DEBUG])
+m4trace:configure.in:1133: -1- m4_pattern_allow([^DEBUG$])
+m4trace:configure.in:1134: -1- AC_SUBST([MALLOC_DEBUG])
+m4trace:configure.in:1134: -1- AC_SUBST_TRACE([MALLOC_DEBUG])
+m4trace:configure.in:1134: -1- m4_pattern_allow([^MALLOC_DEBUG$])
+m4trace:configure.in:1136: -1- AC_SUBST([host_cpu])
+m4trace:configure.in:1136: -1- AC_SUBST_TRACE([host_cpu])
+m4trace:configure.in:1136: -1- m4_pattern_allow([^host_cpu$])
+m4trace:configure.in:1137: -1- AC_SUBST([host_vendor])
+m4trace:configure.in:1137: -1- AC_SUBST_TRACE([host_vendor])
+m4trace:configure.in:1137: -1- m4_pattern_allow([^host_vendor$])
+m4trace:configure.in:1138: -1- AC_SUBST([host_os])
+m4trace:configure.in:1138: -1- AC_SUBST_TRACE([host_os])
+m4trace:configure.in:1138: -1- m4_pattern_allow([^host_os$])
+m4trace:configure.in:1140: -1- AC_SUBST([LOCAL_LIBS])
+m4trace:configure.in:1140: -1- AC_SUBST_TRACE([LOCAL_LIBS])
+m4trace:configure.in:1140: -1- m4_pattern_allow([^LOCAL_LIBS$])
+m4trace:configure.in:1141: -1- AC_SUBST([LOCAL_CFLAGS])
+m4trace:configure.in:1141: -1- AC_SUBST_TRACE([LOCAL_CFLAGS])
+m4trace:configure.in:1141: -1- m4_pattern_allow([^LOCAL_CFLAGS$])
+m4trace:configure.in:1142: -1- AC_SUBST([LOCAL_LDFLAGS])
+m4trace:configure.in:1142: -1- AC_SUBST_TRACE([LOCAL_LDFLAGS])
+m4trace:configure.in:1142: -1- m4_pattern_allow([^LOCAL_LDFLAGS$])
+m4trace:configure.in:1143: -1- AC_SUBST([LOCAL_DEFS])
+m4trace:configure.in:1143: -1- AC_SUBST_TRACE([LOCAL_DEFS])
+m4trace:configure.in:1143: -1- m4_pattern_allow([^LOCAL_DEFS$])
+m4trace:configure.in:1148: -1- AC_CONFIG_FILES([Makefile builtins/Makefile lib/readline/Makefile lib/glob/Makefile \
          lib/intl/Makefile \
          lib/malloc/Makefile lib/sh/Makefile lib/termcap/Makefile \
          lib/tilde/Makefile doc/Makefile support/Makefile po/Makefile.in \
          examples/loadables/Makefile examples/loadables/perl/Makefile])
-m4trace:configure.in:1146: -1- _m4_warn([obsolete], [AC_OUTPUT should be used without arguments.
+m4trace:configure.in:1148: -1- _m4_warn([obsolete], [AC_OUTPUT should be used without arguments.
 You should run autoupdate.], [])
-m4trace:configure.in:1146: -1- AC_SUBST([LIB@&t@OBJS], [$ac_libobjs])
-m4trace:configure.in:1146: -1- AC_SUBST_TRACE([LIB@&t@OBJS])
-m4trace:configure.in:1146: -1- m4_pattern_allow([^LIB@&t@OBJS$])
-m4trace:configure.in:1146: -1- AC_SUBST([LTLIBOBJS], [$ac_ltlibobjs])
-m4trace:configure.in:1146: -1- AC_SUBST_TRACE([LTLIBOBJS])
-m4trace:configure.in:1146: -1- m4_pattern_allow([^LTLIBOBJS$])
-m4trace:configure.in:1146: -1- AC_SUBST_TRACE([top_builddir])
-m4trace:configure.in:1146: -1- AC_SUBST_TRACE([top_build_prefix])
-m4trace:configure.in:1146: -1- AC_SUBST_TRACE([srcdir])
-m4trace:configure.in:1146: -1- AC_SUBST_TRACE([abs_srcdir])
-m4trace:configure.in:1146: -1- AC_SUBST_TRACE([top_srcdir])
-m4trace:configure.in:1146: -1- AC_SUBST_TRACE([abs_top_srcdir])
-m4trace:configure.in:1146: -1- AC_SUBST_TRACE([builddir])
-m4trace:configure.in:1146: -1- AC_SUBST_TRACE([abs_builddir])
-m4trace:configure.in:1146: -1- AC_SUBST_TRACE([abs_top_builddir])
-m4trace:configure.in:1146: -1- AC_SUBST_TRACE([INSTALL])
+m4trace:configure.in:1148: -1- AC_SUBST([LIB@&t@OBJS], [$ac_libobjs])
+m4trace:configure.in:1148: -1- AC_SUBST_TRACE([LIB@&t@OBJS])
+m4trace:configure.in:1148: -1- m4_pattern_allow([^LIB@&t@OBJS$])
+m4trace:configure.in:1148: -1- AC_SUBST([LTLIBOBJS], [$ac_ltlibobjs])
+m4trace:configure.in:1148: -1- AC_SUBST_TRACE([LTLIBOBJS])
+m4trace:configure.in:1148: -1- m4_pattern_allow([^LTLIBOBJS$])
+m4trace:configure.in:1148: -1- AC_SUBST_TRACE([top_builddir])
+m4trace:configure.in:1148: -1- AC_SUBST_TRACE([top_build_prefix])
+m4trace:configure.in:1148: -1- AC_SUBST_TRACE([srcdir])
+m4trace:configure.in:1148: -1- AC_SUBST_TRACE([abs_srcdir])
+m4trace:configure.in:1148: -1- AC_SUBST_TRACE([top_srcdir])
+m4trace:configure.in:1148: -1- AC_SUBST_TRACE([abs_top_srcdir])
+m4trace:configure.in:1148: -1- AC_SUBST_TRACE([builddir])
+m4trace:configure.in:1148: -1- AC_SUBST_TRACE([abs_builddir])
+m4trace:configure.in:1148: -1- AC_SUBST_TRACE([abs_top_builddir])
+m4trace:configure.in:1148: -1- AC_SUBST_TRACE([INSTALL])
index a19403057deea3bf6a455fb5664ebd9daa1bd919..47bc4bfeb8dcf6242ba2e8f3370e99725ef948a8 100644 (file)
@@ -139,7 +139,7 @@ extern char **get_shopt_options __P((void));
 extern int shopt_setopt __P((char *, int));
 extern int shopt_listopt __P((char *, int));
 
-extern int set_login_shell __P((int));
+extern int set_login_shell __P((char *, int));
 
 extern void set_bashopts __P((void));
 extern void parse_bashopts __P((char *));
index 4a9f68ad44add188996c551255fe08ddbbfb3eaa..e4476334136969bea02af27c11371d1b815501f0 100644 (file)
@@ -167,11 +167,11 @@ extern int errno;
 #define SKIP1 "#'-+ 0"
 #define LENMODS "hjlLtz"
 
-#ifndef HAVE_ASPRINTF
+#if !HAVE_ASPRINTF
 extern int asprintf __P((char **, const char *, ...)) __attribute__((__format__ (printf, 2, 3)));
 #endif
 
-#ifndef HAVE_VSNPRINTF
+#if !HAVE_VSNPRINTF
 extern int vsnprintf __P((char *, size_t, const char *, ...)) __attribute__((__format__ (printf, 3, 4)));
 #endif
 
index 236b401bd640e4f14a11a688b64051d65a956a1f..4a9f68ad44add188996c551255fe08ddbbfb3eaa 100644 (file)
@@ -156,6 +156,7 @@ extern int errno;
       fflush (stdout); \
       if (ferror (stdout)) \
        { \
+         sh_wrerror (); \
          clearerr (stdout); \
          return (EXECUTION_FAILURE); \
        } \
@@ -235,7 +236,12 @@ printf_builtin (list)
       switch (ch)
        {
        case 'v':
-         if (legal_identifier (vname = list_optarg))
+         vname = list_optarg;
+#if defined (ARRAY_VARS)
+         if (legal_identifier (vname) || valid_array_reference (vname))
+#else
+         if (legal_identifier (vname))
+#endif
            {
              vflag = 1;
              vblen = 0;
@@ -998,7 +1004,9 @@ getintmax ()
         shall continue processing any remaining operands and shall write the
          value accumulated at the time the error was detected to standard
         output.''  Yecch. */
-      ret = 0;
+#if 0
+      ret = 0;         /* return partially-converted value from strtoimax */
+#endif
       conversion_error = 1;
     }
   else if (errno == ERANGE)
index 71a2b6e2483922ae0735ed3dd7e75a104d64916d..38e5070b25927c6130810880dbb21395d001aee6 100644 (file)
@@ -114,10 +114,10 @@ static void shopt_error __P((char *));
 
 static int set_shellopts_after_change __P((int));
 
-static int set_compatibility_level __P((int));
+static int set_compatibility_level __P((char *, int));
 
 #if defined (RESTRICTED_SHELL)
-static int set_restricted_shell __P((int));
+static int set_restricted_shell __P((char *, int));
 #endif
 
 static int shopt_login_shell;
@@ -125,7 +125,7 @@ static int shopt_compat31;
 static int shopt_compat32;
 static int shopt_compat40;
 
-typedef int shopt_set_func_t __P((int));
+typedef int shopt_set_func_t __P((char *, int));
 
 static struct {
   char *name;
@@ -346,7 +346,7 @@ toggle_shopts (mode, list, quiet)
        {
          *shopt_vars[ind].value = mode;        /* 1 for set, 0 for unset */
          if (shopt_vars[ind].set_func)
-           (*shopt_vars[ind].set_func) (mode);
+           (*shopt_vars[ind].set_func) (shopt_vars[ind].name, mode);
        }
     }
 
@@ -495,10 +495,22 @@ set_shellopts_after_change (mode)
 }
 
 static int
-set_compatibility_level (mode)
+set_compatibility_level (option_name, mode)
+     char *option_name;
      int mode;
 {
   /* Need to change logic here as we add more compatibility levels */
+
+  /* First, check option_name so we can turn off other compat options when
+     one is set. */
+  if (mode && option_name[6] == '3' && option_name[7] == '1')
+    shopt_compat32 = shopt_compat40 = 0;
+  else if (mode && option_name[6] == '3' && option_name[7] == '2')
+    shopt_compat31 = shopt_compat40 = 0;
+  else if (mode && option_name[6] == '4' && option_name[7] == '0')
+    shopt_compat31 = shopt_compat32 = 0;
+
+  /* Then set shell_compatibility_level based on what remains */
   if (shopt_compat31)
     shell_compatibility_level = 31;
   else if (shopt_compat32)
@@ -514,7 +526,8 @@ set_compatibility_level (mode)
 /* Don't allow the value of restricted_shell to be modified. */
 
 static int
-set_restricted_shell (mode)
+set_restricted_shell (option_name, mode)
+     char *option_name;
      int mode;
 {
   static int save_restricted = -1;
@@ -529,7 +542,8 @@ set_restricted_shell (mode)
 
 /* Not static so shell.c can call it to initialize shopt_login_shell */
 int
-set_login_shell (mode)
+set_login_shell (option_name, mode)
+     char *option_name;
      int mode;
 {
   shopt_login_shell = login_shell != 0;
index f0551275399affa48425d8e574f030cac1213605..5265a050b02258431b4c4bf955f5d0d3bb8c5b1a 100644 (file)
 #  define SYSLOG_FACILITY LOG_USER
 #  define SYSLOG_LEVEL LOG_INFO
 #endif
+
+/* Define if you want to include code in shell.c to support wordexp(3) */
+/* #define WORDEXP_OPTION */
index cca8f3f9d6b4780b64176632c29f25f6c1f7bab0..4e63c49418403dfff5c784f227a3faa1ba905aec 100755 (executable)
--- a/configure
+++ b/configure
@@ -1,7 +1,7 @@
 #! /bin/sh
-# From configure.in for Bash 4.1, version 4.016.
+# From configure.in for Bash 4.1, version 4.018.
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.63 for bash 4.1-beta.
+# Generated by GNU Autoconf 2.63 for bash 4.1-rc.
 #
 # Report bugs to <bug-bash@gnu.org>.
 #
@@ -597,8 +597,8 @@ SHELL=${CONFIG_SHELL-/bin/sh}
 # Identity of this package.
 PACKAGE_NAME='bash'
 PACKAGE_TARNAME='bash'
-PACKAGE_VERSION='4.1-beta'
-PACKAGE_STRING='bash 4.1-beta'
+PACKAGE_VERSION='4.1-rc'
+PACKAGE_STRING='bash 4.1-rc'
 PACKAGE_BUGREPORT='bug-bash@gnu.org'
 
 ac_unique_file="shell.h"
@@ -1411,7 +1411,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures bash 4.1-beta to adapt to many kinds of systems.
+\`configure' configures bash 4.1-rc to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1476,7 +1476,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of bash 4.1-beta:";;
+     short | recursive ) echo "Configuration of bash 4.1-rc:";;
    esac
   cat <<\_ACEOF
 
@@ -1652,7 +1652,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-bash configure 4.1-beta
+bash configure 4.1-rc
 generated by GNU Autoconf 2.63
 
 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1666,7 +1666,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by bash $as_me 4.1-beta, which was
+It was created by bash $as_me 4.1-rc, which was
 generated by GNU Autoconf 2.63.  Invocation command line was
 
   $ $0 $@
@@ -1948,6 +1948,8 @@ ac_header_list="$ac_header_list unistd.h"
 ac_func_list="$ac_func_list alarm"
 ac_func_list="$ac_func_list fpurge"
 ac_func_list="$ac_func_list __fpurge"
+ac_func_list="$ac_func_list snprintf"
+ac_func_list="$ac_func_list vsnprintf"
 # Check that the precious variables saved in the cache have kept the same
 # value.
 ac_cache_corrupted=false
@@ -2078,7 +2080,7 @@ ac_config_headers="$ac_config_headers config.h"
 
 
 BASHVERS=4.1
-RELSTATUS=beta
+RELSTATUS=rc
 
 case "$RELSTATUS" in
 alp*|bet*|dev*|rc*|maint*)     DEBUG='-DDEBUG' MALLOC_DEBUG='-DMALLOC_DEBUG' ;;
@@ -13681,9 +13683,7 @@ done
 
 
 
-
-
-for ac_func in vsnprintf snprintf vasprintf asprintf
+for ac_func in vasprintf asprintf
 do
 as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
 { $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
 
 
 
+
+
+
+
+
+
+
+  if test X$ac_cv_func_snprintf = Xyes; then
+    { $as_echo "$as_me:$LINENO: checking for standard-conformant snprintf" >&5
+$as_echo_n "checking for standard-conformant snprintf... " >&6; }
+if test "${bash_cv_func_snprintf+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  if test "$cross_compiling" = yes; then
+  { $as_echo "$as_me:$LINENO: WARNING: cannot check standard snprintf if cross-compiling" >&5
+$as_echo "$as_me: WARNING: cannot check standard snprintf if cross-compiling" >&2;}
+    bash_cv_func_snprintf=yes
+
+else
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+
+#include <stdio.h>
+
+main()
+{
+  int n;
+  n = snprintf (0, 0, "%s", "0123456");
+  exit(n != 7);
+}
+
+_ACEOF
+rm -f conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_link") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_try") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  bash_cv_func_snprintf=yes
+else
+  $as_echo "$as_me: program exited with status $ac_status" >&5
+$as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+( exit $ac_status )
+bash_cv_func_snprintf=no
+fi
+rm -rf conftest.dSYM
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+fi
+
+
+fi
+{ $as_echo "$as_me:$LINENO: result: $bash_cv_func_snprintf" >&5
+$as_echo "$bash_cv_func_snprintf" >&6; }
+    if test $bash_cv_func_snprintf = no; then
+      ac_cv_func_snprintf=no
+    fi
+  fi
+  if test $ac_cv_func_snprintf = no; then
+
+cat >>confdefs.h <<\_ACEOF
+#define HAVE_SNPRINTF 0
+_ACEOF
+
+  fi
+
+
+
+
+
+
+
+
+
+
+  if test X$ac_cv_func_vsnprintf = Xyes; then
+    { $as_echo "$as_me:$LINENO: checking for standard-conformant vsnprintf" >&5
+$as_echo_n "checking for standard-conformant vsnprintf... " >&6; }
+if test "${bash_cv_func_vsnprintf+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  if test "$cross_compiling" = yes; then
+  { $as_echo "$as_me:$LINENO: WARNING: cannot check standard vsnprintf if cross-compiling" >&5
+$as_echo "$as_me: WARNING: cannot check standard vsnprintf if cross-compiling" >&2;}
+    bash_cv_func_vsnprintf=yes
+
+else
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+
+#if HAVE_STDARG_H
+#include <stdarg.h>
+#else
+#include <varargs.h>
+#endif
+#include <stdio.h>
+#include <stdlib.h>
+
+static int
+#if HAVE_STDARG_H
+foo(const char *fmt, ...)
+#else
+foo(format, va_alist)
+     const char *format;
+     va_dcl
+#endif
+{
+  va_list args;
+  int n;
+
+#if HAVE_STDARG_H
+  va_start(args, fmt);
+#else
+  va_start(args);
+#endif
+  n = vsnprintf(0, 0, fmt, args);
+  va_end (args);
+  return n;
+}
+
+main()
+{
+  int n;
+  n = foo("%s", "0123456");
+  exit(n != 7);
+}
+
+_ACEOF
+rm -f conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_link") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_try") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  bash_cv_func_vsnprintf=yes
+else
+  $as_echo "$as_me: program exited with status $ac_status" >&5
+$as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+( exit $ac_status )
+bash_cv_func_vsnprintf=no
+fi
+rm -rf conftest.dSYM
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+fi
+
+
+fi
+{ $as_echo "$as_me:$LINENO: result: $bash_cv_func_vsnprintf" >&5
+$as_echo "$bash_cv_func_vsnprintf" >&6; }
+    if test $bash_cv_func_vsnprintf = no; then
+      ac_cv_func_vsnprintf=no
+    fi
+  fi
+  if test $ac_cv_func_vsnprintf = no; then
+
+cat >>confdefs.h <<\_ACEOF
+#define HAVE_VSNPRINTF 0
+_ACEOF
+
+  fi
+
+
+
 if test "$ac_cv_func_putenv" = "yes"; then
 
 
@@ -30964,7 +31170,7 @@ exec 6>&1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by bash $as_me 4.1-beta, which was
+This file was extended by bash $as_me 4.1-rc, which was
 generated by GNU Autoconf 2.63.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -31027,7 +31233,7 @@ Report bugs to <bug-autoconf@gnu.org>."
 _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_version="\\
-bash config.status 4.1-beta
+bash config.status 4.1-rc
 configured by $0, generated by GNU Autoconf 2.63,
   with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
 
index 65864107bd25e789e315ad2fa02d3b99444ae095..598544e753ba950e7e2fd9d71915a2abd512ae5c 100644 (file)
@@ -21,10 +21,10 @@ dnl Process this file with autoconf to produce a configure script.
 #   You should have received a copy of the GNU General Public License
 #   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-AC_REVISION([for Bash 4.1, version 4.016])dnl
+AC_REVISION([for Bash 4.1, version 4.018])dnl
 
 define(bashvers, 4.1)
-define(relstatus, beta)
+define(relstatus, rc)
 
 AC_INIT([bash], bashvers-relstatus, [bug-bash@gnu.org])
 
@@ -507,8 +507,8 @@ then
        case "$ac_cv_rl_version" in
        5*|6*|7*|8*|9*) ;;
        *)      opt_with_installed_readline=no 
-               AC_MSG_WARN(installed readline library is too old to be linked with bash)
-               AC_MSG_WARN(using private bash version)
+               AC_MSG_WARN([installed readline library is too old to be linked with bash])
+               AC_MSG_WARN([using private bash version])
                ;;
        esac
 fi
@@ -733,7 +733,7 @@ AC_CHECK_FUNCS(bcopy bzero confstr fnmatch \
                setenv setlinebuf setlocale setvbuf siginterrupt strchr \
                sysconf syslog tcgetattr times ttyname tzset unsetenv)
 
-AC_CHECK_FUNCS(vsnprintf snprintf vasprintf asprintf)
+AC_CHECK_FUNCS(vasprintf asprintf)
 AC_CHECK_FUNCS(isascii isblank isgraph isprint isspace isxdigit)
 AC_CHECK_FUNCS(getpwent getpwnam getpwuid)
 AC_REPLACE_FUNCS(getcwd memset)
@@ -928,6 +928,8 @@ BASH_FUNC_GETCWD
 fi
 BASH_FUNC_POSIX_SETJMP
 BASH_FUNC_STRCOLL
+BASH_FUNC_SNPRINTF
+BASH_FUNC_VSNPRINTF
 
 dnl If putenv or unsetenv is not present, set the right define so the
 dnl prototype and declaration in lib/sh/getenv.c will be standard-conformant
index d0ce865e42a0dc5f324255f89eb9f5fa26aed55d..af582d0fa8e80b9ec3c44c6fe02275e7e6037d3f 100644 (file)
@@ -1,5 +1,5 @@
 dnl
-dnl Configure script for bash-4.0
+dnl Configure script for bash-4.1
 dnl
 dnl report bugs to chet@po.cwru.edu
 dnl
@@ -21,10 +21,10 @@ dnl Process this file with autoconf to produce a configure script.
 #   You should have received a copy of the GNU General Public License
 #   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-AC_REVISION([for Bash 4.0, version 4.014])dnl
+AC_REVISION([for Bash 4.1, version 4.016])dnl
 
-define(bashvers, 4.0)
-define(relstatus, maint)
+define(bashvers, 4.1)
+define(relstatus, beta)
 
 AC_INIT([bash], bashvers-relstatus, [bug-bash@gnu.org])
 
@@ -507,8 +507,8 @@ then
        case "$ac_cv_rl_version" in
        5*|6*|7*|8*|9*) ;;
        *)      opt_with_installed_readline=no 
-               AC_MSG_WARN(installed readline library is too old to be linked with bash)
-               AC_MSG_WARN(using private bash version)
+               AC_MSG_WARN([installed readline library is too old to be linked with bash])
+               AC_MSG_WARN([using private bash version])
                ;;
        esac
 fi
@@ -733,7 +733,7 @@ AC_CHECK_FUNCS(bcopy bzero confstr fnmatch \
                setenv setlinebuf setlocale setvbuf siginterrupt strchr \
                sysconf syslog tcgetattr times ttyname tzset unsetenv)
 
-AC_CHECK_FUNCS(vsnprintf snprintf vasprintf asprintf)
+AC_CHECK_FUNCS(vasprintf asprintf)
 AC_CHECK_FUNCS(isascii isblank isgraph isprint isspace isxdigit)
 AC_CHECK_FUNCS(getpwent getpwnam getpwuid)
 AC_REPLACE_FUNCS(getcwd memset)
@@ -928,6 +928,8 @@ BASH_FUNC_GETCWD
 fi
 BASH_FUNC_POSIX_SETJMP
 BASH_FUNC_STRCOLL
+BASH_FUNC_SNPRINTF
+BASH_FUNC_VSNPRINTF
 
 dnl If putenv or unsetenv is not present, set the right define so the
 dnl prototype and declaration in lib/sh/getenv.c will be standard-conformant
index f124704d95e452c97773a2728b7deee593c9dde1..f420b7af1d9fb3e25df6f778730b0995e1feb92a 100644 (file)
@@ -8635,6 +8635,19 @@ If set,
 changes its behavior to that of version 3.1 with respect to quoted
 arguments to the conditional command's =~ operator.
 .TP 8
+.B compat32
+If set,
+.B bash
+changes its behavior to that of version 3.2 with respect to locale-specific
+string comparison when using the conditional command's < and > operators.
+.TP 8
+.B compat40
+If set,
+.B bash
+changes its behavior to that of version 4.0 with respect to locale-specific
+string comparison when using the conditional command's < and > operators
+and the effect of interrupting a command list.
+.TP 8
 .B dirspell
 If set,
 .B bash
index 939e2fe7ccced3a9a076c928b5cabc460404714e..6fdcb6f3379acf35b5ba60e17fed1ac342cc0200 100644 (file)
@@ -3208,11 +3208,17 @@ static int
 execute_cond_node (cond)
      COND_COM *cond;
 {
-  int result, invert, patmatch, rmatch, mflags;
+  int result, invert, patmatch, rmatch, mflags, ignore;
   char *arg1, *arg2;
 
   invert = (cond->flags & CMD_INVERT_RETURN);
-
+  ignore = (cond->flags & CMD_IGNORE_RETURN);
+  if (ignore)
+    {
+      cond->left->flags |= CMD_IGNORE_RETURN;
+      cond->right->flags |= CMD_IGNORE_RETURN;
+    }
+      
   if (cond->type == COND_EXPR)
     result = execute_cond_node (cond->left);
   else if (cond->type == COND_OR)
@@ -3229,7 +3235,11 @@ execute_cond_node (cond)
     }
   else if (cond->type == COND_UNARY)
     {
+      if (ignore)
+       comsub_ignore_return++;
       arg1 = cond_expand_word (cond->left->op, 0);
+      if (ignore)
+       comsub_ignore_return--;
       if (arg1 == 0)
        arg1 = nullstr;
       if (echo_command_at_execute)
@@ -3249,11 +3259,19 @@ execute_cond_node (cond)
                cond->op->word[2] == '\0');
 #endif
 
+      if (ignore)
+       comsub_ignore_return++;
       arg1 = cond_expand_word (cond->left->op, 0);
+      if (ignore)
+       comsub_ignore_return--;
       if (arg1 == 0)
        arg1 = nullstr;
+      if (ignore)
+       comsub_ignore_return++;
       arg2 = cond_expand_word (cond->right->op,
                               (rmatch && shell_compatibility_level > 31) ? 2 : (patmatch ? 1 : 0));
+      if (ignore)
+       comsub_ignore_return--;
       if (arg2 == 0)
        arg2 = nullstr;
 
index f65b56d3c72f969d2da535e0bd8dd78ec65f2d21..97c6932f265f921c865c0d62853ea7d9ea0562aa 100644 (file)
@@ -1461,9 +1461,6 @@ execute_in_subshell (command, asynchronous, pipe_in, pipe_out, fds_to_close)
   if (return_catch_flag)
     function_value = setjmp (return_catch);
 
-if (result)
-  itrace("execute_in_subshell: longjmp to top_level, result = %d last_command_exit_value = %d", result, last_command_exit_value);
-
   /* If we're going to exit the shell, we don't want to invert the return
      status. */
   if (result == EXITPROG)
@@ -3211,10 +3208,11 @@ static int
 execute_cond_node (cond)
      COND_COM *cond;
 {
-  int result, invert, patmatch, rmatch, mflags;
+  int result, invert, patmatch, rmatch, mflags, ignore;
   char *arg1, *arg2;
 
   invert = (cond->flags & CMD_INVERT_RETURN);
+  ignore = (cond->flags & CMD_IGNORE_RETURN);
 
   if (cond->type == COND_EXPR)
     result = execute_cond_node (cond->left);
@@ -3232,7 +3230,11 @@ execute_cond_node (cond)
     }
   else if (cond->type == COND_UNARY)
     {
+      if (ignore)
+       comsub_ignore_return++;
       arg1 = cond_expand_word (cond->left->op, 0);
+      if (ignore)
+       comsub_ignore_return--;
       if (arg1 == 0)
        arg1 = nullstr;
       if (echo_command_at_execute)
@@ -3252,11 +3254,19 @@ execute_cond_node (cond)
                cond->op->word[2] == '\0');
 #endif
 
+      if (ignore)
+       comsub_ignore_return++;
       arg1 = cond_expand_word (cond->left->op, 0);
+      if (ignore)
+       comsub_ignore_return--;
       if (arg1 == 0)
        arg1 = nullstr;
+      if (ignore)
+       comsub_ignore_return++;
       arg2 = cond_expand_word (cond->right->op,
                               (rmatch && shell_compatibility_level > 31) ? 2 : (patmatch ? 1 : 0));
+      if (ignore)
+       comsub_ignore_return--;
       if (arg2 == 0)
        arg2 = nullstr;
 
diff --git a/jobs.c b/jobs.c
index 7d20b1bd3fd25cae8098209ba5b716b7ab4d28eb..6958b3a4a014483408f943bd8547c94417e13c1e 100644 (file)
--- a/jobs.c
+++ b/jobs.c
@@ -701,8 +701,7 @@ bgp_delete (pid)
   for (prev = p = bgpids.list; p; prev = p, p = p->next)
     if (p->pid == pid)
       {
-       if (p != prev)
-         prev->next = p->next; /* remove from list */
+       prev->next = p->next;   /* remove from list */
        break;
       }
 
index 6636831131cf22201227f7c993099905a6745f8c..c77618f6b7c0565421317aad1544857a25f4a881 100644 (file)
@@ -1030,7 +1030,7 @@ glob_filename (pathname, flags)
          dflags |= GX_ALLDIRS|GX_ADDCURDIR;
 #if 0
          /* If we want all directories (dflags & GX_ALLDIRS) and we're not
-            being called recursively as something like `echo **/*.o'
+            being called recursively as something like `echo [star][star]/[star].o'
             ((flags & GX_ALLDIRS) == 0), we want to prevent glob_vector from
             adding a null directory name to the front of the temp_results
             array.  We turn off ADDCURDIR if not called recursively and
index 61f9103586c985aa3b23fdf02b2fed3679d019c0..0dd5d104a68383b21552fff3ed195d3e1af6c019 100644 (file)
@@ -517,7 +517,9 @@ prepare_terminal_settings (meta_flag, oldtio, tiop)
      TIOTYPE oldtio, *tiop;
 {
   _rl_echoing_p = (oldtio.c_lflag & ECHO);
+#if defined (ECHOCTL)
   _rl_echoctl = (oldtio.c_lflag & ECHOCTL);
+#endif
 
   tiop->c_lflag &= ~(ICANON | ECHO);
 
index d5fea474753af2305e8a86001ec3a851a849697c..c50d67403f1411ed71c17c3c0ef0ccdbdb0847eb 100644 (file)
@@ -65,6 +65,9 @@
 #if defined(DEBUG) && !defined (MACOSX)
 #  undef HAVE_SNPRINTF
 #  undef HAVE_ASPRINTF
+
+#  define HAVE_SNPRINTF 0
+#  define HAVE_ASPRINTF 0
 #endif
 
 #if defined(DRIVER) && !defined(HAVE_CONFIG_H)
@@ -83,7 +86,7 @@
 #define intmax_t long
 #endif
 
-#if !defined (HAVE_SNPRINTF) || !defined (HAVE_ASPRINTF)
+#if !HAVE_SNPRINTF || !HAVE_ASPRINTF
 
 #include <bashtypes.h>
 
@@ -1641,7 +1644,7 @@ dfallback (data, fs, fe, d)
 }
 #endif /* FLOATING_POINT */
 
-#ifndef HAVE_SNPRINTF
+#if !HAVE_SNPRINTF
 
 int
 #if defined (__STDC__)
@@ -1691,7 +1694,7 @@ snprintf(string, length, format, va_alist)
 
 #endif /* HAVE_SNPRINTF */
 
-#ifndef HAVE_ASPRINTF
+#if !HAVE_ASPRINTF
 
 int
 #if defined (__STDC__)
@@ -1736,9 +1739,9 @@ asprintf(stringp, format, va_alist)
   return rval;
 }
 
-#endif
+#endif /* !HAVE_ASPRINTF */
 
-#endif
+#endif /* !HAVE_SNPRINTF || !HAVE_ASPRINTF */
 
 #ifdef DRIVER
 
index 37b31a164737032a790e957f3b9ead6d54ddc797..868d87a18f0a3eb7860c1260645f3c73cbd357ef 100644 (file)
 #endif
 
 /* GCC 4.2 on Snow Leopard doesn't like the snprintf prototype */
-#if defined(DEBUG) /* && !defined (MACOSX) */
+#if defined(DEBUG) && !defined (MACOSX)
 #  undef HAVE_SNPRINTF
 #  undef HAVE_ASPRINTF
+
+#  define HAVE_SNPRINTF 0
+#  define HAVE_ASPRINTF 0
 #endif
 
 #if defined(DRIVER) && !defined(HAVE_CONFIG_H)
@@ -83,7 +86,7 @@
 #define intmax_t long
 #endif
 
-#if !defined (HAVE_SNPRINTF) || !defined (HAVE_ASPRINTF)
+#if !HAVE_SNPRINTF || !HAVE_ASPRINTF
 
 #include <bashtypes.h>
 
@@ -1641,7 +1644,7 @@ dfallback (data, fs, fe, d)
 }
 #endif /* FLOATING_POINT */
 
-#ifndef HAVE_SNPRINTF
+#if !HAVE_SNPRINTF
 
 int
 #if defined (__STDC__)
@@ -1691,7 +1694,7 @@ snprintf(string, length, format, va_alist)
 
 #endif /* HAVE_SNPRINTF */
 
-#ifndef HAVE_ASPRINTF
+#if !HAVE_ASPRINTF
 
 int
 #if defined (__STDC__)
@@ -1736,8 +1739,13 @@ asprintf(stringp, format, va_alist)
   return rval;
 }
 
-#endif
+#endif /* HAVE_ASPRINTF */
 
+static void
+fake_snprintf_asprintf_symbol()
+{
+       ;
+}
 #endif
 
 #ifdef DRIVER
diff --git a/shell.c b/shell.c
index 87feb14290e4b6a59f0eee12f466a6b82ce9fd31..8dadb0b4468ec437b88afc7b68063ebc9b5681d8 100644 (file)
--- a/shell.c
+++ b/shell.c
@@ -256,7 +256,9 @@ static const struct {
 #endif
   { "verbose", Int, &echo_input_at_read, (char **)0x0 },
   { "version", Int, &do_version, (char **)0x0 },
+#if defined (WORDEXP_OPTION)
   { "wordexp", Int, &wordexp_only, (char **)0x0 },
+#endif
   { (char *)0x0, Int, (int *)0x0, (char **)0x0 }
 };
 
@@ -304,7 +306,9 @@ static void run_startup_files __P((void));
 static int open_shell_script __P((char *));
 static void set_bash_input __P((void));
 static int run_one_command __P((char *));
+#if defined (WORDEXP_OPTION)
 static int run_wordexp __P((char *));
+#endif
 
 static int uidget __P((void));
 
@@ -473,7 +477,7 @@ main (argc, argv, env)
       login_shell = -login_shell;
     }
 
-  set_login_shell (login_shell != 0);
+  set_login_shell ("login_shell", login_shell != 0);
 
   if (dump_po_strings)
     dump_translatable_strings = 1;
@@ -662,12 +666,14 @@ main (argc, argv, env)
     maybe_make_restricted (shell_name);
 #endif /* RESTRICTED_SHELL */
 
+#if defined (WORDEXP_OPTION)
   if (wordexp_only)
     {
       startup_state = 3;
       last_command_exit_value = run_wordexp (argv[arg_index]);
       exit_shell (last_command_exit_value);
     }
+#endif
 
   if (command_execution_string)
     {
@@ -1202,6 +1208,7 @@ disable_priv_mode ()
   current_user.egid = current_user.gid;
 }
 
+#if defined (WORDEXP_OPTION)
 static int
 run_wordexp (words)
      char *words;
@@ -1273,6 +1280,7 @@ run_wordexp (words)
 
   return (0);
 }
+#endif
 
 #if defined (ONESHOT)
 /* Run one command, given as the argument to the -c option.  Tell
index 8659ca360dbec654d7c05b4312323ef82a850669..d07267e1ee163bcb3398dd20ade378ba2cd78516 100644 (file)
@@ -807,6 +807,9 @@ case $basic_machine in
        np1)
                basic_machine=np1-gould
                ;;
+       nse-tandem)
+               basic_machine=nse-tandem
+               ;;
        nsr-tandem)
                basic_machine=nsr-tandem
                ;;
diff --git a/support/config.sub~ b/support/config.sub~
new file mode 100644 (file)
index 0000000..8659ca3
--- /dev/null
@@ -0,0 +1,1662 @@
+#! /bin/sh
+# Configuration validation subroutine script.
+#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
+#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 20098
+#   Free Software Foundation, Inc.
+
+timestamp='2008-03-26'
+
+# This file is (in principle) common to ALL GNU software.
+# The presence of a machine in this file suggests that SOME GNU software
+# can handle that machine.  It does not imply ALL GNU software can.
+#
+# This file is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
+# 02110-1301, USA.
+#
+# As a special exception to the GNU General Public License, if you
+# distribute this file as part of a program that contains a
+# configuration script generated by Autoconf, you may include it under
+# the same distribution terms that you use for the rest of that program.
+
+
+# Please send patches to <config-patches@gnu.org>.  Submit a context
+# diff and a properly formatted ChangeLog entry.
+#
+# Configuration subroutine to validate and canonicalize a configuration type.
+# Supply the specified configuration type as an argument.
+# If it is invalid, we print an error message on stderr and exit with code 1.
+# Otherwise, we print the canonical config type on stdout and succeed.
+
+# This file is supposed to be the same for all GNU packages
+# and recognize all the CPU types, system types and aliases
+# that are meaningful with *any* GNU software.
+# Each package is responsible for reporting which valid configurations
+# it does not support.  The user should be able to distinguish
+# a failure to support a valid configuration from a meaningless
+# configuration.
+
+# The goal of this file is to map all the various variations of a given
+# machine specification into a single specification in the form:
+#      CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM
+# or in some cases, the newer four-part form:
+#      CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM
+# It is wrong to echo any other type of specification.
+
+me=`echo "$0" | sed -e 's,.*/,,'`
+
+usage="\
+Usage: $0 [OPTION] CPU-MFR-OPSYS
+       $0 [OPTION] ALIAS
+
+Canonicalize a configuration name.
+
+Operation modes:
+  -h, --help         print this help, then exit
+  -t, --time-stamp   print date of last modification, then exit
+  -v, --version      print version number, then exit
+
+Report bugs and patches to <config-patches@gnu.org>."
+
+version="\
+GNU config.sub ($timestamp)
+
+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
+2002, 2003, 2004, 2005, 2006, 2007, 2008,2009 Free Software Foundation, Inc.
+
+This is free software; see the source for copying conditions.  There is NO
+warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
+
+help="
+Try \`$me --help' for more information."
+
+# Parse command line
+while test $# -gt 0 ; do
+  case $1 in
+    --time-stamp | --time* | -t )
+       echo "$timestamp" ; exit ;;
+    --version | -v )
+       echo "$version" ; exit ;;
+    --help | --h* | -h )
+       echo "$usage"; exit ;;
+    -- )     # Stop option processing
+       shift; break ;;
+    - )        # Use stdin as input.
+       break ;;
+    -* )
+       echo "$me: invalid option $1$help"
+       exit 1 ;;
+
+    *local*)
+       # First pass through any local machine types.
+       echo $1
+       exit ;;
+
+    * )
+       break ;;
+  esac
+done
+
+case $# in
+ 0) echo "$me: missing argument$help" >&2
+    exit 1;;
+ 1) ;;
+ *) echo "$me: too many arguments$help" >&2
+    exit 1;;
+esac
+
+# Separate what the user gave into CPU-COMPANY and OS or KERNEL-OS (if any).
+# Here we must recognize all the valid KERNEL-OS combinations.
+maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
+case $maybe_os in
+  nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \
+  uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | \
+  storm-chaos* | os2-emx* | rtmk-nova*)
+    os=-$maybe_os
+    basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
+    ;;
+  *)
+    basic_machine=`echo $1 | sed 's/-[^-]*$//'`
+    if [ $basic_machine != $1 ]
+    then os=`echo $1 | sed 's/.*-/-/'`
+    else os=; fi
+    ;;
+esac
+
+### Let's recognize common machines as not being operating systems so
+### that things like config.sub decstation-3100 work.  We also
+### recognize some manufacturers as not being operating systems, so we
+### can provide default operating systems below.
+case $os in
+       -sun*os*)
+               # Prevent following clause from handling this invalid input.
+               ;;
+       -dec* | -mips* | -sequent* | -encore* | -pc532* | -sgi* | -sony* | \
+       -att* | -7300* | -3300* | -delta* | -motorola* | -sun[234]* | \
+       -unicom* | -ibm* | -next | -hp | -isi* | -apollo | -altos* | \
+       -convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\
+       -c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \
+       -harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \
+       -apple | -axis | -knuth | -cray)
+               os=
+               basic_machine=$1
+               ;;
+       -sim | -cisco | -oki | -wec | -winbond)
+               os=
+               basic_machine=$1
+               ;;
+       -scout)
+               ;;
+       -wrs)
+               os=-vxworks
+               basic_machine=$1
+               ;;
+       -chorusos*)
+               os=-chorusos
+               basic_machine=$1
+               ;;
+       -chorusrdb)
+               os=-chorusrdb
+               basic_machine=$1
+               ;;
+       -hiux*)
+               os=-hiuxwe2
+               ;;
+       -sco6)
+               os=-sco5v6
+               basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+               ;;
+       -sco5)
+               os=-sco3.2v5
+               basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+               ;;
+       -sco4)
+               os=-sco3.2v4
+               basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+               ;;
+       -sco3.2.[4-9]*)
+               os=`echo $os | sed -e 's/sco3.2./sco3.2v/'`
+               basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+               ;;
+       -sco3.2v[4-9]*)
+               # Don't forget version if it is 3.2v4 or newer.
+               basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+               ;;
+       -sco5v6*)
+               # Don't forget version if it is 3.2v4 or newer.
+               basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+               ;;
+       -sco*)
+               os=-sco3.2v2
+               basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+               ;;
+       -udk*)
+               basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+               ;;
+       -isc)
+               os=-isc2.2
+               basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+               ;;
+       -clix*)
+               basic_machine=clipper-intergraph
+               ;;
+       -isc*)
+               basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+               ;;
+       -lynx*)
+               os=-lynxos
+               ;;
+       -ptx*)
+               basic_machine=`echo $1 | sed -e 's/86-.*/86-sequent/'`
+               ;;
+       -windowsnt*)
+               os=`echo $os | sed -e 's/windowsnt/winnt/'`
+               ;;
+       -psos*)
+               os=-psos
+               ;;
+       -mint | -mint[0-9]*)
+               basic_machine=m68k-atari
+               os=-mint
+               ;;
+esac
+
+# Decode aliases for certain CPU-COMPANY combinations.
+case $basic_machine in
+       # Recognize the basic CPU types without company name.
+       # Some are omitted here because they have special meanings below.
+       1750a | 580 \
+       | a29k \
+       | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
+       | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
+       | am33_2.0 \
+       | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \
+       | bfin \
+       | c4x | clipper \
+       | d10v | d30v | dlx | dsp16xx \
+       | fido | fr30 | frv \
+       | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
+       | i370 | i860 | i960 | ia64 \
+       | ip2k | iq2000 \
+       | m32c | m32r | m32rle | m68000 | m68k | m88k \
+       | maxq | mb | microblaze | mcore | mep | metag \
+       | mips | mipsbe | mipseb | mipsel | mipsle \
+       | mips16 \
+       | mips64 | mips64el \
+       | mips64octeon | mips64octeonel \
+       | mips64orion | mips64orionel \
+       | mips64r5900 | mips64r5900el \
+       | mips64vr | mips64vrel \
+       | mips64vr4100 | mips64vr4100el \
+       | mips64vr4300 | mips64vr4300el \
+       | mips64vr5000 | mips64vr5000el \
+       | mips64vr5900 | mips64vr5900el \
+       | mipsisa32 | mipsisa32el \
+       | mipsisa32r2 | mipsisa32r2el \
+       | mipsisa64 | mipsisa64el \
+       | mipsisa64r2 | mipsisa64r2el \
+       | mipsisa64sb1 | mipsisa64sb1el \
+       | mipsisa64sr71k | mipsisa64sr71kel \
+       | mipstx39 | mipstx39el \
+       | mn10200 | mn10300 \
+       | mt \
+       | msp430 \
+       | nios | nios2 \
+       | ns16k | ns32k \
+       | or32 \
+       | pdp10 | pdp11 | pj | pjl \
+       | powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
+       | pyramid \
+       | score \
+       | sh | sh[1234] | sh[24]a | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
+       | sh64 | sh64le \
+       | sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \
+       | sparcv8 | sparcv9 | sparcv9b | sparcv9v \
+       | spu | strongarm \
+       | tahoe | thumb | tic4x | tic80 | tron \
+       | v850 | v850e \
+       | we32k \
+       | x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \
+       | z8k)
+               basic_machine=$basic_machine-unknown
+               ;;
+       m6811 | m68hc11 | m6812 | m68hc12)
+               # Motorola 68HC11/12.
+               basic_machine=$basic_machine-unknown
+               os=-none
+               ;;
+       m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65 | z8k)
+               ;;
+       ms1)
+               basic_machine=mt-unknown
+               ;;
+
+       # We use `pc' rather than `unknown'
+       # because (1) that's what they normally are, and
+       # (2) the word "unknown" tends to confuse beginning users.
+       i*86 | x86_64)
+         basic_machine=$basic_machine-pc
+         ;;
+       # Object if more than one company name word.
+       *-*-*)
+               echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2
+               exit 1
+               ;;
+       # Recognize the basic CPU types with company name.
+       580-* \
+       | a29k-* \
+       | alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \
+       | alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
+       | alphapca5[67]-* | alpha64pca5[67]-* | arc-* \
+       | arm-*  | armbe-* | armle-* | armeb-* | armv*-* \
+       | avr-* | avr32-* \
+       | bfin-* | bs2000-* \
+       | c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \
+       | clipper-* | craynv-* | cydra-* \
+       | d10v-* | d30v-* | dlx-* \
+       | elxsi-* \
+       | f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \
+       | h8300-* | h8500-* \
+       | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
+       | i*86-* | i860-* | i960-* | ia64-* \
+       | ip2k-* | iq2000-* \
+       | m32c-* | m32r-* | m32rle-* \
+       | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
+       | m88110-* | m88k-* | maxq-* | mcore-* | metag-* \
+       | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
+       | mips16-* \
+       | mips64-* | mips64el-* \
+       | mips64octeon-* | mips64octeonel-* \
+       | mips64orion-* | mips64orionel-* \
+       | mips64r5900-* | mips64r5900el-* \
+       | mips64vr-* | mips64vrel-* \
+       | mips64vr4100-* | mips64vr4100el-* \
+       | mips64vr4300-* | mips64vr4300el-* \
+       | mips64vr5000-* | mips64vr5000el-* \
+       | mips64vr5900-* | mips64vr5900el-* \
+       | mipsisa32-* | mipsisa32el-* \
+       | mipsisa32r2-* | mipsisa32r2el-* \
+       | mipsisa64-* | mipsisa64el-* \
+       | mipsisa64r2-* | mipsisa64r2el-* \
+       | mipsisa64sb1-* | mipsisa64sb1el-* \
+       | mipsisa64sr71k-* | mipsisa64sr71kel-* \
+       | mipstx39-* | mipstx39el-* \
+       | mmix-* \
+       | mt-* \
+       | msp430-* \
+       | nios-* | nios2-* \
+       | none-* | np1-* | ns16k-* | ns32k-* \
+       | orion-* \
+       | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
+       | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
+       | pyramid-* \
+       | romp-* | rs6000-* \
+       | sh-* | sh[1234]-* | sh[24]a-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
+       | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
+       | sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \
+       | sparclite-* \
+       | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \
+       | tahoe-* | thumb-* \
+       | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* | tile-* \
+       | tron-* \
+       | v850-* | v850e-* | vax-* \
+       | we32k-* \
+       | x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \
+       | xstormy16-* | xtensa*-* \
+       | ymp-* \
+       | z8k-*)
+               ;;
+       # Recognize the basic CPU types without company name, with glob match.
+       xtensa*)
+               basic_machine=$basic_machine-unknown
+               ;;
+       # Recognize the various machine names and aliases which stand
+       # for a CPU type and a company and sometimes even an OS.
+       386bsd)
+               basic_machine=i386-unknown
+               os=-bsd
+               ;;
+       3b1 | 7300 | 7300-att | att-7300 | pc7300 | safari | unixpc)
+               basic_machine=m68000-att
+               ;;
+       3b*)
+               basic_machine=we32k-att
+               ;;
+       a29khif)
+               basic_machine=a29k-amd
+               os=-udi
+               ;;
+       abacus)
+               basic_machine=abacus-unknown
+               ;;
+       adobe68k)
+               basic_machine=m68010-adobe
+               os=-scout
+               ;;
+       alliant | fx80)
+               basic_machine=fx80-alliant
+               ;;
+       altos | altos3068)
+               basic_machine=m68k-altos
+               ;;
+       am29k)
+               basic_machine=a29k-none
+               os=-bsd
+               ;;
+       amd64)
+               basic_machine=x86_64-pc
+               ;;
+       amd64-*)
+               basic_machine=x86_64-`echo $basic_machine | sed 's/^[^-]*-//'`
+               ;;
+       amdahl)
+               basic_machine=580-amdahl
+               os=-sysv
+               ;;
+       amiga | amiga-*)
+               basic_machine=m68k-unknown
+               ;;
+       amigaos | amigados)
+               basic_machine=m68k-unknown
+               os=-amigaos
+               ;;
+       amigaunix | amix)
+               basic_machine=m68k-unknown
+               os=-sysv4
+               ;;
+       apollo68)
+               basic_machine=m68k-apollo
+               os=-sysv
+               ;;
+       apollo68bsd)
+               basic_machine=m68k-apollo
+               os=-bsd
+               ;;
+       aux)
+               basic_machine=m68k-apple
+               os=-aux
+               ;;
+       balance)
+               basic_machine=ns32k-sequent
+               os=-dynix
+               ;;
+       blackfin)
+               basic_machine=bfin-unknown
+               os=-linux
+               ;;
+       blackfin-*)
+               basic_machine=bfin-`echo $basic_machine | sed 's/^[^-]*-//'`
+               os=-linux
+               ;;
+       c90)
+               basic_machine=c90-cray
+               os=-unicos
+               ;;
+       convex-c1)
+               basic_machine=c1-convex
+               os=-bsd
+               ;;
+       convex-c2)
+               basic_machine=c2-convex
+               os=-bsd
+               ;;
+       convex-c32)
+               basic_machine=c32-convex
+               os=-bsd
+               ;;
+       convex-c34)
+               basic_machine=c34-convex
+               os=-bsd
+               ;;
+       convex-c38)
+               basic_machine=c38-convex
+               os=-bsd
+               ;;
+       cray | j90)
+               basic_machine=j90-cray
+               os=-unicos
+               ;;
+       craynv)
+               basic_machine=craynv-cray
+               os=-unicosmp
+               ;;
+       cr16)
+               basic_machine=cr16-unknown
+               os=-elf
+               ;;
+       crds | unos)
+               basic_machine=m68k-crds
+               ;;
+       crisv32 | crisv32-* | etraxfs*)
+               basic_machine=crisv32-axis
+               ;;
+       cris | cris-* | etrax*)
+               basic_machine=cris-axis
+               ;;
+       crx)
+               basic_machine=crx-unknown
+               os=-elf
+               ;;
+       da30 | da30-*)
+               basic_machine=m68k-da30
+               ;;
+       decstation | decstation-3100 | pmax | pmax-* | pmin | dec3100 | decstatn)
+               basic_machine=mips-dec
+               ;;
+       decsystem10* | dec10*)
+               basic_machine=pdp10-dec
+               os=-tops10
+               ;;
+       decsystem20* | dec20*)
+               basic_machine=pdp10-dec
+               os=-tops20
+               ;;
+       delta | 3300 | motorola-3300 | motorola-delta \
+             | 3300-motorola | delta-motorola)
+               basic_machine=m68k-motorola
+               ;;
+       delta88)
+               basic_machine=m88k-motorola
+               os=-sysv3
+               ;;
+       djgpp)
+               basic_machine=i586-pc
+               os=-msdosdjgpp
+               ;;
+       dpx20 | dpx20-*)
+               basic_machine=rs6000-bull
+               os=-bosx
+               ;;
+       dpx2* | dpx2*-bull)
+               basic_machine=m68k-bull
+               os=-sysv3
+               ;;
+       ebmon29k)
+               basic_machine=a29k-amd
+               os=-ebmon
+               ;;
+       elxsi)
+               basic_machine=elxsi-elxsi
+               os=-bsd
+               ;;
+       encore | umax | mmax)
+               basic_machine=ns32k-encore
+               ;;
+       es1800 | OSE68k | ose68k | ose | OSE)
+               basic_machine=m68k-ericsson
+               os=-ose
+               ;;
+       fx2800)
+               basic_machine=i860-alliant
+               ;;
+       genix)
+               basic_machine=ns32k-ns
+               ;;
+       gmicro)
+               basic_machine=tron-gmicro
+               os=-sysv
+               ;;
+       go32)
+               basic_machine=i386-pc
+               os=-go32
+               ;;
+       h3050r* | hiux*)
+               basic_machine=hppa1.1-hitachi
+               os=-hiuxwe2
+               ;;
+       h8300hms)
+               basic_machine=h8300-hitachi
+               os=-hms
+               ;;
+       h8300xray)
+               basic_machine=h8300-hitachi
+               os=-xray
+               ;;
+       h8500hms)
+               basic_machine=h8500-hitachi
+               os=-hms
+               ;;
+       harris)
+               basic_machine=m88k-harris
+               os=-sysv3
+               ;;
+       hp300-*)
+               basic_machine=m68k-hp
+               ;;
+       hp300bsd)
+               basic_machine=m68k-hp
+               os=-bsd
+               ;;
+       hp300hpux)
+               basic_machine=m68k-hp
+               os=-hpux
+               ;;
+       hp3k9[0-9][0-9] | hp9[0-9][0-9])
+               basic_machine=hppa1.0-hp
+               ;;
+       hp9k2[0-9][0-9] | hp9k31[0-9])
+               basic_machine=m68000-hp
+               ;;
+       hp9k3[2-9][0-9])
+               basic_machine=m68k-hp
+               ;;
+       hp9k6[0-9][0-9] | hp6[0-9][0-9])
+               basic_machine=hppa1.0-hp
+               ;;
+       hp9k7[0-79][0-9] | hp7[0-79][0-9])
+               basic_machine=hppa1.1-hp
+               ;;
+       hp9k78[0-9] | hp78[0-9])
+               # FIXME: really hppa2.0-hp
+               basic_machine=hppa1.1-hp
+               ;;
+       hp9k8[67]1 | hp8[67]1 | hp9k80[24] | hp80[24] | hp9k8[78]9 | hp8[78]9 | hp9k893 | hp893)
+               # FIXME: really hppa2.0-hp
+               basic_machine=hppa1.1-hp
+               ;;
+       hp9k8[0-9][13679] | hp8[0-9][13679])
+               basic_machine=hppa1.1-hp
+               ;;
+       hp9k8[0-9][0-9] | hp8[0-9][0-9])
+               basic_machine=hppa1.0-hp
+               ;;
+       hppa-next)
+               os=-nextstep3
+               ;;
+       hppaosf)
+               basic_machine=hppa1.1-hp
+               os=-osf
+               ;;
+       hppro)
+               basic_machine=hppa1.1-hp
+               os=-proelf
+               ;;
+       i370-ibm* | ibm*)
+               basic_machine=i370-ibm
+               ;;
+# I'm not sure what "Sysv32" means.  Should this be sysv3.2?
+       i*86v32)
+               basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
+               os=-sysv32
+               ;;
+       i*86v4*)
+               basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
+               os=-sysv4
+               ;;
+       i*86v)
+               basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
+               os=-sysv
+               ;;
+       i*86sol2)
+               basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
+               os=-solaris2
+               ;;
+       i386mach)
+               basic_machine=i386-mach
+               os=-mach
+               ;;
+       i386-vsta | vsta)
+               basic_machine=i386-unknown
+               os=-vsta
+               ;;
+       iris | iris4d)
+               basic_machine=mips-sgi
+               case $os in
+                   -irix*)
+                       ;;
+                   *)
+                       os=-irix4
+                       ;;
+               esac
+               ;;
+       isi68 | isi)
+               basic_machine=m68k-isi
+               os=-sysv
+               ;;
+       m68knommu)
+               basic_machine=m68k-unknown
+               os=-linux
+               ;;
+       m68knommu-*)
+               basic_machine=m68k-`echo $basic_machine | sed 's/^[^-]*-//'`
+               os=-linux
+               ;;
+       m88k-omron*)
+               basic_machine=m88k-omron
+               ;;
+       magnum | m3230)
+               basic_machine=mips-mips
+               os=-sysv
+               ;;
+       merlin)
+               basic_machine=ns32k-utek
+               os=-sysv
+               ;;
+       mingw32)
+               basic_machine=i386-pc
+               os=-mingw32
+               ;;
+       mingw32ce)
+               basic_machine=arm-unknown
+               os=-mingw32ce
+               ;;
+       miniframe)
+               basic_machine=m68000-convergent
+               ;;
+       *mint | -mint[0-9]* | *MiNT | *MiNT[0-9]*)
+               basic_machine=m68k-atari
+               os=-mint
+               ;;
+       mips3*-*)
+               basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`
+               ;;
+       mips3*)
+               basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`-unknown
+               ;;
+       monitor)
+               basic_machine=m68k-rom68k
+               os=-coff
+               ;;
+       morphos)
+               basic_machine=powerpc-unknown
+               os=-morphos
+               ;;
+       msdos)
+               basic_machine=i386-pc
+               os=-msdos
+               ;;
+       ms1-*)
+               basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'`
+               ;;
+       mvs)
+               basic_machine=i370-ibm
+               os=-mvs
+               ;;
+       ncr3000)
+               basic_machine=i486-ncr
+               os=-sysv4
+               ;;
+       netbsd386)
+               basic_machine=i386-unknown
+               os=-netbsd
+               ;;
+       netwinder)
+               basic_machine=armv4l-rebel
+               os=-linux
+               ;;
+       news | news700 | news800 | news900)
+               basic_machine=m68k-sony
+               os=-newsos
+               ;;
+       news1000)
+               basic_machine=m68030-sony
+               os=-newsos
+               ;;
+       news-3600 | risc-news)
+               basic_machine=mips-sony
+               os=-newsos
+               ;;
+       necv70)
+               basic_machine=v70-nec
+               os=-sysv
+               ;;
+       next | m*-next )
+               basic_machine=m68k-next
+               case $os in
+                   -nextstep* )
+                       ;;
+                   -ns2*)
+                     os=-nextstep2
+                       ;;
+                   *)
+                     os=-nextstep3
+                       ;;
+               esac
+               ;;
+       nh3000)
+               basic_machine=m68k-harris
+               os=-cxux
+               ;;
+       nh[45]000)
+               basic_machine=m88k-harris
+               os=-cxux
+               ;;
+       nindy960)
+               basic_machine=i960-intel
+               os=-nindy
+               ;;
+       mon960)
+               basic_machine=i960-intel
+               os=-mon960
+               ;;
+       nonstopux)
+               basic_machine=mips-compaq
+               os=-nonstopux
+               ;;
+       np1)
+               basic_machine=np1-gould
+               ;;
+       nsr-tandem)
+               basic_machine=nsr-tandem
+               ;;
+       op50n-* | op60c-*)
+               basic_machine=hppa1.1-oki
+               os=-proelf
+               ;;
+       openrisc | openrisc-*)
+               basic_machine=or32-unknown
+               ;;
+       os400)
+               basic_machine=powerpc-ibm
+               os=-os400
+               ;;
+       OSE68000 | ose68000)
+               basic_machine=m68000-ericsson
+               os=-ose
+               ;;
+       os68k)
+               basic_machine=m68k-none
+               os=-os68k
+               ;;
+       pa-hitachi)
+               basic_machine=hppa1.1-hitachi
+               os=-hiuxwe2
+               ;;
+       paragon)
+               basic_machine=i860-intel
+               os=-osf
+               ;;
+       parisc)
+               basic_machine=hppa-unknown
+               os=-linux
+               ;;
+       parisc-*)
+               basic_machine=hppa-`echo $basic_machine | sed 's/^[^-]*-//'`
+               os=-linux
+               ;;
+       pbd)
+               basic_machine=sparc-tti
+               ;;
+       pbb)
+               basic_machine=m68k-tti
+               ;;
+       pc532 | pc532-*)
+               basic_machine=ns32k-pc532
+               ;;
+       pc98)
+               basic_machine=i386-pc
+               ;;
+       pc98-*)
+               basic_machine=i386-`echo $basic_machine | sed 's/^[^-]*-//'`
+               ;;
+       pentium | p5 | k5 | k6 | nexgen | viac3)
+               basic_machine=i586-pc
+               ;;
+       pentiumpro | p6 | 6x86 | athlon | athlon_*)
+               basic_machine=i686-pc
+               ;;
+       pentiumii | pentium2 | pentiumiii | pentium3)
+               basic_machine=i686-pc
+               ;;
+       pentium4)
+               basic_machine=i786-pc
+               ;;
+       pentium-* | p5-* | k5-* | k6-* | nexgen-* | viac3-*)
+               basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'`
+               ;;
+       pentiumpro-* | p6-* | 6x86-* | athlon-*)
+               basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
+               ;;
+       pentiumii-* | pentium2-* | pentiumiii-* | pentium3-*)
+               basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
+               ;;
+       pentium4-*)
+               basic_machine=i786-`echo $basic_machine | sed 's/^[^-]*-//'`
+               ;;
+       pn)
+               basic_machine=pn-gould
+               ;;
+       power)  basic_machine=power-ibm
+               ;;
+       ppc)    basic_machine=powerpc-unknown
+               ;;
+       ppc-*)  basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
+               ;;
+       ppcle | powerpclittle | ppc-le | powerpc-little)
+               basic_machine=powerpcle-unknown
+               ;;
+       ppcle-* | powerpclittle-*)
+               basic_machine=powerpcle-`echo $basic_machine | sed 's/^[^-]*-//'`
+               ;;
+       ppc64)  basic_machine=powerpc64-unknown
+               ;;
+       ppc64-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'`
+               ;;
+       ppc64le | powerpc64little | ppc64-le | powerpc64-little)
+               basic_machine=powerpc64le-unknown
+               ;;
+       ppc64le-* | powerpc64little-*)
+               basic_machine=powerpc64le-`echo $basic_machine | sed 's/^[^-]*-//'`
+               ;;
+       ps2)
+               basic_machine=i386-ibm
+               ;;
+       pw32)
+               basic_machine=i586-unknown
+               os=-pw32
+               ;;
+       rdos)
+               basic_machine=i386-pc
+               os=-rdos
+               ;;
+       rom68k)
+               basic_machine=m68k-rom68k
+               os=-coff
+               ;;
+       rm[46]00)
+               basic_machine=mips-siemens
+               ;;
+       rtpc | rtpc-*)
+               basic_machine=romp-ibm
+               ;;
+       s390 | s390-*)
+               basic_machine=s390-ibm
+               ;;
+       s390x | s390x-*)
+               basic_machine=s390x-ibm
+               ;;
+       sa29200)
+               basic_machine=a29k-amd
+               os=-udi
+               ;;
+       sb1)
+               basic_machine=mipsisa64sb1-unknown
+               ;;
+       sb1el)
+               basic_machine=mipsisa64sb1el-unknown
+               ;;
+       sde)
+               basic_machine=mipsisa32-sde
+               os=-elf
+               ;;
+       sei)
+               basic_machine=mips-sei
+               os=-seiux
+               ;;
+       sequent)
+               basic_machine=i386-sequent
+               ;;
+       sh)
+               basic_machine=sh-hitachi
+               os=-hms
+               ;;
+       sh5el)
+               basic_machine=sh5le-unknown
+               ;;
+       sh64)
+               basic_machine=sh64-unknown
+               ;;
+       sparclite-wrs | simso-wrs)
+               basic_machine=sparclite-wrs
+               os=-vxworks
+               ;;
+       sps7)
+               basic_machine=m68k-bull
+               os=-sysv2
+               ;;
+       spur)
+               basic_machine=spur-unknown
+               ;;
+       st2000)
+               basic_machine=m68k-tandem
+               ;;
+       stratus)
+               basic_machine=i860-stratus
+               os=-sysv4
+               ;;
+       sun2)
+               basic_machine=m68000-sun
+               ;;
+       sun2os3)
+               basic_machine=m68000-sun
+               os=-sunos3
+               ;;
+       sun2os4)
+               basic_machine=m68000-sun
+               os=-sunos4
+               ;;
+       sun3os3)
+               basic_machine=m68k-sun
+               os=-sunos3
+               ;;
+       sun3os4)
+               basic_machine=m68k-sun
+               os=-sunos4
+               ;;
+       sun4os3)
+               basic_machine=sparc-sun
+               os=-sunos3
+               ;;
+       sun4os4)
+               basic_machine=sparc-sun
+               os=-sunos4
+               ;;
+       sun4sol2)
+               basic_machine=sparc-sun
+               os=-solaris2
+               ;;
+       sun3 | sun3-*)
+               basic_machine=m68k-sun
+               ;;
+       sun4)
+               basic_machine=sparc-sun
+               ;;
+       sun386 | sun386i | roadrunner)
+               basic_machine=i386-sun
+               ;;
+       sv1)
+               basic_machine=sv1-cray
+               os=-unicos
+               ;;
+       symmetry)
+               basic_machine=i386-sequent
+               os=-dynix
+               ;;
+       t3e)
+               basic_machine=alphaev5-cray
+               os=-unicos
+               ;;
+       t90)
+               basic_machine=t90-cray
+               os=-unicos
+               ;;
+       tic54x | c54x*)
+               basic_machine=tic54x-unknown
+               os=-coff
+               ;;
+       tic55x | c55x*)
+               basic_machine=tic55x-unknown
+               os=-coff
+               ;;
+       tic6x | c6x*)
+               basic_machine=tic6x-unknown
+               os=-coff
+               ;;
+       tile*)
+               basic_machine=tile-unknown
+               os=-linux-gnu
+               ;;
+       tx39)
+               basic_machine=mipstx39-unknown
+               ;;
+       tx39el)
+               basic_machine=mipstx39el-unknown
+               ;;
+       toad1)
+               basic_machine=pdp10-xkl
+               os=-tops20
+               ;;
+       tower | tower-32)
+               basic_machine=m68k-ncr
+               ;;
+       tpf)
+               basic_machine=s390x-ibm
+               os=-tpf
+               ;;
+       udi29k)
+               basic_machine=a29k-amd
+               os=-udi
+               ;;
+       ultra3)
+               basic_machine=a29k-nyu
+               os=-sym1
+               ;;
+       v810 | necv810)
+               basic_machine=v810-nec
+               os=-none
+               ;;
+       vaxv)
+               basic_machine=vax-dec
+               os=-sysv
+               ;;
+       vms)
+               basic_machine=vax-dec
+               os=-vms
+               ;;
+       vpp*|vx|vx-*)
+               basic_machine=f301-fujitsu
+               ;;
+       vxworks960)
+               basic_machine=i960-wrs
+               os=-vxworks
+               ;;
+       vxworks68)
+               basic_machine=m68k-wrs
+               os=-vxworks
+               ;;
+       vxworks29k)
+               basic_machine=a29k-wrs
+               os=-vxworks
+               ;;
+       w65*)
+               basic_machine=w65-wdc
+               os=-none
+               ;;
+       w89k-*)
+               basic_machine=hppa1.1-winbond
+               os=-proelf
+               ;;
+       xbox)
+               basic_machine=i686-pc
+               os=-mingw32
+               ;;
+       xps | xps100)
+               basic_machine=xps100-honeywell
+               ;;
+       ymp)
+               basic_machine=ymp-cray
+               os=-unicos
+               ;;
+       z8k-*-coff)
+               basic_machine=z8k-unknown
+               os=-sim
+               ;;
+       none)
+               basic_machine=none-none
+               os=-none
+               ;;
+
+# Here we handle the default manufacturer of certain CPU types.  It is in
+# some cases the only manufacturer, in others, it is the most popular.
+       w89k)
+               basic_machine=hppa1.1-winbond
+               ;;
+       op50n)
+               basic_machine=hppa1.1-oki
+               ;;
+       op60c)
+               basic_machine=hppa1.1-oki
+               ;;
+       romp)
+               basic_machine=romp-ibm
+               ;;
+       mmix)
+               basic_machine=mmix-knuth
+               ;;
+       rs6000)
+               basic_machine=rs6000-ibm
+               ;;
+       vax)
+               basic_machine=vax-dec
+               ;;
+       pdp10)
+               # there are many clones, so DEC is not a safe bet
+               basic_machine=pdp10-unknown
+               ;;
+       pdp11)
+               basic_machine=pdp11-dec
+               ;;
+       we32k)
+               basic_machine=we32k-att
+               ;;
+       sh[1234] | sh[24]a | sh[34]eb | sh[1234]le | sh[23]ele)
+               basic_machine=sh-unknown
+               ;;
+       sparc | sparcv8 | sparcv9 | sparcv9b | sparcv9v)
+               basic_machine=sparc-sun
+               ;;
+       cydra)
+               basic_machine=cydra-cydrome
+               ;;
+       orion)
+               basic_machine=orion-highlevel
+               ;;
+       orion105)
+               basic_machine=clipper-highlevel
+               ;;
+       mac | mpw | mac-mpw)
+               basic_machine=m68k-apple
+               ;;
+       pmac | pmac-mpw)
+               basic_machine=powerpc-apple
+               ;;
+       *-unknown)
+               # Make sure to match an already-canonicalized machine name.
+               ;;
+       *)
+               echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2
+               exit 1
+               ;;
+esac
+
+# Here we canonicalize certain aliases for manufacturers.
+case $basic_machine in
+       *-digital*)
+               basic_machine=`echo $basic_machine | sed 's/digital.*/dec/'`
+               ;;
+       *-commodore*)
+               basic_machine=`echo $basic_machine | sed 's/commodore.*/cbm/'`
+               ;;
+       *)
+               ;;
+esac
+
+# Decode manufacturer-specific aliases for certain operating systems.
+
+if [ x"$os" != x"" ]
+then
+case $os in
+        # First match some system type aliases
+        # that might get confused with valid system types.
+       # -solaris* is a basic system type, with this one exception.
+       -solaris1 | -solaris1.*)
+               os=`echo $os | sed -e 's|solaris1|sunos4|'`
+               ;;
+       -solaris)
+               os=-solaris2
+               ;;
+       -svr4*)
+               os=-sysv4
+               ;;
+       -unixware*)
+               os=-sysv4.2uw
+               ;;
+       -gnu/linux*)
+               os=`echo $os | sed -e 's|gnu/linux|linux-gnu|'`
+               ;;
+       # First accept the basic system types.
+       # The portable systems comes first.
+       # Each alternative MUST END IN A *, to match a version number.
+       # -sysv* is not here because it comes later, after sysvr4.
+       -gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \
+             | -*vms* | -sco* | -esix* | -isc* | -aix* | -sunos | -sunos[34]*\
+             | -hpux* | -unos* | -osf* | -luna* | -dgux* | -solaris* | -sym* \
+             | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
+             | -aos* \
+             | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
+             | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
+             | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \
+             | -openbsd* | -solidbsd* \
+             | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \
+             | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
+             | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
+             | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
+             | -chorusos* | -chorusrdb* \
+             | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
+             | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \
+             | -uxpv* | -beos* | -mpeix* | -udk* \
+             | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
+             | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
+             | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \
+             | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
+             | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
+             | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
+             | -skyos* | -haiku* | -rdos* | -toppers* | -drops*)
+       # Remember, each alternative MUST END IN *, to match a version number.
+               ;;
+       -qnx*)
+               case $basic_machine in
+                   x86-* | i*86-*)
+                       ;;
+                   *)
+                       os=-nto$os
+                       ;;
+               esac
+               ;;
+       -nto-qnx*)
+               ;;
+       -nto*)
+               os=`echo $os | sed -e 's|nto|nto-qnx|'`
+               ;;
+       -sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \
+             | -windows* | -osx | -abug | -netware* | -os9* | -beos* | -haiku* \
+             | -macos* | -mpw* | -magic* | -mmixware* | -mon960* | -lnews*)
+               ;;
+       -mac*)
+               os=`echo $os | sed -e 's|mac|macos|'`
+               ;;
+       -linux-dietlibc)
+               os=-linux-dietlibc
+               ;;
+       -linux*)
+               os=`echo $os | sed -e 's|linux|linux-gnu|'`
+               ;;
+       -sunos5*)
+               os=`echo $os | sed -e 's|sunos5|solaris2|'`
+               ;;
+       -sunos6*)
+               os=`echo $os | sed -e 's|sunos6|solaris3|'`
+               ;;
+       -opened*)
+               os=-openedition
+               ;;
+        -os400*)
+               os=-os400
+               ;;
+       -wince*)
+               os=-wince
+               ;;
+       -osfrose*)
+               os=-osfrose
+               ;;
+       -osf*)
+               os=-osf
+               ;;
+       -utek*)
+               os=-bsd
+               ;;
+       -dynix*)
+               os=-bsd
+               ;;
+       -acis*)
+               os=-aos
+               ;;
+       -atheos*)
+               os=-atheos
+               ;;
+       -syllable*)
+               os=-syllable
+               ;;
+       -386bsd)
+               os=-bsd
+               ;;
+       -ctix* | -uts*)
+               os=-sysv
+               ;;
+       -nova*)
+               os=-rtmk-nova
+               ;;
+       -ns2 )
+               os=-nextstep2
+               ;;
+       -nsk*)
+               os=-nsk
+               ;;
+       # Preserve the version number of sinix5.
+       -sinix5.*)
+               os=`echo $os | sed -e 's|sinix|sysv|'`
+               ;;
+       -sinix*)
+               os=-sysv4
+               ;;
+        -tpf*)
+               os=-tpf
+               ;;
+       -triton*)
+               os=-sysv3
+               ;;
+       -oss*)
+               os=-sysv3
+               ;;
+       -svr4)
+               os=-sysv4
+               ;;
+       -svr3)
+               os=-sysv3
+               ;;
+       -sysvr4)
+               os=-sysv4
+               ;;
+       # This must come after -sysvr4.
+       -sysv*)
+               ;;
+       -ose*)
+               os=-ose
+               ;;
+       -es1800*)
+               os=-ose
+               ;;
+       -xenix)
+               os=-xenix
+               ;;
+       -*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
+               os=-mint
+               ;;
+       -aros*)
+               os=-aros
+               ;;
+       -kaos*)
+               os=-kaos
+               ;;
+       -zvmoe)
+               os=-zvmoe
+               ;;
+       -none)
+               ;;
+       *)
+               # Get rid of the `-' at the beginning of $os.
+               os=`echo $os | sed 's/[^-]*-//'`
+               echo Invalid configuration \`$1\': system \`$os\' not recognized 1>&2
+               exit 1
+               ;;
+esac
+else
+
+# Here we handle the default operating systems that come with various machines.
+# The value should be what the vendor currently ships out the door with their
+# machine or put another way, the most popular os provided with the machine.
+
+# Note that if you're going to try to match "-MANUFACTURER" here (say,
+# "-sun"), then you have to tell the case statement up towards the top
+# that MANUFACTURER isn't an operating system.  Otherwise, code above
+# will signal an error saying that MANUFACTURER isn't an operating
+# system, and we'll never get to this point.
+
+case $basic_machine in
+        score-*)
+               os=-elf
+               ;;
+        spu-*)
+               os=-elf
+               ;;
+       *-acorn)
+               os=-riscix1.2
+               ;;
+       arm*-rebel)
+               os=-linux
+               ;;
+       arm*-semi)
+               os=-aout
+               ;;
+        c4x-* | tic4x-*)
+               os=-coff
+               ;;
+       # This must come before the *-dec entry.
+       pdp10-*)
+               os=-tops20
+               ;;
+       pdp11-*)
+               os=-none
+               ;;
+       *-dec | vax-*)
+               os=-ultrix4.2
+               ;;
+       m68*-apollo)
+               os=-domain
+               ;;
+       i386-sun)
+               os=-sunos4.0.2
+               ;;
+       m68000-sun)
+               os=-sunos3
+               # This also exists in the configure program, but was not the
+               # default.
+               # os=-sunos4
+               ;;
+       m68*-cisco)
+               os=-aout
+               ;;
+        mep-*)
+               os=-elf
+               ;;
+       mips*-cisco)
+               os=-elf
+               ;;
+       mips*-*)
+               os=-elf
+               ;;
+       or32-*)
+               os=-coff
+               ;;
+       *-tti)  # must be before sparc entry or we get the wrong os.
+               os=-sysv3
+               ;;
+       sparc-* | *-sun)
+               os=-sunos4.1.1
+               ;;
+       *-be)
+               os=-beos
+               ;;
+       *-haiku)
+               os=-haiku
+               ;;
+       *-ibm)
+               os=-aix
+               ;;
+       *-knuth)
+               os=-mmixware
+               ;;
+       *-wec)
+               os=-proelf
+               ;;
+       *-winbond)
+               os=-proelf
+               ;;
+       *-oki)
+               os=-proelf
+               ;;
+       *-hp)
+               os=-hpux
+               ;;
+       *-hitachi)
+               os=-hiux
+               ;;
+       i860-* | *-att | *-ncr | *-altos | *-motorola | *-convergent)
+               os=-sysv
+               ;;
+       *-cbm)
+               os=-amigaos
+               ;;
+       *-dg)
+               os=-dgux
+               ;;
+       *-dolphin)
+               os=-sysv3
+               ;;
+       m68k-ccur)
+               os=-rtu
+               ;;
+       m88k-omron*)
+               os=-luna
+               ;;
+       *-next )
+               os=-nextstep
+               ;;
+       *-sequent)
+               os=-ptx
+               ;;
+       *-crds)
+               os=-unos
+               ;;
+       *-ns)
+               os=-genix
+               ;;
+       i370-*)
+               os=-mvs
+               ;;
+       *-next)
+               os=-nextstep3
+               ;;
+       *-gould)
+               os=-sysv
+               ;;
+       *-highlevel)
+               os=-bsd
+               ;;
+       *-encore)
+               os=-bsd
+               ;;
+       *-sgi)
+               os=-irix
+               ;;
+       *-siemens)
+               os=-sysv4
+               ;;
+       *-masscomp)
+               os=-rtu
+               ;;
+       f30[01]-fujitsu | f700-fujitsu)
+               os=-uxpv
+               ;;
+       *-rom68k)
+               os=-coff
+               ;;
+       *-*bug)
+               os=-coff
+               ;;
+       *-apple)
+               os=-macos
+               ;;
+       *-atari*)
+               os=-mint
+               ;;
+       *)
+               os=-none
+               ;;
+esac
+fi
+
+# Here we handle the case where we know the os, and the CPU type, but not the
+# manufacturer.  We pick the logical manufacturer.
+vendor=unknown
+case $basic_machine in
+       *-unknown)
+               case $os in
+                       -riscix*)
+                               vendor=acorn
+                               ;;
+                       -sunos*)
+                               vendor=sun
+                               ;;
+                       -aix*)
+                               vendor=ibm
+                               ;;
+                       -beos*)
+                               vendor=be
+                               ;;
+                       -hpux*)
+                               vendor=hp
+                               ;;
+                       -mpeix*)
+                               vendor=hp
+                               ;;
+                       -hiux*)
+                               vendor=hitachi
+                               ;;
+                       -unos*)
+                               vendor=crds
+                               ;;
+                       -dgux*)
+                               vendor=dg
+                               ;;
+                       -luna*)
+                               vendor=omron
+                               ;;
+                       -genix*)
+                               vendor=ns
+                               ;;
+                       -mvs* | -opened*)
+                               vendor=ibm
+                               ;;
+                       -os400*)
+                               vendor=ibm
+                               ;;
+                       -ptx*)
+                               vendor=sequent
+                               ;;
+                       -tpf*)
+                               vendor=ibm
+                               ;;
+                       -vxsim* | -vxworks* | -windiss*)
+                               vendor=wrs
+                               ;;
+                       -aux*)
+                               vendor=apple
+                               ;;
+                       -hms*)
+                               vendor=hitachi
+                               ;;
+                       -mpw* | -macos*)
+                               vendor=apple
+                               ;;
+                       -*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
+                               vendor=atari
+                               ;;
+                       -vos*)
+                               vendor=stratus
+                               ;;
+               esac
+               basic_machine=`echo $basic_machine | sed "s/unknown/$vendor/"`
+               ;;
+esac
+
+echo $basic_machine$os
+exit
+
+# Local variables:
+# eval: (add-hook 'write-file-hooks 'time-stamp)
+# time-stamp-start: "timestamp='"
+# time-stamp-format: "%:y-%02m-%02d"
+# time-stamp-end: "'"
+# End:
index 72ec06a2c1fd8dde92acea5e8ac773e35f1d061b..3efcf32d68e9722024b6ca9d67f9e81b2aa5ac04 100755 (executable)
@@ -1,4 +1,4 @@
-BUILD_DIR=/usr/local/build/bash/bash-current
+BUILD_DIR=/usr/local/build/chet/bash/bash-current
 THIS_SH=$BUILD_DIR/bash
 PATH=$PATH:$BUILD_DIR