diff options
| author | Andrew J. Schorr <aschorr@telemetry-investments.com> | 2014-04-13 14:30:56 -0400 |
|---|---|---|
| committer | Andrew J. Schorr <aschorr@telemetry-investments.com> | 2014-04-13 14:30:56 -0400 |
| commit | 94e3f93395de538d73826e128281a3ea9591a5a9 (patch) | |
| tree | 45257e4b024537c5e0e5a3037a99ea9765583c99 /m4 | |
| parent | c4300d657ba49db0b6d0f0884f41a29622edc58b (diff) | |
| parent | a4b59faf911743b30f2e6e979c4f9c1ea0669ac3 (diff) | |
| download | egawk-94e3f93395de538d73826e128281a3ea9591a5a9.tar.gz egawk-94e3f93395de538d73826e128281a3ea9591a5a9.tar.bz2 egawk-94e3f93395de538d73826e128281a3ea9591a5a9.zip | |
Merge branch 'master' into select
Diffstat (limited to 'm4')
| -rw-r--r-- | m4/ChangeLog | 24 | ||||
| -rw-r--r-- | m4/readline.m4 | 15 |
2 files changed, 37 insertions, 2 deletions
diff --git a/m4/ChangeLog b/m4/ChangeLog index 59ddc228..81fdcec0 100644 --- a/m4/ChangeLog +++ b/m4/ChangeLog @@ -1,3 +1,27 @@ +2014-04-08 Arnold D. Robbins <arnold@skeeve.com> + + * 4.1.1: Release tar ball made. + +2014-03-11 Arnold D. Robbins <arnold@skeeve.com> + + * readline.m4: Add manual check for *bsd* OS and add -ltermcap + if so. Hack, slash. Can you say "quick and dirty" boys and girls? + I knew you could. + +2013-10-16 Arnold D. Robbins <arnold@skeeve.com> + + * readline.m4: Add check for NULL return from readline() in + call to printf() for results. Thanks to Dagobert Michelsen + <dam@opencsw.org> for the report. + +2013-08-29 Arnold D. Robbins <arnold@skeeve.com> + + * readline.m4: Add additional code to check for history_list() + function. Patterned after checks in: + http://ftp.samba.org/pub/unpacked/samba_3_current/source4/lib/smbreadline/readline.m4 + Thanks to Larry Baker (larry.baker@stanfordalumni.org) for the + pointer. + 2013-05-09 Arnold D. Robbins <arnold@skeeve.com> * 4.1.0: Release tar ball made. diff --git a/m4/readline.m4 b/m4/readline.m4 index 76605af8..77ed8b25 100644 --- a/m4/readline.m4 +++ b/m4/readline.m4 @@ -1,5 +1,5 @@ dnl Check for readline and dependencies -dnl Copyright (C) 2004, 2005, 2013 Free Software Foundation, Inc. +dnl Copyright (C) 2004, 2005, 2013, 2014 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 @@ -53,7 +53,8 @@ int main(int argc, char **argv) dup(fd); line = readline("giveittome> "); - printf("got <%s>\n", line); + /* some printfs don't handle NULL for %s */ + printf("got <%s>\n", line ? line : "(NULL)"); return 0; }]]), dnl action if true: @@ -69,9 +70,19 @@ dnl action if cross compiling: LIBS=$_readline_save_libs if test $_found_readline = yes ; then + case $host_os in + *bsd* ) _combo="$_combo -ltermcap" + ;; + esac AC_DEFINE(HAVE_LIBREADLINE,1, [Define to 1 if you have a fully functional readline library.]) AC_SUBST(LIBREADLINE,$_combo) + + AC_CHECK_LIB(readline, history_list, + [AC_DEFINE(HAVE_HISTORY_LIST, 1, [Do we have history_list?])], + [], + [$_combo]) + break fi done |