diff options
| -rwxr-xr-x | configure | 20 | ||||
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | extension/ChangeLog | 5 | ||||
| -rw-r--r-- | extension/Makefile.am | 6 | ||||
| -rw-r--r-- | extension/Makefile.in | 6 | ||||
| -rw-r--r-- | pc/config.h | 9 | ||||
| -rw-r--r-- | test/ChangeLog | 5 | ||||
| -rw-r--r-- | test/Makefile.am | 2 | ||||
| -rw-r--r-- | test/Makefile.in | 2 | ||||
| -rw-r--r-- | test/readdir0.awk | 6 | ||||
| -rw-r--r-- | version.c | 2 |
11 files changed, 46 insertions, 19 deletions
@@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for GNU Awk 4.1.0. +# Generated by GNU Autoconf 2.69 for GNU Awk 4.1.0a. # # Report bugs to <bug-gawk@gnu.org>. # @@ -580,8 +580,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='GNU Awk' PACKAGE_TARNAME='gawk' -PACKAGE_VERSION='4.1.0' -PACKAGE_STRING='GNU Awk 4.1.0' +PACKAGE_VERSION='4.1.0a' +PACKAGE_STRING='GNU Awk 4.1.0a' PACKAGE_BUGREPORT='bug-gawk@gnu.org' PACKAGE_URL='http://www.gnu.org/software/gawk/' @@ -1323,7 +1323,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 Awk 4.1.0 to adapt to many kinds of systems. +\`configure' configures GNU Awk 4.1.0a to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1393,7 +1393,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of GNU Awk 4.1.0:";; + short | recursive ) echo "Configuration of GNU Awk 4.1.0a:";; esac cat <<\_ACEOF @@ -1510,7 +1510,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -GNU Awk configure 4.1.0 +GNU Awk configure 4.1.0a generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -2219,7 +2219,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 GNU Awk $as_me 4.1.0, which was +It was created by GNU Awk $as_me 4.1.0a, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -3102,7 +3102,7 @@ fi # Define the identity of the package. PACKAGE='gawk' - VERSION='4.1.0' + VERSION='4.1.0a' cat >>confdefs.h <<_ACEOF @@ -11526,7 +11526,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by GNU Awk $as_me 4.1.0, which was +This file was extended by GNU Awk $as_me 4.1.0a, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -11594,7 +11594,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -GNU Awk config.status 4.1.0 +GNU Awk config.status 4.1.0a configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff --git a/configure.ac b/configure.ac index b401cb40..28d4f7d8 100644 --- a/configure.ac +++ b/configure.ac @@ -23,7 +23,7 @@ dnl dnl Process this file with autoconf to produce a configure script. -AC_INIT([GNU Awk], 4.1.0, bug-gawk@gnu.org, gawk) +AC_INIT([GNU Awk], 4.1.0a, bug-gawk@gnu.org, gawk) # This is a hack. Different versions of install on different systems # are just too different. Chuck it and use install-sh. diff --git a/extension/ChangeLog b/extension/ChangeLog index 0293ae99..2f15635e 100644 --- a/extension/ChangeLog +++ b/extension/ChangeLog @@ -1,3 +1,8 @@ +2013-11-28 Arnold D. Robbins <arnold@skeeve.com> + + * Makefile.am (uninstall-so, uninstall-recursive): Remove the + .so files. Keeps make distcheck happy. + 2013-11-17 Dmitry V. Levin <ldv@altlinux.org> * Makefile.am (dist_man_MANS): Add inplace.3am. diff --git a/extension/Makefile.am b/extension/Makefile.am index 6ecffabc..3ef72568 100644 --- a/extension/Makefile.am +++ b/extension/Makefile.am @@ -103,6 +103,12 @@ install-data-hook: $(RM) $(pkgextensiondir)/$$i ; \ done +# Keep the uninstall check working: +uninstall-so: + $(RM) $(pkgextensiondir)/*.so + +uninstall-recursive: uninstall-so + EXTRA_DIST = build-aux/config.rpath \ ChangeLog \ ChangeLog.0 \ diff --git a/extension/Makefile.in b/extension/Makefile.in index ee55d65b..bc7d81af 100644 --- a/extension/Makefile.in +++ b/extension/Makefile.in @@ -1195,6 +1195,12 @@ install-data-hook: $(RM) $(pkgextensiondir)/$$i ; \ done +# Keep the uninstall check working: +uninstall-so: + $(RM) $(pkgextensiondir)/*.so + +uninstall-recursive: uninstall-so + # This is an ugly hack, initially for MirBSD but probably needed for other # systems. If gawk doesn't have the API built in, don't try to build the # extensions. diff --git a/pc/config.h b/pc/config.h index 92e1b4e3..a07228c9 100644 --- a/pc/config.h +++ b/pc/config.h @@ -75,6 +75,9 @@ /* Define to 1 if you have the `grantpt' function. */ #undef HAVE_GRANTPT +/* Do we have history_list? */ +#undef HAVE_HISTORY_LIST + /* Define if you have the iconv() function and it works. */ #undef HAVE_ICONV @@ -426,7 +429,7 @@ #define PACKAGE_NAME "GNU Awk" /* Define to the full name and version of this package. */ -#define PACKAGE_STRING "GNU Awk 4.1.0" +#define PACKAGE_STRING "GNU Awk 4.1.0a" /* Define to the one symbol short name of this package. */ #define PACKAGE_TARNAME "gawk" @@ -435,7 +438,7 @@ #define PACKAGE_URL "http://www.gnu.org/software/gawk/" /* Define to the version of this package. */ -#define PACKAGE_VERSION "4.1.0" +#define PACKAGE_VERSION "4.1.0a" /* Define to 1 if *printf supports %F format */ #undef PRINTF_HAS_F_FORMAT @@ -497,7 +500,7 @@ /* Version number of package */ -#define VERSION "4.1.0" +#define VERSION "4.1.0a" /* Enable large inode numbers on Mac OS X 10.5. */ #ifndef _DARWIN_USE_64_BIT_INODE diff --git a/test/ChangeLog b/test/ChangeLog index 11460e71..4bead8c7 100644 --- a/test/ChangeLog +++ b/test/ChangeLog @@ -1,3 +1,8 @@ +2013-11-28 Arnold D. Robbins <arnold@skeeve.com> + + * readdir0.awk: Take argument which is directory to read. + * Makefile.am (readdir): Pass $(top_srcdir) to readdir0.awk. + 2013-11-27 Andrew J. Schorr <aschorr@telemetry-investments.com> * readdir0.awk: Restore fix so that we do not fail on filesysystems diff --git a/test/Makefile.am b/test/Makefile.am index 4eb41ab2..5133e134 100644 --- a/test/Makefile.am +++ b/test/Makefile.am @@ -1814,7 +1814,7 @@ readdir: fi @echo $@ @$(AWK) -f "$(srcdir)"/readdir.awk $(top_srcdir) > _$@ - @ls -afli $(top_srcdir) | sed 1d | $(AWK) -f "$(srcdir)"/readdir0.awk -v extout=_$@ > $@.ok + @ls -afli $(top_srcdir) | sed 1d | $(AWK) -f "$(srcdir)"/readdir0.awk -v extout=_$@ $(top_srcdir) > $@.ok @-$(CMP) $@.ok _$@ && rm -f $@.ok _$@ fts: diff --git a/test/Makefile.in b/test/Makefile.in index 3dc9d840..256ca484 100644 --- a/test/Makefile.in +++ b/test/Makefile.in @@ -2209,7 +2209,7 @@ readdir: fi @echo $@ @$(AWK) -f "$(srcdir)"/readdir.awk $(top_srcdir) > _$@ - @ls -afli $(top_srcdir) | sed 1d | $(AWK) -f "$(srcdir)"/readdir0.awk -v extout=_$@ > $@.ok + @ls -afli $(top_srcdir) | sed 1d | $(AWK) -f "$(srcdir)"/readdir0.awk -v extout=_$@ $(top_srcdir) > $@.ok @-$(CMP) $@.ok _$@ && rm -f $@.ok _$@ fts: diff --git a/test/readdir0.awk b/test/readdir0.awk index 5aedbf70..296c03c7 100644 --- a/test/readdir0.awk +++ b/test/readdir0.awk @@ -12,8 +12,10 @@ BEGIN { } BEGIN { - ls_afi = "ls -afi .." - ls_al = "ls -lna .. | sed 1d" + dir = ARGV[1] + delete ARGV[1] + ls_afi = "ls -afi " dir + ls_al = ("ls -lna " dir " | sed 1d") for (i = 1; (ls_afi | getline) > 0; i++) { # inode number is $1, filename is read of record @@ -1,3 +1,3 @@ #include "config.h" -const char *version_string = "GNU Awk 4.1.0"; +const char *version_string = "GNU Awk 4.1.0a"; |