aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorArnold D. Robbins <arnold@skeeve.com>2014-03-11 22:30:13 +0200
committerArnold D. Robbins <arnold@skeeve.com>2014-03-11 22:30:13 +0200
commit34113aba20ce7c9f3d7834ebdc4cb9f884b67239 (patch)
tree320f66db87a82cf041a9157b0fdd053d7d0ece10
parent6736261fb372cce9bc6c71deea6944fc882c79bb (diff)
parentac5d2bf77c871ab5c9da4ff34a11416a61cee826 (diff)
downloadegawk-34113aba20ce7c9f3d7834ebdc4cb9f884b67239.tar.gz
egawk-34113aba20ce7c9f3d7834ebdc4cb9f884b67239.tar.bz2
egawk-34113aba20ce7c9f3d7834ebdc4cb9f884b67239.zip
Merge branch 'gawk-4.1-stable'
-rwxr-xr-xconfigure4
-rw-r--r--m4/ChangeLog6
-rw-r--r--m4/readline.m44
3 files changed, 14 insertions, 0 deletions
diff --git a/configure b/configure
index 4b64006a..67c408bf 100755
--- a/configure
+++ b/configure
@@ -10467,6 +10467,10 @@ $as_echo "$_found_readline" >&6; }
LIBS=$_readline_save_libs
if test $_found_readline = yes ; then
+ case $host_os in
+ *bsd* ) _combo="$_combo -ltermcap"
+ ;;
+ esac
$as_echo "#define HAVE_LIBREADLINE 1" >>confdefs.h
diff --git a/m4/ChangeLog b/m4/ChangeLog
index 9e2c279b..cbb20483 100644
--- a/m4/ChangeLog
+++ b/m4/ChangeLog
@@ -1,3 +1,9 @@
+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..03ee5aef 100644
--- a/m4/readline.m4
+++ b/m4/readline.m4
@@ -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)