diff options
-rwxr-xr-x | configure | 30 | ||||
-rw-r--r-- | man/Makefile.in | 1 | ||||
-rw-r--r-- | src/Makefile.in | 2 | ||||
-rw-r--r-- | tests/pr/Makefile.am | 4 | ||||
-rw-r--r-- | tests/pr/Makefile.in | 4 | ||||
-rwxr-xr-x | tests/pr/pr-tests | 20 |
6 files changed, 40 insertions, 21 deletions
@@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.53b for GNU coreutils 0.1.0. +# Generated by GNU Autoconf 2.53b for GNU coreutils 4.5.1. # # Report bugs to <bug-coreutils@gnu.org>. # @@ -275,8 +275,8 @@ SHELL=${CONFIG_SHELL-/bin/sh} # Identity of this package. PACKAGE_NAME='GNU coreutils' PACKAGE_TARNAME='coreutils' -PACKAGE_VERSION='0.1.0' -PACKAGE_STRING='GNU coreutils 0.1.0' +PACKAGE_VERSION='4.5.1' +PACKAGE_STRING='GNU coreutils 4.5.1' PACKAGE_BUGREPORT='bug-coreutils@gnu.org' ac_unique_file="src/ls.c" @@ -783,7 +783,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 GNU coreutils 0.1.0 to adapt to many kinds of systems. +\`configure' configures GNU coreutils 4.5.1 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -849,7 +849,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of GNU coreutils 0.1.0:";; + short | recursive ) echo "Configuration of GNU coreutils 4.5.1:";; esac cat <<\_ACEOF @@ -950,7 +950,7 @@ fi test -n "$ac_init_help" && exit 0 if $ac_init_version; then cat <<\_ACEOF -GNU coreutils configure 0.1.0 +GNU coreutils configure 4.5.1 generated by GNU Autoconf 2.53b Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, 2002 @@ -965,7 +965,7 @@ cat >&5 <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by GNU coreutils $as_me 0.1.0, which was +It was created by GNU coreutils $as_me 4.5.1, which was generated by GNU Autoconf 2.53b. Invocation command line was $ $0 $@ @@ -1587,7 +1587,7 @@ fi # Define the identity of the package. PACKAGE=coreutils - VERSION=0.1.0 + VERSION=4.5.1 cat >>confdefs.h <<_ACEOF @@ -33691,7 +33691,7 @@ if test "${jm_cv_sys_struct_winsize_needs_sys_ptem_h+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else jm_cv_sys_struct_winsize_needs_sys_ptem_h=yes - if test $am_cv_sys_posix_termios = yes; then + if test $ac_cv_sys_posix_termios = yes; then cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" #include "confdefs.h" @@ -34685,7 +34685,7 @@ if test "${jm_cv_sys_tiocgwinsz_needs_termios_h+set}" = set; then else jm_cv_sys_tiocgwinsz_needs_termios_h=no - if test $am_cv_sys_posix_termios = yes; then + if test $ac_cv_sys_posix_termios = yes; then cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" #include "confdefs.h" @@ -34747,7 +34747,7 @@ _ACEOF fi -if test $am_cv_sys_posix_termios = yes; then +if test $ac_cv_sys_posix_termios = yes; then OPTIONAL_BIN_PROGS="$OPTIONAL_BIN_PROGS stty" MAN="$MAN stty.1" echo "$as_me:$LINENO: checking whether termios.h needs _XOPEN_SOURCE" >&5 @@ -34858,7 +34858,7 @@ if test "${jm_cv_sys_struct_winsize_needs_sys_ptem_h+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else jm_cv_sys_struct_winsize_needs_sys_ptem_h=yes - if test $am_cv_sys_posix_termios = yes; then + if test $ac_cv_sys_posix_termios = yes; then cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" #include "confdefs.h" @@ -34943,7 +34943,7 @@ if test "${jm_cv_sys_tiocgwinsz_needs_termios_h+set}" = set; then else jm_cv_sys_tiocgwinsz_needs_termios_h=no - if test $am_cv_sys_posix_termios = yes; then + if test $ac_cv_sys_posix_termios = yes; then cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" #include "confdefs.h" @@ -37658,7 +37658,7 @@ _ASBOX } >&5 cat >&5 <<_CSEOF -This file was extended by GNU coreutils $as_me 0.1.0, which was +This file was extended by GNU coreutils $as_me 4.5.1, which was generated by GNU Autoconf 2.53b. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -37723,7 +37723,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ -GNU coreutils config.status 0.1.0 +GNU coreutils config.status 4.5.1 configured by $0, generated by GNU Autoconf 2.53b, with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\" diff --git a/man/Makefile.in b/man/Makefile.in index a30009e7c..cb4fa2f57 100644 --- a/man/Makefile.in +++ b/man/Makefile.in @@ -463,6 +463,7 @@ check-local: check-x-vs-1 # corresponding .1 file in the definition of $(dist_man_MANS) above. .PHONY: check-x-vs-1 check-x-vs-1: + PATH=../src:$$PATH; export PATH; \ t=ls-files.$$$$; \ (cd $(srcdir) && ls -1 *.x) | sed 's/\.x$$//' | sort > $$t; \ echo $(dist_man_MANS) | fmt -w1 | sed 's/\.1$$//' | sort -u \ diff --git a/src/Makefile.in b/src/Makefile.in index f749dcdda..37f6b0579 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -820,7 +820,7 @@ uninstall-binPROGRAMS: done clean-binPROGRAMS: - -test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS) > /dev/null 2>&1 || /bin/rm -f $(bin_PROGRAMS) + -test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS) installcheck-binPROGRAMS: $(bin_PROGRAMS) bad=0; pid=$$$$; list="$(bin_PROGRAMS)"; for p in $$list; do \ diff --git a/tests/pr/Makefile.am b/tests/pr/Makefile.am index ae3388d8e..2ab6e745d 100644 --- a/tests/pr/Makefile.am +++ b/tests/pr/Makefile.am @@ -26,7 +26,7 @@ tn_2e8-t_tab tn_2e8S-t_tab tne8-t_tab tne8o3-t_tab tt-0FF tt-FF tt-bl tt-t \ tta3-0FF tta3-FF ttb3-0FF ttb3-FF w72l17f-ll maint_gen = i-opt-a.I i-opt-a.X i-opt-b.I i-opt-b.X ncut-a.I ncut-a.X \ ncut-b.I ncut-b.X margin-0.I margin-0.X dbl-sp-a.I dbl-sp-a.X dbl-sp-b.I \ -dbl-sp-b.X narrow-1.I narrow-1.X +dbl-sp-b.X narrow-1.I narrow-1.X col-last.I col-last.X run_gen = 1a.O 1a.E 1b.O 1b.E 1c.O 1c.E 1d.O 1d.E 1e.O 1e.E 1f.O 1f.E 1g.O \ 1g.E 1h.O 1h.E 1i.O 1i.E 1j.O 1j.E 1k.O 1k.E 1l.O 1l.E 2a.O 2a.E 2b.O 2b.E \ 2c.O 2c.E 2d.O 2d.E 2e.O 2e.E 2f.O 2f.E 2g.O 2g.E 2h.O 2h.E 2i.O 2i.E 2j.O \ @@ -67,7 +67,7 @@ run_gen = 1a.O 1a.E 1b.O 1b.E 1c.O 1c.E 1d.O 1d.E 1e.O 1e.E 1f.O 1f.E 1g.O \ 14d.E 14e.O 14e.E 14f.O 14f.E 14g.O 14g.E 14h.O 14h.E 14i.O 14i.E 14j.O 14j.E \ 14k.O 14k.E 14l.O 14l.E 14m.O 14m.E i-opt-a.O i-opt-a.E i-opt-b.O i-opt-b.E \ ncut-a.O ncut-a.E ncut-b.O ncut-b.E margin-0.O margin-0.E dbl-sp-a.O \ -dbl-sp-a.E dbl-sp-b.O dbl-sp-b.E narrow-1.O narrow-1.E +dbl-sp-a.E dbl-sp-b.O dbl-sp-b.E narrow-1.O narrow-1.E col-last.O col-last.E ##test-files-end EXTRA_DIST = Test.pm $x-tests $(explicit) $(maint_gen) diff --git a/tests/pr/Makefile.in b/tests/pr/Makefile.in index 5259012de..aa73f5910 100644 --- a/tests/pr/Makefile.in +++ b/tests/pr/Makefile.in @@ -172,7 +172,7 @@ tta3-0FF tta3-FF ttb3-0FF ttb3-FF w72l17f-ll maint_gen = i-opt-a.I i-opt-a.X i-opt-b.I i-opt-b.X ncut-a.I ncut-a.X \ ncut-b.I ncut-b.X margin-0.I margin-0.X dbl-sp-a.I dbl-sp-a.X dbl-sp-b.I \ -dbl-sp-b.X narrow-1.I narrow-1.X +dbl-sp-b.X narrow-1.I narrow-1.X col-last.I col-last.X run_gen = 1a.O 1a.E 1b.O 1b.E 1c.O 1c.E 1d.O 1d.E 1e.O 1e.E 1f.O 1f.E 1g.O \ 1g.E 1h.O 1h.E 1i.O 1i.E 1j.O 1j.E 1k.O 1k.E 1l.O 1l.E 2a.O 2a.E 2b.O 2b.E \ @@ -214,7 +214,7 @@ run_gen = 1a.O 1a.E 1b.O 1b.E 1c.O 1c.E 1d.O 1d.E 1e.O 1e.E 1f.O 1f.E 1g.O \ 14d.E 14e.O 14e.E 14f.O 14f.E 14g.O 14g.E 14h.O 14h.E 14i.O 14i.E 14j.O 14j.E \ 14k.O 14k.E 14l.O 14l.E 14m.O 14m.E i-opt-a.O i-opt-a.E i-opt-b.O i-opt-b.E \ ncut-a.O ncut-a.E ncut-b.O ncut-b.E margin-0.O margin-0.E dbl-sp-a.O \ -dbl-sp-a.E dbl-sp-b.O dbl-sp-b.E narrow-1.O narrow-1.E +dbl-sp-a.E dbl-sp-b.O dbl-sp-b.E narrow-1.O narrow-1.E col-last.O col-last.E EXTRA_DIST = Test.pm $x-tests $(explicit) $(maint_gen) diff --git a/tests/pr/pr-tests b/tests/pr/pr-tests index df3972113..329abd397 100755 --- a/tests/pr/pr-tests +++ b/tests/pr/pr-tests @@ -4518,8 +4518,26 @@ else esac fi test -s narrow-1.E || rm -f narrow-1.E +_POSIX2_VERSION=199209 $xx --date-format="-- Date/Time --" -h x -W3 -t2 $srcdir/col-last.I > col-last.O 2> col-last.E +code=$? +if test $code != 0; then + $echo "Test col-last(_POSIX2_VERSION=199209) failed: ../../src/pr return code $code differs from expected value 0" 1>&2 + errors=`expr $errors + 1` +else + cmp col-last.O $srcdir/col-last.X > /dev/null 2>&1 + case $? in + 0) if test "$VERBOSE"; then $echo "passed col-last(_POSIX2_VERSION=199209)"; fi;; + 1) $echo "Test col-last(_POSIX2_VERSION=199209) failed: files col-last.O and $srcdir/col-last.X differ" 1>&2 + (diff -c col-last.O $srcdir/col-last.X) 2> /dev/null + errors=`expr $errors + 1`;; + 2) $echo "Test col-last(_POSIX2_VERSION=199209) may have failed." 1>&2 + $echo The command "cmp col-last.O $srcdir/col-last.X" failed. 1>&2 + errors=`expr $errors + 1`;; + esac +fi +test -s col-last.E || rm -f col-last.E if test $errors = 0; then - $echo Passed all 250 tests. 1>&2 + $echo Passed all 251 tests. 1>&2 else $echo Failed $errors tests. 1>&2 fi |