diff options
| -rw-r--r-- | ChangeLog | 2 | ||||
| -rwxr-xr-x | configure | 62 | ||||
| -rw-r--r-- | configure.ac | 4 | ||||
| -rw-r--r-- | m4/ChangeLog | 7 | ||||
| -rw-r--r-- | m4/readline.m4 | 44 | ||||
| -rw-r--r-- | pc/ChangeLog | 4 | ||||
| -rw-r--r-- | pc/config.h | 6 | ||||
| -rw-r--r-- | version.c | 2 |
8 files changed, 84 insertions, 47 deletions
@@ -5,6 +5,8 @@ * dfa.c (MALLOC): Undef first, for Irix. * Makefile.am (LDADD): Use LIBREADLINE and LIBMPFR instead of automake substitutions. + * configure.ac (AC_INIT): Version bump. + (GAWK_CHECK_READLINE): Renamed from GNUPG_CHECK_READLINE. 2013-01-23 Arnold D. Robbins <arnold@skeeve.com> @@ -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.0.72. +# Generated by GNU Autoconf 2.69 for GNU Awk 4.0.73. # # 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.0.72' -PACKAGE_STRING='GNU Awk 4.0.72' +PACKAGE_VERSION='4.0.73' +PACKAGE_STRING='GNU Awk 4.0.73' PACKAGE_BUGREPORT='bug-gawk@gnu.org' PACKAGE_URL='http://www.gnu.org/software/gawk/' @@ -1316,7 +1316,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.0.72 to adapt to many kinds of systems. +\`configure' configures GNU Awk 4.0.73 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1386,7 +1386,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of GNU Awk 4.0.72:";; + short | recursive ) echo "Configuration of GNU Awk 4.0.73:";; esac cat <<\_ACEOF @@ -1501,7 +1501,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -GNU Awk configure 4.0.72 +GNU Awk configure 4.0.73 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -2210,7 +2210,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.0.72, which was +It was created by GNU Awk $as_me 4.0.73, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -3054,7 +3054,7 @@ fi # Define the identity of the package. PACKAGE='gawk' - VERSION='4.0.72' + VERSION='4.0.73' cat >>confdefs.h <<_ACEOF @@ -10354,36 +10354,42 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether readline via \"$_combo\" is present and sane" >&5 $as_echo_n "checking whether readline via \"$_combo\" is present and sane... " >&6; } - cat confdefs.h - <<_ACEOF >conftest.$ac_ext + if test "$cross_compiling" = yes; then : + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +as_fn_error $? "cannot run test program while cross compiling +See \`config.log' for more details" "$LINENO" 5; } +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ - - #include <stdio.h> #include <readline/readline.h> #include <readline/history.h> -int -main () +int main(int argc, char **argv) { + int fd; + char *line; -rl_completion_func_t *completer; -add_history("foobar"); -rl_catch_signals=0; -rl_inhibit_completion=0; -rl_attempted_completion_function=NULL; -rl_completion_matches(NULL,NULL); + close(0); + close(1); + fd = open("/dev/null", 2); /* should get fd 0 */ + dup(fd); + line = readline("giveittome> "); - ; - return 0; + printf("got <%s>\n", line); + return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : - _found_readline=yes +if ac_fn_c_try_run "$LINENO"; then : + _found_readline=yes else - _found_readline=no + _found_readline=no fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ + conftest.$ac_objext conftest.beam conftest.$ac_ext +fi + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $_found_readline" >&5 $as_echo "$_found_readline" >&6; } @@ -11414,7 +11420,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.0.72, which was +This file was extended by GNU Awk $as_me 4.0.73, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -11482,7 +11488,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.0.72 +GNU Awk config.status 4.0.73 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff --git a/configure.ac b/configure.ac index d9357c31..4ba5f6aa 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.0.72, bug-gawk@gnu.org, gawk) +AC_INIT([GNU Awk], 4.0.73, 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. @@ -347,7 +347,7 @@ dnl check for sockets GAWK_AC_LIB_SOCKETS dnl check for readline support -GNUPG_CHECK_READLINE +GAWK_CHECK_READLINE dnl check for mpfr support GNUPG_CHECK_MPFR diff --git a/m4/ChangeLog b/m4/ChangeLog index 365ccde6..e90d4d0a 100644 --- a/m4/ChangeLog +++ b/m4/ChangeLog @@ -1,3 +1,10 @@ +2013-01-25 Arnold D. Robbins <arnold@skeeve.com> + + * readline.m4 (GAWK_CHECK_READLINE): Renamed from GNUPG_CHECK_READLINE. + Test program changed and test changed to try to run the built program + since some systems don't notice a link dependency between libreadline + and other libs until runtime. Isn't that fun? + 2012-12-24 Arnold D. Robbins <arnold@skeeve.com> * 4.0.2: Release tar ball made. diff --git a/m4/readline.m4 b/m4/readline.m4 index 73bbf2a9..648ea38f 100644 --- a/m4/readline.m4 +++ b/m4/readline.m4 @@ -1,5 +1,5 @@ dnl Check for readline and dependencies -dnl Copyright (C) 2004, 2005 Free Software Foundation, Inc. +dnl Copyright (C) 2004, 2005, 2013 Free Software Foundation, Inc. dnl dnl This file is free software, distributed under the terms of the GNU dnl General Public License. As a special exception to the GNU General @@ -9,8 +9,14 @@ dnl the same distribution terms as the rest of that program. dnl dnl Defines HAVE_LIBREADLINE to 1 if a working readline setup is dnl found, and sets @LIBREADLINE@ to the necessary libraries. +dnl +dnl Based upon GNUPG_CHECK_READLINE. Many more years into the +dnl twenty-first century, it is not enough to link a test program +dnl with the readline library. On several systems, if readline is +dnl not linked with the curses / termcap / whatever libraries, the +dnl problem is only discovered at run time. Isn't that special? -AC_DEFUN([GNUPG_CHECK_READLINE], +AC_DEFUN([GAWK_CHECK_READLINE], [ AC_ARG_WITH([readline], AC_HELP_STRING([--with-readline=DIR], @@ -30,19 +36,31 @@ AC_DEFUN([GNUPG_CHECK_READLINE], AC_MSG_CHECKING([whether readline via \"$_combo\" is present and sane]) - AC_LINK_IFELSE([ - AC_LANG_PROGRAM([ -#include <stdio.h> + AC_TRY_RUN( +dnl source program: +AC_LANG_SOURCE([[#include <stdio.h> #include <readline/readline.h> #include <readline/history.h> -],[ -rl_completion_func_t *completer; -add_history("foobar"); -rl_catch_signals=0; -rl_inhibit_completion=0; -rl_attempted_completion_function=NULL; -rl_completion_matches(NULL,NULL); -])],_found_readline=yes,_found_readline=no) + +int main(int argc, char **argv) +{ + int fd; + char *line; + + close(0); + close(1); + fd = open("/dev/null", 2); /* should get fd 0 */ + dup(fd); + line = readline("giveittome> "); + + printf("got <%s>\n", line); + return 0; +}]]), +dnl action if true: + [_found_readline=yes], +dnl action if false: + [_found_readline=no], + ) AC_MSG_RESULT([$_found_readline]) diff --git a/pc/ChangeLog b/pc/ChangeLog index a24c5dbb..1dc181d8 100644 --- a/pc/ChangeLog +++ b/pc/ChangeLog @@ -1,3 +1,7 @@ +2013-01-25 Arnold D. Robbins <arnold@skeeve.com> + + * config.h: Version bumped. + 2012-12-28 Eli Zaretskii <eliz@gnu.org> * Makefile (install1): Don't require a Unixy shell and Sed. Don't diff --git a/pc/config.h b/pc/config.h index fbdbf6f2..8adbef0b 100644 --- a/pc/config.h +++ b/pc/config.h @@ -419,7 +419,7 @@ #define PACKAGE_NAME "GNU Awk" /* Define to the full name and version of this package. */ -#define PACKAGE_STRING "GNU Awk 4.0.72" +#define PACKAGE_STRING "GNU Awk 4.0.73" /* Define to the one symbol short name of this package. */ #define PACKAGE_TARNAME "gawk" @@ -428,7 +428,7 @@ #define PACKAGE_URL "http://www.gnu.org/software/gawk/" /* Define to the version of this package. */ -#define PACKAGE_VERSION "4.0.72" +#define PACKAGE_VERSION "4.0.73" /* Define to 1 if *printf supports %F format */ #undef PRINTF_HAS_F_FORMAT @@ -490,7 +490,7 @@ /* Version number of package */ -#define VERSION "4.0.72" +#define VERSION "4.0.73" /* Enable large inode numbers on Mac OS X 10.5. */ #ifndef _DARWIN_USE_64_BIT_INODE @@ -1,3 +1,3 @@ #include "config.h" -const char *version_string = "GNU Awk 4.0.72"; +const char *version_string = "GNU Awk 4.0.73"; |