merge from 1.8 branch

guile-readline/.cvsignore

@@ -14,8 +14,11 @@ config.status
 config.sub
 configure
 depcomp
+guile-readline-config.h
+guile-readline-config.h.in
 install-sh
 libtool
 ltmain.sh
 missing
 mkinstalldirs
+stamp-h1

guile-readline/Makefile.am

@@ -26,7 +26,7 @@ DEFS = @DEFS@ @EXTRA_DEFS@
 ## Check for headers in $(srcdir)/.., so that #include
 ## <libguile/MUMBLE.h> will find MUMBLE.h in this dir when we're
 ## building.
-INCLUDES = -I.. -I$(srcdir)/..
+INCLUDES = -I. -I.. -I$(srcdir)/..
 
 GUILE_SNARF = ../libguile/guile-snarf
 

guile-readline/configure.in

@@ -2,7 +2,9 @@ AC_PREREQ(2.50)
 
 AC_INIT(guile-readline,
         m4_esyscmd(. ../GUILE-VERSION && echo -n ${GUILE_VERSION}))
+AC_CONFIG_AUX_DIR([.])
 AC_CONFIG_SRCDIR(readline.c)
+AM_CONFIG_HEADER([guile-readline-config.h])
 AM_INIT_AUTOMAKE([foreign no-define])
 
 . $srcdir/../GUILE-VERSION
@@ -58,7 +60,8 @@ ac_cv_var_rl_pre_input_hook=yes,
 ac_cv_var_rl_pre_input_hook=no)])
 AC_MSG_RESULT($ac_cv_var_rl_pre_input_hook)
 if test $ac_cv_var_rl_pre_input_hook = yes; then
-  AC_DEFINE(HAVE_RL_PRE_INPUT_HOOK)
+  AC_DEFINE(HAVE_RL_PRE_INPUT_HOOK,1,
+            [Define if rl_pre_input_hook is available.])
 fi
 
 
@@ -107,7 +110,8 @@ guile_cv_sigwinch_sa_restart_cleared=no,
 guile_cv_sigwinch_sa_restart_cleared=yes))
 AC_MSG_RESULT($guile_cv_sigwinch_sa_restart_cleared)
 if test $guile_cv_sigwinch_sa_restart_cleared = yes; then
-  AC_DEFINE(GUILE_SIGWINCH_SA_RESTART_CLEARED)
+  AC_DEFINE(GUILE_SIGWINCH_SA_RESTART_CLEARED, 1,
+    [Define if readline disables SA_RESTART.])
 fi
 
 AC_CACHE_CHECK([for rl_getc_function pointer in readline],

guile-readline/readline.c

@@ -22,11 +22,9 @@
 
 
 
-#if HAVE_CONFIG_H
-#  include <config.h>
-#endif
+/* Include private, configure generated header (i.e. config.h). */
+#include "guile-readline-config.h"
 
-#include "libguile/_scm.h"
 #ifdef HAVE_RL_GETC_FUNCTION
 #include "libguile.h"
 #include "libguile/gh.h"