diff options
| -rw-r--r-- | ChangeLog | 11 | ||||
| -rw-r--r-- | README_d/ChangeLog | 2 | ||||
| -rw-r--r-- | README_d/README.zos | 8 | ||||
| -rw-r--r-- | awkgram.c | 5 | ||||
| -rw-r--r-- | awkgram.y | 5 | ||||
| -rw-r--r-- | builtin.c | 2 | ||||
| -rwxr-xr-x | configure | 26 | ||||
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | custom.h | 2 | ||||
| -rw-r--r-- | m4/ChangeLog | 4 | ||||
| -rw-r--r-- | m4/readline.m4 | 4 | ||||
| -rw-r--r-- | version.c | 2 |
12 files changed, 47 insertions, 26 deletions
@@ -1,3 +1,14 @@ +Sat Dec 25 19:36:27 2010 Arnold D. Robbins <arnold@skeeve.com> + + Fixes for z/OS. + + * awkgram.y (tokcompare): Change argument types to const void *. + (check_special): Add cast to void * in call to qsort. + * builtin.c (do_bindtextdomain): Change `directory' and `domain' + to const char *. + * custom.h (ZOS_USS): Undef HAVE_SYS_PARAM_H and HAVE_MCHECK_H. + Beats me why configure thinks it has those things. + Fri Dec 24 12:56:46 2010 Arnold D. Robbins <arnold@skeeve.com> * custom.h: Remove defs for RIPS MiscOS. diff --git a/README_d/ChangeLog b/README_d/ChangeLog index 3ac17c2b..8cea0656 100644 --- a/README_d/ChangeLog +++ b/README_d/ChangeLog @@ -1,6 +1,6 @@ 2010-12-18 Eli Zaretskii <eliz@gnu.org> - * README_d/README.pc: Update and simplify. Remove lots of + * README.pc: Update and simplify. Remove lots of outdated stuff for systems and configurations no longer supported. 2010-12-18 Arnold Robbins <arnold@skeeve.com> diff --git a/README_d/README.zos b/README_d/README.zos index 1613330d..361a8ae6 100644 --- a/README_d/README.zos +++ b/README_d/README.zos @@ -1,4 +1,4 @@ -Fri Jan 25 12:36:16 2008 +Fri Dec 24 10:58:16 2010 Dave Pitts <dpitts@cozx.com> ---------------------------- @@ -6,7 +6,7 @@ GAWK on z/OS 1. To unpack the tarball: - $ gunzip -c gawk-3.1.6.tar.gz | pax -rv from=ISO8859-1,to=IBM-1047 + $ gunzip -c gawk-4.0.0.tar.gz | pax -rv from=ISO8859-1,to=IBM-1047 This will extract the files and convert them from ASCII to EBCDIC. @@ -14,12 +14,12 @@ GAWK on z/OS the operation on another system and copy the tar file to z/OS. Then unpack as follows: - $ pax -rv from=ISO8859-1,to=IBM-1047 -f gawk-3.1.6.tar + $ pax -rv from=ISO8859-1,to=IBM-1047 -f gawk-4.0.0.tar 2. To Build - $ ./configure + $ ./configure CC=c89 $ make You will get compilation warnings of the form: @@ -4459,7 +4459,7 @@ struct token { /* tokcompare --- lexicographically compare token names for sorting */ static int -tokcompare(void *l, void *r) +tokcompare(const void *l, const void *r) { struct token *lhs, *rhs; @@ -8504,7 +8504,8 @@ check_special(const char *name) static int did_sort = FALSE; if (! did_sort) { - qsort(tokentab, sizeof(tokentab) / sizeof(tokentab[0]), + qsort((void *) tokentab, + sizeof(tokentab) / sizeof(tokentab[0]), sizeof(tokentab[0]), tokcompare); did_sort = TRUE; } @@ -1810,7 +1810,7 @@ struct token { /* tokcompare --- lexicographically compare token names for sorting */ static int -tokcompare(void *l, void *r) +tokcompare(const void *l, const void *r) { struct token *lhs, *rhs; @@ -5855,7 +5855,8 @@ check_special(const char *name) static int did_sort = FALSE; if (! did_sort) { - qsort(tokentab, sizeof(tokentab) / sizeof(tokentab[0]), + qsort((void *) tokentab, + sizeof(tokentab) / sizeof(tokentab[0]), sizeof(tokentab[0]), tokcompare); did_sort = TRUE; } @@ -2382,7 +2382,7 @@ NODE * do_bindtextdomain(int nargs) { NODE *t1, *t2; - char *directory, *domain; + const char *directory, *domain; char *the_result; t1 = t2 = NULL; @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.68 for GNU Awk 3.1.76. +# Generated by GNU Autoconf 2.68 for GNU Awk 3.1.77. # # Report bugs to <bug-gawk@gnu.org>. # @@ -560,8 +560,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='GNU Awk' PACKAGE_TARNAME='gawk' -PACKAGE_VERSION='3.1.76' -PACKAGE_STRING='GNU Awk 3.1.76' +PACKAGE_VERSION='3.1.77' +PACKAGE_STRING='GNU Awk 3.1.77' PACKAGE_BUGREPORT='bug-gawk@gnu.org' PACKAGE_URL='http://www.gnu.org/software/gawk/' @@ -1292,7 +1292,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 3.1.76 to adapt to many kinds of systems. +\`configure' configures GNU Awk 3.1.77 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1362,7 +1362,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of GNU Awk 3.1.76:";; + short | recursive ) echo "Configuration of GNU Awk 3.1.77:";; esac cat <<\_ACEOF @@ -1474,7 +1474,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -GNU Awk configure 3.1.76 +GNU Awk configure 3.1.77 generated by GNU Autoconf 2.68 Copyright (C) 2010 Free Software Foundation, Inc. @@ -2178,7 +2178,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 3.1.76, which was +It was created by GNU Awk $as_me 3.1.77, which was generated by GNU Autoconf 2.68. Invocation command line was $ $0 $@ @@ -3013,7 +3013,7 @@ fi # Define the identity of the package. PACKAGE='gawk' - VERSION='3.1.76' + VERSION='3.1.77' cat >>confdefs.h <<_ACEOF @@ -10310,10 +10310,12 @@ rl_completion_matches(NULL,NULL); ; return 0; -},_found_readline=yes,_found_readline=no +} _ACEOF if ac_fn_c_try_link "$LINENO"; then : - + _found_readline=yes +else + _found_readline=no fi rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext @@ -11263,7 +11265,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 3.1.76, which was +This file was extended by GNU Awk $as_me 3.1.77, which was generated by GNU Autoconf 2.68. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -11331,7 +11333,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 3.1.76 +GNU Awk config.status 3.1.77 configured by $0, generated by GNU Autoconf 2.68, with options \\"\$ac_cs_config\\" diff --git a/configure.ac b/configure.ac index 5cd65669..0d72d7db 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], 3.1.76, bug-gawk@gnu.org, gawk) +AC_INIT([GNU Awk], 3.1.77, 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. @@ -68,6 +68,8 @@ /* For z/OS, from Dave Pitts */ #ifdef ZOS_USS #undef HAVE_DLFCN_H +#undef HAVE_SYS_PARAM_H +#undef HAVE_MCHECK_H #undef HAVE_SETENV #define setenv zos_setenv #define unsetenv zos_unsetenv diff --git a/m4/ChangeLog b/m4/ChangeLog index bf65cfd3..ac4b5368 100644 --- a/m4/ChangeLog +++ b/m4/ChangeLog @@ -1,3 +1,7 @@ +Sat Dec 25 21:40:25 2010 Arnold D. Robbins <arnold@skeeve.com> + + * readline.m4: Fixed to work correctly with Autoconf 2.68. + Fri Dec 24 13:00:26 2010 Arnold D. Robbins <arnold@skeeve.com> * readline.m4: Updated to work with Autoconf 2.68. diff --git a/m4/readline.m4 b/m4/readline.m4 index 2d838afb..2138d28a 100644 --- a/m4/readline.m4 +++ b/m4/readline.m4 @@ -12,7 +12,7 @@ dnl found, and sets @LIBREADLINE@ to the necessary libraries. AC_DEFUN([GNUPG_CHECK_READLINE], [ - AC_ARG_WITH(readline, + AC_ARG_WITH([readline], AC_HELP_STRING([--with-readline=DIR], [look for the readline library in DIR]), [_do_readline=$withval],[_do_readline=yes]) @@ -43,7 +43,7 @@ rl_catch_signals=0; rl_inhibit_completion=0; rl_attempted_completion_function=NULL; rl_completion_matches(NULL,NULL); -]),_found_readline=yes,_found_readline=no]) +])],_found_readline=yes,_found_readline=no) AC_MSG_RESULT([$_found_readline]) @@ -1,3 +1,3 @@ #include "config.h" -const char *version_string = "@(#)GNU Awk 3.1.76"; +const char *version_string = "@(#)GNU Awk 3.1.77"; |