[project @ 2001-04-20 07:21:56 by qrczak]

Let it work on FreeBSD where fileno is a macro.
Support readline-4.2 (some C functions were renamed).
Correctly treat rl_redisplay_function as returning void.

diff --git a/acconfig.h b/acconfig.h
index b4bbc07..86a662f 100644 (file)
--- a/acconfig.h
+++ b/acconfig.h
@@ -390,9 +390,12 @@
 /* Define if readline plus any additional libs needed for it exist */
 #undef HAVE_READLINE_LIBS
 
-/* Define if readline has version >= 4.x. */
+/* Define if readline has version >= 4.0. */
 #undef HAVE_READLINE_4
 
+/* Define if readline has version >= 4.2. */
+#undef HAVE_READLINE_4_2
+
 /* Define if time.h or sys/time.h define the timezone variable */
 #undef HAVE_TIMEZONE
 

diff --git a/configure.in b/configure.in
index b161cce..21eea5f 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -851,8 +851,12 @@ if test "$HaveLibReadline"; then
   AC_CHECK_LIB(readline, rl_erase_empty_line,
     [AC_DEFINE(HAVE_READLINE_4, 1)],
     [AC_DEFINE(HAVE_READLINE_4, 0)])
+  AC_CHECK_LIB(readline, rl_free_undo_list,
+    [AC_DEFINE(HAVE_READLINE_4_2, 1)],
+    [AC_DEFINE(HAVE_READLINE_4_2, 0)])
 else
   AC_DEFINE(HAVE_READLINE_4, 0)
+  AC_DEFINE(HAVE_READLINE_4_2, 0)
 fi
 
 dnl ** check for math library

diff --git a/mk/config.h.in b/mk/config.h.in
index 044ca4c..4f480eb 100644 (file)
--- a/mk/config.h.in
+++ b/mk/config.h.in
@@ -141,9 +141,12 @@
 /* Define if readline plus any additional libs needed for it exist */
 #undef HAVE_READLINE_LIBS
 
-/* Define if readline has version >= 4.x. */
+/* Define if readline has version >= 4.0. */
 #undef HAVE_READLINE_4
 
+/* Define if readline has version >= 4.2. */
+#undef HAVE_READLINE_4_2
+
 /* Define if time.h or sys/time.h define the timezone variable */
 #undef HAVE_TIMEZONE