commit bash-20100923 snapshot

This commit is contained in:
Chet Ramey
2011-12-12 22:07:06 -05:00
parent d7c725b5f1
commit 7fb4dd6d44
6 changed files with 21 additions and 191 deletions
+6
View File
@@ -10409,3 +10409,9 @@ lib/readline/bind.c
doc/{bash.1,bashref.texi},lib/readline/doc/{readline.3,rluser.texi}
- added description of menu-complete-display-prefix bindable
readline variable
9/17
----
configure.in
- remove AM_PATH_LISPDIR call since we don't use that bash debugger
any more. Suggested by Mike Frysinger <vapier@gentoo.org>
+1 -84
View File
@@ -1,5 +1,5 @@
@%:@! /bin/sh
@%:@ From configure.in for Bash 4.2, version 4.032.
@%:@ From configure.in for Bash 4.2, version 4.033.
@%:@ Guess values for system-dependent variables and create Makefiles.
@%:@ Generated by GNU Autoconf 2.63 for bash 4.2-devel.
@%:@
@@ -744,8 +744,6 @@ MALLOC_TARGET
PURIFY
TESTSCRIPT
DEBUGGER_START_FILE
lispdir
EMACS
host_os
host_vendor
host_cpu
@@ -794,7 +792,6 @@ SHELL'
ac_subst_files=''
ac_user_opts='
enable_option_checking
with_lispdir
with_afs
with_bash_malloc
with_curses
@@ -1551,7 +1548,6 @@ Optional Features:
Optional Packages:
--with-PACKAGE[=ARG] use PACKAGE [ARG=yes]
--without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no)
--with-lispdir override the default lisp directory
--with-afs if you are running AFS
--with-bash-malloc use the Bash version of malloc
--with-curses use the curses library instead of the termcap
@@ -2213,85 +2209,6 @@ sco3.2v5*|sco3.2v4*) opt_memscramble=no ;;
esac
@%:@ Check whether --with-lispdir was given.
if test "${with_lispdir+set}" = set; then
withval=$with_lispdir; lispdir="$withval"
{ $as_echo "$as_me:$LINENO: checking where .elc files should go" >&5
$as_echo_n "checking where .elc files should go... " >&6; }
{ $as_echo "$as_me:$LINENO: result: $lispdir" >&5
$as_echo "$lispdir" >&6; }
else
# If set to t, that means we are running in a shell under Emacs.
# If you have an Emacs named "t", then use the full path.
test x"$EMACS" = xt && EMACS=
for ac_prog in emacs xemacs
do
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
if test "${ac_cv_prog_EMACS+set}" = set; then
$as_echo_n "(cached) " >&6
else
if test -n "$EMACS"; then
ac_cv_prog_EMACS="$EMACS" # Let the user override the test.
else
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_EMACS="$ac_prog"
$as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
done
IFS=$as_save_IFS
fi
fi
EMACS=$ac_cv_prog_EMACS
if test -n "$EMACS"; then
{ $as_echo "$as_me:$LINENO: result: $EMACS" >&5
$as_echo "$EMACS" >&6; }
else
{ $as_echo "$as_me:$LINENO: result: no" >&5
$as_echo "no" >&6; }
fi
test -n "$EMACS" && break
done
test -n "$EMACS" || EMACS="no"
if test $EMACS != "no"; then
if test x${lispdir+set} != xset; then
{ $as_echo "$as_me:$LINENO: checking where .elc files should go" >&5
$as_echo_n "checking where .elc files should go... " >&6; }
if test "${am_cv_lispdir+set}" = set; then
$as_echo_n "(cached) " >&6
else
am_cv_lispdir=`$EMACS -batch -q -eval '(while load-path (princ (concat (car load-path) "\n")) (setq load-path (cdr load-path)))' | sed -n -e 's,/$,,' -e '/.*\/lib\/\(x\?emacs\/site-lisp\)$/{s,,${libdir}/\1,;p;q;}' -e '/.*\/share\/\(x\?emacs\/site-lisp\)$/{s,,${datadir}/\1,;p;q;}'`
if test -z "$am_cv_lispdir"; then
am_cv_lispdir='${datadir}/emacs/site-lisp'
fi
fi
{ $as_echo "$as_me:$LINENO: result: $am_cv_lispdir" >&5
$as_echo "$am_cv_lispdir" >&6; }
lispdir="$am_cv_lispdir"
fi
fi
fi
@%:@ Check whether --with-afs was given.
+11 -11
View File
@@ -15,25 +15,25 @@
'configure.in'
],
{
'_LT_AC_TAGCONFIG' => 1,
'AM_PROG_F77_C_O' => 1,
'AC_INIT' => 1,
'_LT_AC_TAGCONFIG' => 1,
'm4_pattern_forbid' => 1,
'_AM_COND_IF' => 1,
'AC_INIT' => 1,
'AC_CANONICAL_TARGET' => 1,
'AC_SUBST' => 1,
'_AM_COND_IF' => 1,
'AC_CONFIG_LIBOBJ_DIR' => 1,
'AC_FC_SRCEXT' => 1,
'AC_SUBST' => 1,
'AC_CANONICAL_HOST' => 1,
'AC_FC_SRCEXT' => 1,
'AC_PROG_LIBTOOL' => 1,
'AM_INIT_AUTOMAKE' => 1,
'AC_CONFIG_SUBDIRS' => 1,
'AM_AUTOMAKE_VERSION' => 1,
'LT_CONFIG_LTDL_DIR' => 1,
'AC_REQUIRE_AUX_FILE' => 1,
'AC_CONFIG_LINKS' => 1,
'm4_sinclude' => 1,
'AC_REQUIRE_AUX_FILE' => 1,
'LT_SUPPORTED_TAG' => 1,
'm4_sinclude' => 1,
'AM_MAINTAINER_MODE' => 1,
'AM_GNU_GETTEXT_INTL_SUBDIR' => 1,
'_m4_warn' => 1,
@@ -49,13 +49,13 @@
'AC_CANONICAL_BUILD' => 1,
'AC_FC_FREEFORM' => 1,
'AH_OUTPUT' => 1,
'_AM_SUBST_NOTMAKE' => 1,
'AC_CONFIG_AUX_DIR' => 1,
'sinclude' => 1,
'm4_pattern_allow' => 1,
'_AM_SUBST_NOTMAKE' => 1,
'AM_PROG_CC_C_O' => 1,
'AC_CANONICAL_SYSTEM' => 1,
'm4_pattern_allow' => 1,
'sinclude' => 1,
'AM_CONDITIONAL' => 1,
'AC_CANONICAL_SYSTEM' => 1,
'AC_CONFIG_HEADERS' => 1,
'AC_DEFINE_TRACE_LITERAL' => 1,
'm4_include' => 1,
-10
View File
@@ -169,16 +169,6 @@ m4trace:configure.in:51: -1- m4_pattern_allow([^host_vendor$])
m4trace:configure.in:51: -1- AC_SUBST([host_os])
m4trace:configure.in:51: -1- AC_SUBST_TRACE([host_os])
m4trace:configure.in:51: -1- m4_pattern_allow([^host_os$])
m4trace:configure.in:101: -2- _m4_warn([obsolete], [The macro `AC_HELP_STRING' is obsolete.
You should run autoupdate.], [../../lib/autoconf/general.m4:209: AC_HELP_STRING is expanded from...
aclocal.m4:1976: AM_PATH_LISPDIR is expanded from...
configure.in:101: the top level])
m4trace:configure.in:101: -1- AC_SUBST([EMACS])
m4trace:configure.in:101: -1- AC_SUBST_TRACE([EMACS])
m4trace:configure.in:101: -1- m4_pattern_allow([^EMACS$])
m4trace:configure.in:101: -1- AC_SUBST([lispdir])
m4trace:configure.in:101: -1- AC_SUBST_TRACE([lispdir])
m4trace:configure.in:101: -1- m4_pattern_allow([^lispdir$])
m4trace:configure.in:102: -1- AC_SUBST([DEBUGGER_START_FILE])
m4trace:configure.in:102: -1- AC_SUBST_TRACE([DEBUGGER_START_FILE])
m4trace:configure.in:102: -1- m4_pattern_allow([^DEBUGGER_START_FILE$])
Vendored
+1 -84
View File
@@ -1,5 +1,5 @@
#! /bin/sh
# From configure.in for Bash 4.2, version 4.032.
# From configure.in for Bash 4.2, version 4.033.
# Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.63 for bash 4.2-devel.
#
@@ -744,8 +744,6 @@ MALLOC_TARGET
PURIFY
TESTSCRIPT
DEBUGGER_START_FILE
lispdir
EMACS
host_os
host_vendor
host_cpu
@@ -794,7 +792,6 @@ SHELL'
ac_subst_files=''
ac_user_opts='
enable_option_checking
with_lispdir
with_afs
with_bash_malloc
with_curses
@@ -1551,7 +1548,6 @@ Optional Features:
Optional Packages:
--with-PACKAGE[=ARG] use PACKAGE [ARG=yes]
--without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no)
--with-lispdir override the default lisp directory
--with-afs if you are running AFS
--with-bash-malloc use the Bash version of malloc
--with-curses use the curses library instead of the termcap
@@ -2213,85 +2209,6 @@ sco3.2v5*|sco3.2v4*) opt_memscramble=no ;;
esac
# Check whether --with-lispdir was given.
if test "${with_lispdir+set}" = set; then
withval=$with_lispdir; lispdir="$withval"
{ $as_echo "$as_me:$LINENO: checking where .elc files should go" >&5
$as_echo_n "checking where .elc files should go... " >&6; }
{ $as_echo "$as_me:$LINENO: result: $lispdir" >&5
$as_echo "$lispdir" >&6; }
else
# If set to t, that means we are running in a shell under Emacs.
# If you have an Emacs named "t", then use the full path.
test x"$EMACS" = xt && EMACS=
for ac_prog in emacs xemacs
do
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
if test "${ac_cv_prog_EMACS+set}" = set; then
$as_echo_n "(cached) " >&6
else
if test -n "$EMACS"; then
ac_cv_prog_EMACS="$EMACS" # Let the user override the test.
else
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_EMACS="$ac_prog"
$as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
done
IFS=$as_save_IFS
fi
fi
EMACS=$ac_cv_prog_EMACS
if test -n "$EMACS"; then
{ $as_echo "$as_me:$LINENO: result: $EMACS" >&5
$as_echo "$EMACS" >&6; }
else
{ $as_echo "$as_me:$LINENO: result: no" >&5
$as_echo "no" >&6; }
fi
test -n "$EMACS" && break
done
test -n "$EMACS" || EMACS="no"
if test $EMACS != "no"; then
if test x${lispdir+set} != xset; then
{ $as_echo "$as_me:$LINENO: checking where .elc files should go" >&5
$as_echo_n "checking where .elc files should go... " >&6; }
if test "${am_cv_lispdir+set}" = set; then
$as_echo_n "(cached) " >&6
else
am_cv_lispdir=`$EMACS -batch -q -eval '(while load-path (princ (concat (car load-path) "\n")) (setq load-path (cdr load-path)))' | sed -n -e 's,/$,,' -e '/.*\/lib\/\(x\?emacs\/site-lisp\)$/{s,,${libdir}/\1,;p;q;}' -e '/.*\/share\/\(x\?emacs\/site-lisp\)$/{s,,${datadir}/\1,;p;q;}'`
if test -z "$am_cv_lispdir"; then
am_cv_lispdir='${datadir}/emacs/site-lisp'
fi
fi
{ $as_echo "$as_me:$LINENO: result: $am_cv_lispdir" >&5
$as_echo "$am_cv_lispdir" >&6; }
lispdir="$am_cv_lispdir"
fi
fi
fi
# Check whether --with-afs was given.
+2 -2
View File
@@ -21,7 +21,7 @@ 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.2, version 4.032])dnl
AC_REVISION([for Bash 4.2, version 4.033])dnl
define(bashvers, 4.2)
define(relstatus, devel)
@@ -98,7 +98,7 @@ esac
dnl
dnl macros for the bash debugger
dnl
AM_PATH_LISPDIR
dnl AM_PATH_LISPDIR
AC_ARG_VAR(DEBUGGER_START_FILE, [location of bash debugger initialization file])
dnl arguments to configure