diff options
author | Juergen Kahrs <Juergen.Kahrs@googlemail.com> | 2014-06-24 13:18:33 +0200 |
---|---|---|
committer | Juergen Kahrs <Juergen.Kahrs@googlemail.com> | 2014-06-24 13:18:33 +0200 |
commit | f1245d04a9f076773c60499b468f44ed9c91b59b (patch) | |
tree | 2b49234400150bfaac7ebf8c017562300edc7471 /m4 | |
parent | ee9707cc44eea3ca64cb71666ac3e8ed26a3bb7f (diff) | |
parent | 78ded8ee8f11a321c96417e7d02dac2f5723a221 (diff) | |
download | egawk-f1245d04a9f076773c60499b468f44ed9c91b59b.tar.gz egawk-f1245d04a9f076773c60499b468f44ed9c91b59b.tar.bz2 egawk-f1245d04a9f076773c60499b468f44ed9c91b59b.zip |
Merge remote-tracking branch 'origin/master' into cmake
Diffstat (limited to 'm4')
-rw-r--r-- | m4/ChangeLog | 10 | ||||
-rw-r--r-- | m4/readline.m4 | 6 |
2 files changed, 15 insertions, 1 deletions
diff --git a/m4/ChangeLog b/m4/ChangeLog index 9e2c279b..81fdcec0 100644 --- a/m4/ChangeLog +++ b/m4/ChangeLog @@ -1,3 +1,13 @@ +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 diff --git a/m4/readline.m4 b/m4/readline.m4 index af2745db..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 @@ -70,6 +70,10 @@ 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) |