aboutsummaryrefslogtreecommitdiffstats
path: root/m4
diff options
context:
space:
mode:
Diffstat (limited to 'm4')
-rw-r--r--m4/ChangeLog14
-rw-r--r--m4/readline.m49
2 files changed, 22 insertions, 1 deletions
diff --git a/m4/ChangeLog b/m4/ChangeLog
index 59ddc228..9e2c279b 100644
--- a/m4/ChangeLog
+++ b/m4/ChangeLog
@@ -1,3 +1,17 @@
+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..af2745db 100644
--- a/m4/readline.m4
+++ b/m4/readline.m4
@@ -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:
@@ -72,6 +73,12 @@ dnl action if cross compiling:
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