diff options
| author | Kevin Ryde <user42@zip.com.au> | 2006-06-17 22:53:04 +0000 |
|---|---|---|
| committer | Kevin Ryde <user42@zip.com.au> | 2006-06-17 22:53:04 +0000 |
| commit | 5be9f7290b0ac38335e66a9e68e01ac254b9912c (patch) | |
| tree | c004acd80d01b16a3ae10849569a81550b18824f /guile-readline | |
| parent | 9a9931719ddc6d1a7ed2e6597257e336114a69a9 (diff) | |
| download | guile-5be9f7290b0ac38335e66a9e68e01ac254b9912c.tar.gz | |
merge from 1.8 branch
Diffstat (limited to 'guile-readline')
| -rw-r--r-- | guile-readline/.cvsignore | 3 | ||||
| -rw-r--r-- | guile-readline/Makefile.am | 2 | ||||
| -rw-r--r-- | guile-readline/configure.in | 8 | ||||
| -rw-r--r-- | guile-readline/readline.c | 6 |
4 files changed, 12 insertions, 7 deletions
diff --git a/guile-readline/.cvsignore b/guile-readline/.cvsignore index 0d3a474f6..22b5d0d48 100644 --- a/guile-readline/.cvsignore +++ b/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 diff --git a/guile-readline/Makefile.am b/guile-readline/Makefile.am index 6d6e16882..f1f038755 100644 --- a/guile-readline/Makefile.am +++ b/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 diff --git a/guile-readline/configure.in b/guile-readline/configure.in index 1f0a08cd4..b58b46b87 100644 --- a/guile-readline/configure.in +++ b/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], diff --git a/guile-readline/readline.c b/guile-readline/readline.c index 37eab2433..4eab67582 100644 --- a/guile-readline/readline.c +++ b/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" |